Sail 3차

Assets/02.Scripts/BlueWater/Sail/EnemyShip.cs

@@ -12,9 +12,17 @@ public class EnemyShip : MonoBehaviour
 
     public float fixedY = 0f;
 
+    private bool moveCheck = false;
+    
+    
+    
+    
     private void Update()
     {
-        if (player == null)
+        if (Input.GetKey(KeyCode.Alpha0)) { moveCheck = !moveCheck; }
+        
+        
+        if (player == null || !moveCheck)
             return;
 
         Vector3 targetPos = new Vector3(player.position.x, fixedY, player.position.z);

Assets/02.Scripts/BlueWater/Sail/ShipMove.cs

@@ -15,37 +15,9 @@ namespace BlueWater
         protected float force = 0.0f;
         public float force_add = 0.002f;
 
-        [SerializeField] 
-        private ParticleSystem Smoke1;
-        [SerializeField] 
-        private ParticleSystem Smoke2;
-        [SerializeField] 
-        private ParticleSystem Smoke3;
-        [SerializeField] 
-        private ParticleSystem Smoke4;
-        [SerializeField] 
-        private ParticleSystem Smoke5;
-        [SerializeField] 
-        private ParticleSystem Smoke6;
-        [SerializeField] 
-        private ParticleSystem Smoke7;
-        [SerializeField] 
-        private ParticleSystem Smoke8;
         [SerializeField] 
         private ParticleSystem Rings;
 
-        private void Start()
-        {
-            Smoke1.Stop();
-            Smoke2.Stop();
-            Smoke3.Stop();
-            Smoke4.Stop();
-            Smoke5.Stop();
-            Smoke6.Stop();
-            Smoke7.Stop();
-            Smoke8.Stop();
-            //Rings.Stop();
-        }
 
         void Update()
         {
@@ -85,40 +57,15 @@ namespace BlueWater
             
             
             transform.Translate((side_check * move_time * rotation_02)*force, 0.0f, (back_check * move_time * rotation_01)*force);
-            if (force >= 0.05f)
+            if (force >= 0.05f && !Rings.isPlaying)
             {            
-                Smoke1.Play();
+                Rings.Play();
-                Smoke2.Play();
-                Smoke3.Play();
-                Smoke4.Play();
-                Smoke5.Play();
-                Smoke6.Play();
-                Smoke7.Play();
-                Smoke8.Play();
-                //Rings.Play();
             }
-            else
+            else if(force < 0.05f && Rings.isPlaying)
             {
-                Smoke1.Stop();
+                Rings.Stop();
-                Smoke2.Stop();
-                Smoke3.Stop();
-                Smoke4.Stop();
-                Smoke5.Stop();
-                Smoke6.Stop();
-                Smoke7.Stop();
-                Smoke8.Stop();
-                //Rings.Stop();
             }
             
-            Smoke1.startSize = 0.2f * (force);
-            Smoke2.startSize = 0.2f * (force);
-            Smoke3.startSize = 0.2f * (force);
-            Smoke4.startSize = 0.2f * (force);
-            Smoke5.startSize = 0.2f * (force);
-            Smoke6.startSize = 0.2f * (force);
-            Smoke7.startSize = 0.2f * (force);
-            Smoke8.startSize = 0.2f * (force);
-            
             if (Input.GetKey(KeyCode.RightArrow)|| Input.GetKey(KeyCode.H))
             {
                 obj.transform.Rotate(new Vector3(0.0f, speed * Time.deltaTime , 0.0f));

Assets/09.Shaders/Curved_Shader/Bending Master Fish.shadergraph

@@ -1174,7 +1174,7 @@
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
     "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
+        "m_SerializedTexture": "",
         "m_Guid": ""
     },
     "isMainTexture": false,
@@ -1557,9 +1557,9 @@
     "m_ShaderOutputName": "BaseColor",
     "m_StageCapability": 2,
     "m_Value": {
-        "x": 0.0,
+        "x": 1.0,
-        "y": 0.0,
+        "y": 1.0,
-        "z": 0.0
+        "z": 1.0
     },
     "m_DefaultValue": {
         "x": 0.5,

Assets/09.Shaders/Curved_Shader/Bending_Fish1.mat

@@ -130,8 +130,8 @@ Material:
     - _SrcBlend: 1
     - _SrcBlendAlpha: 1
     - _Surface: 0
-    - _Wave_Draction: 0.4
+    - _Wave_Draction: 1.5
-    - _Wave_Speed: 3
+    - _Wave_Speed: 11.16
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:

Assets/09.Shaders/Curved_Shader/CurvedWorldLit.mat

@@ -28,7 +28,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Texture2D_72426835:
-        m_Texture: {fileID: 2800000, guid: c6e58fee3b872ca43b6802f6c9bbb865, type: 3}
+        m_Texture: {fileID: 2800000, guid: 520b919af3afcc643b5d707d95558218, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []

Assets/Toon Water URP/Curved Toon Water Material 1.mat

@@ -39,15 +39,15 @@ Material:
     - Vector1_A524D234: 0.7
     - Vector1_B9CC1720: 0.03
     - Vector1_E71BB35E: 1
-    - _Wave_Height: 0.2
+    - _Wave_Height: 0.49
-    - _Wave_Speed: 0.29
+    - _Wave_Speed: 0.15
     m_Colors:
-    - Color_1139F668: {r: 0.1462264, g: 0.43715423, b: 0.5849056, a: 0.36078432}
+    - Color_1139F668: {r: 0.1462264, g: 0.43715423, b: 0.5849056, a: 1}
-    - Color_198818EE: {r: 0.016751582, g: 0.32192707, b: 0.7610062, a: 0.21568628}
+    - Color_198818EE: {r: 0.016751582, g: 0.32192707, b: 0.7610062, a: 0.2}
     - Color_626750DD: {r: 1.6455986, g: 2.337602, b: 2.3678749, a: 1}
     - Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 0.21960784}
-    - Vector2_1E1B6943: {r: 1, g: 2, b: 0, a: 0}
+    - Vector2_1E1B6943: {r: 1, g: 2, b: 1, a: 0}
-    - Vector2_D26C9C89: {r: 1, g: 0, b: 0, a: 0}
+    - Vector2_D26C9C89: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 --- !u!114 &6768849871664622749

Packages/com.distantlands.cozy.core/Content/Resources/Profiles/Atmosphere Profiles/Default Atmosphere.asset

@@ -1223,7 +1223,7 @@ MonoBehaviour:
       m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
-    floatVal: 0.518
+    floatVal: 0.4
     curveVal:
       serializedVersion: 2
       m_Curve:
@@ -3023,7 +3023,7 @@ MonoBehaviour:
       m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
-    floatVal: 3.92
+    floatVal: 2.98
     curveVal:
       serializedVersion: 2
       m_Curve:
@@ -3372,7 +3372,7 @@ MonoBehaviour:
       m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
-    floatVal: 0.46
+    floatVal: 0.02
     curveVal:
       serializedVersion: 2
       m_Curve: