Merge remote-tracking branch 'origin/develop' into feature/hp_swim

Assets/ModelRenderer/Art/Shaders/Water/ClearWaterShader.shader

@@ -1,250 +1,217 @@
-Shader "Custom/ClearWaterShaderV3"
+Shader "Custom/WaterWithShore_Unity6"
 {
     Properties
     {
-        [Header(Water Colors)]
-        _ShallowColor ("Shallow Water Color", Color) = (0.325, 0.807, 0.971, 0.8)
-        _DeepColor ("Deep Water Color", Color) = (0.086, 0.407, 1, 0.95)
-        _DepthMaxDistance ("Depth Max Distance", Float) = 1
-        
-        [Header(Shore Visibility)]
-        _ShoreDistance ("Shore Visibility Distance", Range(0, 5)) = 1.0
-        _ShoreFade ("Shore Fade Smoothness", Range(0.01, 2)) = 0.5
-        
-        [Header(Foam)]
-        _FoamColor ("Foam Color", Color) = (1, 1, 1, 1)
-        _FoamDistance ("Foam Distance", Range(0, 2)) = 0.4
-        _FoamIntensity ("Foam Intensity", Range(0, 2)) = 1
-        _EdgeFoamWidth ("Edge Foam Width", Range(0.001, 0.5)) = 0.1
-        _VertexColorFoamWidth ("Vertex Color Foam Width", Range(0, 1)) = 0.3
+        _ShallowColor ("Shallow Color", Color) = (0.2, 0.6, 0.7, 0.8)
+        _DeepColor ("Deep Color", Color) = (0.0, 0.15, 0.25, 0.9)
+        _DepthMax ("Depth Max", Range(0.1, 10)) = 3
+
+        _WaveNormal ("Wave Normal", 2D) = "bump" {}
+        _NormalStrength ("Normal Strength", Range(0,2)) = 1
+
+        _WaveSpeed1 ("Wave Speed 1", Vector) = (0.05, 0.03, 0, 0)
+        _WaveSpeed2 ("Wave Speed 2", Vector) = (-0.03, 0.04, 0, 0)
+
+        _FoamNoise ("Foam Noise", 2D) = "white" {}
+        _FoamColor ("Foam Color", Color) = (1,1,1,1)
+        _FoamIntensity ("Foam Intensity", Range(0,2)) = 1
+        _FoamDepth ("Foam Depth", Range(0.01, 5)) = 0.6
+        _FoamNoiseScale ("Foam Noise Scale", Range(0.1, 5)) = 1
+        _FoamSpeed ("Foam Speed", Vector) = (0.1, 0.1, 0, 0)
+
+        _Smoothness ("Smoothness", Range(0,1)) = 0.85
         
         [Header(Wave Animation)]
-        _WaveHeight ("Wave Height", Range(0, 0.5)) = 0.05
-        _WaveFrequency ("Wave Frequency", Range(0, 10)) = 2
-        _WaveSpeed ("Wave Speed", Range(0, 5)) = 1
-        _WaveDirection ("Wave Direction", Vector) = (1, 0, 0, 0)
-        
-        [Header(Textures)]
-        _SurfaceNoise ("Surface Noise", 2D) = "white" {}
-        _SurfaceNoiseCutoff ("Surface Noise Cutoff", Range(0, 1)) = 0.6
-        _SurfaceNoiseScale ("Surface Noise Scale", Float) = 1
-        
-        _NormalMap ("Normal Map", 2D) = "bump" {}
-        _NormalStrength ("Normal Strength", Range(0, 2)) = 0.5
-        _NormalScale ("Normal Scale", Float) = 1
-        
-        [Header(Reflection)]
-        _Smoothness ("Smoothness", Range(0, 1)) = 0.9
-        _FresnelPower ("Fresnel Power", Range(0, 10)) = 5
-        _ReflectionStrength ("Reflection Strength", Range(0, 1)) = 0.3
-        
-        [Header(Movement)]
-        _TextureSpeed ("Texture Speed", Float) = 0.1
+        _WaveHeight ("Wave Height", Range(0, 1)) = 0.1
+        _WaveFrequency ("Wave Frequency", Range(0, 20)) = 5
+        _WaveSpeed ("Wave Speed", Range(0, 10)) = 2
+        _WaveDirection ("Wave Direction", Vector) = (1, 1, 0, 0)
     }
-    
+
     SubShader
     {
         Tags
         {
-            "Queue" = "Transparent"
-            "RenderType" = "Transparent"
-            "RenderPipeline" = "UniversalRenderPipeline"
+            "RenderPipeline"="UniversalPipeline"
+            "Queue"="Transparent"
+            "RenderType"="Transparent"
         }
-        
+
         Pass
         {
+            Name "ForwardLit"
+            Tags { "LightMode"="UniversalForward" }
+
             Blend SrcAlpha OneMinusSrcAlpha
             ZWrite Off
-            
+
             HLSLPROGRAM
             #pragma vertex vert
             #pragma fragment frag
-            
+            #pragma target 3.0
+            #pragma prefer_hlslcc gles
+
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
-            #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareDepthTexture.hlsl"
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
-            
+
+            TEXTURE2D(_WaveNormal);
+            SAMPLER(sampler_WaveNormal);
+
+            TEXTURE2D(_FoamNoise);
+            SAMPLER(sampler_FoamNoise);
+
+            TEXTURE2D_X_FLOAT(_CameraDepthTexture);
+            SAMPLER(sampler_CameraDepthTexture);
+
+            CBUFFER_START(UnityPerMaterial)
+                float4 _ShallowColor;
+                float4 _DeepColor;
+                float _DepthMax;
+
+                float4 _WaveSpeed1;
+                float4 _WaveSpeed2;
+                float _NormalStrength;
+
+                float4 _FoamColor;
+                float _FoamIntensity;
+                float _FoamDepth;
+                float _FoamNoiseScale;
+                float4 _FoamSpeed;
+
+                float _Smoothness;
+                
+                float _WaveHeight;
+                float _WaveFrequency;
+                float _WaveSpeed;
+                float4 _WaveDirection;
+            CBUFFER_END
+
             struct Attributes
             {
                 float4 positionOS : POSITION;
-                float3 normalOS : NORMAL;
-                float4 tangentOS : TANGENT;
                 float2 uv : TEXCOORD0;
-                float4 color : COLOR;
             };
-            
+
             struct Varyings
             {
                 float4 positionCS : SV_POSITION;
                 float2 uv : TEXCOORD0;
                 float4 screenPos : TEXCOORD1;
-                float3 normalWS : TEXCOORD2;
-                float3 tangentWS : TEXCOORD3;
-                float3 bitangentWS : TEXCOORD4;
-                float3 viewDirWS : TEXCOORD5;
-                float3 positionWS : TEXCOORD6;
-                float waveValue : TEXCOORD7;
-                float4 vertexColor : COLOR;
+                float3 positionWS : TEXCOORD2;
+                float3 normalWS : TEXCOORD3;
             };
-            
-            sampler2D _SurfaceNoise;
-            sampler2D _NormalMap;
-            
-            CBUFFER_START(UnityPerMaterial)
-                float _SurfaceNoiseCutoff;
-                float _SurfaceNoiseScale;
-                float _FoamDistance;
-                float _FoamIntensity;
-                float _EdgeFoamWidth;
-                float _VertexColorFoamWidth;
-                float _DepthMaxDistance;
-                float _NormalStrength;
-                float _NormalScale;
-                float _Smoothness;
-                float _FresnelPower;
-                float _ReflectionStrength;
-                float _TextureSpeed;
-                float _ShoreDistance;
-                float _ShoreFade;
-                float _WaveHeight;
-                float _WaveFrequency;
-                float _WaveSpeed;
-                float4 _WaveDirection;
-                float4 _ShallowColor;
-                float4 _DeepColor;
-                float4 _FoamColor;
-            CBUFFER_END
-            
-            float3 TriplanarSample(sampler2D tex, float3 worldPos, float3 worldNormal, float scale, float2 offset)
+
+            Varyings vert (Attributes v)
             {
-                float3 blendWeights = abs(worldNormal);
-                blendWeights = blendWeights / (blendWeights.x + blendWeights.y + blendWeights.z);
+                Varyings o;
                 
-                float3 xSample = tex2D(tex, worldPos.zy * scale + offset).rgb;
-                float3 ySample = tex2D(tex, worldPos.xz * scale + offset).rgb;
-                float3 zSample = tex2D(tex, worldPos.xy * scale + offset).rgb;
-                
-                return xSample * blendWeights.x + ySample * blendWeights.y + zSample * blendWeights.z;
-            }
-            
-            float3 TriplanarNormal(sampler2D tex, float3 worldPos, float3 worldNormal, float scale, float2 offset)
-            {
-                float3 blendWeights = abs(worldNormal);
-                blendWeights = blendWeights / (blendWeights.x + blendWeights.y + blendWeights.z);
-                
-                float3 xNormal = UnpackNormal(tex2D(tex, worldPos.zy * scale + offset));
-                float3 yNormal = UnpackNormal(tex2D(tex, worldPos.xz * scale + offset));
-                float3 zNormal = UnpackNormal(tex2D(tex, worldPos.xy * scale + offset));
-                
-                return xNormal * blendWeights.x + yNormal * blendWeights.y + zNormal * blendWeights.z;
-            }
-            
-            Varyings vert(Attributes input)
-            {
-                Varyings output;
-                
-                VertexPositionInputs positionInputs = GetVertexPositionInputs(input.positionOS.xyz);
-                VertexNormalInputs normalInputs = GetVertexNormalInputs(input.normalOS, input.tangentOS);
-                
-                float3 worldPos = positionInputs.positionWS;
+                // Transform to world space first
+                float3 worldPos = TransformObjectToWorld(v.positionOS.xyz);
                 
+                // === WAVE ANIMATION ===
                 float2 waveDir = normalize(_WaveDirection.xy);
-                float waveDist = dot(worldPos.xz, waveDir);
-                float wavePhase = waveDist * _WaveFrequency - _Time.y * _WaveSpeed;
-                float wave = sin(wavePhase);
                 
-                worldPos.y += wave * _WaveHeight;
+                // Primary wave (moving wave)
+                float wave1 = sin(
+                    dot(worldPos.xz, waveDir) * _WaveFrequency - 
+                    _Time.y * _WaveSpeed
+                ) * _WaveHeight;
                 
-                output.positionCS = TransformWorldToHClip(worldPos);
-                output.positionWS = worldPos;
-                output.screenPos = ComputeScreenPos(output.positionCS);
-                output.uv = input.uv;
-                output.normalWS = normalInputs.normalWS;
-                output.tangentWS = normalInputs.tangentWS;
-                output.bitangentWS = normalInputs.bitangentWS;
-                output.viewDirWS = GetWorldSpaceViewDir(worldPos);
-                output.waveValue = wave * 0.5 + 0.5;
-                output.vertexColor = input.color;
+                // Secondary wave (perpendicular, different frequency)
+                float2 waveDir2 = float2(-waveDir.y, waveDir.x); // Perpendicular
+                float wave2 = sin(
+                    dot(worldPos.xz, waveDir2) * _WaveFrequency * 0.7 - 
+                    _Time.y * _WaveSpeed * 0.8
+                ) * _WaveHeight * 0.5;
                 
-                return output;
+                // Combine waves
+                worldPos.y += wave1 + wave2;
+                
+                o.positionWS = worldPos;
+                o.positionCS = TransformWorldToHClip(worldPos);
+                o.screenPos = ComputeScreenPos(o.positionCS);
+                o.uv = v.uv;
+                o.normalWS = TransformObjectToWorldNormal(float3(0,1,0));
+                return o;
             }
-            
-            float4 frag(Varyings input) : SV_Target
+
+            half4 frag (Varyings input) : SV_Target
             {
-                float3 worldNormal = normalize(input.normalWS);
-                
-                float2 timeOffset1 = _Time.y * _TextureSpeed * float2(1, 0.5);
-                float2 timeOffset2 = _Time.y * _TextureSpeed * float2(-0.7, -0.3);
-                
-                float3 normalMap1 = TriplanarNormal(_NormalMap, input.positionWS, worldNormal, _NormalScale, timeOffset1);
-                float3 normalMap2 = TriplanarNormal(_NormalMap, input.positionWS, worldNormal, _NormalScale * 1.3, timeOffset2);
-                
-                float3 normalTS = normalize(normalMap1 + normalMap2);
+                // === NORMAL WAVES ===
+                float2 uv1 = input.uv + _Time.y * _WaveSpeed1.xy;
+                float2 uv2 = input.uv + _Time.y * _WaveSpeed2.xy;
+
+                float3 n1 = UnpackNormal(SAMPLE_TEXTURE2D(_WaveNormal, sampler_WaveNormal, uv1));
+                float3 n2 = UnpackNormal(SAMPLE_TEXTURE2D(_WaveNormal, sampler_WaveNormal, uv2));
+
+                float3 normalTS = n1 + n2;
                 normalTS.xy *= _NormalStrength;
-                
-                float3x3 tangentToWorld = float3x3(input.tangentWS, input.bitangentWS, input.normalWS);
-                float3 normalWS = normalize(mul(normalTS, tangentToWorld));
-                
+                normalTS = normalize(normalTS);
+
+                float3 normalWS = normalize(TransformTangentToWorld(
+                    normalTS,
+                    half3x3(
+                        float3(1,0,0),
+                        float3(0,0,1),
+                        input.normalWS
+                    )
+                ));
+
+                // === DEPTH ===
                 float2 screenUV = input.screenPos.xy / input.screenPos.w;
-                
-                float existingDepth01 = SampleSceneDepth(screenUV);
-                float existingDepthLinear = LinearEyeDepth(existingDepth01, _ZBufferParams);
-                float surfaceDepthLinear = LinearEyeDepth(input.positionCS.z, _ZBufferParams);
-                float depthDifference = existingDepthLinear - surfaceDepthLinear;
-                
-                float waterDepthDifference01 = saturate(depthDifference / _DepthMaxDistance);
-                float3 waterColor = lerp(_ShallowColor.rgb, _DeepColor.rgb, waterDepthDifference01);
-                
-                float shoreVisibility = saturate(depthDifference / _ShoreDistance);
-                shoreVisibility = smoothstep(0, _ShoreFade, shoreVisibility);
-                
-                // VERTEX COLOR EDGE DETECTION
-                float vertexEdge = input.vertexColor.r;
-                float vertexEdgeFoam = smoothstep(_VertexColorFoamWidth, 0, vertexEdge);
-                
-                // Depth-based edge detection (for objects like cylinder)
-                float depthEdge = saturate(depthDifference / _EdgeFoamWidth);
-                depthEdge = 1.0 - depthEdge;
-                depthEdge = pow(depthEdge, 2);
-                
-                // Combine both methods
-                float edgeDetection = max(vertexEdgeFoam, depthEdge);
-                
-                float wave = pow(input.waveValue, 2);
-                float foamArea = 1.0 - saturate(depthDifference / _FoamDistance);
-                float waveContribution = wave * max(foamArea, vertexEdgeFoam);
-                
-                float foamNoise1 = TriplanarSample(_SurfaceNoise, input.positionWS, worldNormal, _SurfaceNoiseScale, timeOffset1).r;
-                float foamNoise2 = TriplanarSample(_SurfaceNoise, input.positionWS, worldNormal, _SurfaceNoiseScale * 1.5, timeOffset2).r;
-                float combinedNoise = foamNoise1 * foamNoise2;
-                
-                float foamMask = smoothstep(_SurfaceNoiseCutoff - 0.1, _SurfaceNoiseCutoff + 0.1, combinedNoise);
-                
-                float edgeFoam = edgeDetection * foamMask;
-                float waveFoam = waveContribution * foamMask;
-                
-                float totalFoam = max(edgeFoam, waveFoam * 0.7) * _FoamIntensity;
-                totalFoam = saturate(totalFoam);
-                
-                float3 viewDir = normalize(input.viewDirWS);
-                float fresnel = pow(1.0 - saturate(dot(normalWS, viewDir)), _FresnelPower);
-                
+                float rawDepth = SAMPLE_TEXTURE2D_X(
+                    _CameraDepthTexture,
+                    sampler_CameraDepthTexture,
+                    screenUV
+                ).r;
+
+                float sceneDepth = LinearEyeDepth(rawDepth, _ZBufferParams);
+
+                float waterDepth = LinearEyeDepth(
+                    input.screenPos.z / input.screenPos.w,
+                    _ZBufferParams
+                );
+
+                float depthDiff = sceneDepth - waterDepth;
+
+                // === DEPTH COLOR BLEND ===
+                float depth01 = saturate(depthDiff / _DepthMax);
+                float3 waterColor = lerp(
+                    _ShallowColor.rgb,
+                    _DeepColor.rgb,
+                    depth01
+                );
+
+                // === SHORE FOAM ===
+                float shoreMask = saturate(1.0 - depthDiff / _FoamDepth);
+
+                float2 foamUV =
+                    input.positionWS.xz * _FoamNoiseScale +
+                    _Time.y * _FoamSpeed.xy;
+
+                float foamNoise = SAMPLE_TEXTURE2D(
+                    _FoamNoise,
+                    sampler_FoamNoise,
+                    foamUV
+                ).r;
+
+                float foam = shoreMask * foamNoise * _FoamIntensity;
+
+                // === LIGHTING ===
                 Light mainLight = GetMainLight();
-                float3 halfVector = normalize(mainLight.direction + viewDir);
-                float specular = pow(saturate(dot(normalWS, halfVector)), _Smoothness * 128.0);
-                
-                float3 reflection = fresnel * _ReflectionStrength;
-                
-                float3 finalColor = waterColor;
-                finalColor += specular * mainLight.color * 0.5;
-                finalColor = lerp(finalColor, float3(0.7, 0.85, 1), reflection);
-                finalColor = lerp(finalColor, _FoamColor.rgb, totalFoam * 0.9);
-                
-                float baseAlpha = lerp(_ShallowColor.a, _DeepColor.a, waterDepthDifference01);
-                float shoreAlpha = lerp(0.8, baseAlpha, shoreVisibility);
-                float finalAlpha = saturate(shoreAlpha + totalFoam * 0.5);
-                
-                return float4(finalColor, finalAlpha);
+                float NdotL = saturate(dot(normalWS, mainLight.direction));
+
+                float3 finalColor =
+                    waterColor * NdotL +
+                    foam * _FoamColor.rgb;
+
+                float alpha = lerp(
+                    _ShallowColor.a,
+                    _DeepColor.a,
+                    depth01
+                );
+
+                return float4(finalColor, alpha);
             }
             ENDHLSL
         }

Assets/ModelRenderer/Art/Shaders/Water/Water.mat

@@ -14,16 +14,42 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _DEBUGDEPTH_ON
+  - _USEUVSHORE_ON
+  - _WAVE_SINE_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap: {}
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _EdgeMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FoamNoise:
+        m_Texture: {fileID: 2800000, guid: b6f4fa4253519934f96d918d7c34bc8d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FoamNoiseA:
+        m_Texture: {fileID: 2800000, guid: 064ebb4006db3934697a80619febcb44, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FoamNoiseB:
+        m_Texture: {fileID: 2800000, guid: 89c13dff71f555349bbeed61fd7f0402, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FoamTexture:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _NormalMap:
         m_Texture: {fileID: 2800000, guid: 93c0aa606876cb04384552a948f281df, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -33,18 +59,49 @@ Material:
         m_Scale: {x: 10, y: 10}
         m_Offset: {x: 0, y: 0}
     - _SurfaceNoise:
-        m_Texture: {fileID: 2800000, guid: b6f4fa4253519934f96d918d7c34bc8d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 064ebb4006db3934697a80619febcb44, type: 3}
+        m_Scale: {x: 13.3, y: 10}
+        m_Offset: {x: 0, y: 0}
+    - _SurfaceNoise2:
+        m_Texture: {fileID: 2800000, guid: 89c13dff71f555349bbeed61fd7f0402, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _WaveNormal:
+        m_Texture: {fileID: 2800000, guid: 93c0aa606876cb04384552a948f281df, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - _DebugFoam: 0
+    - _DebugUV2: 0
     - _DeepAlpha: 0.9
-    - _DepthMaxDistance: 0.5
-    - _EdgeFoamWidth: 0.5
+    - _DepthMax: 3.06
+    - _DepthMaxDistance: 0.9
+    - _EdgeDebug: 0
+    - _EdgeFalloff: 2
+    - _EdgeFoamPower: 1.84
+    - _EdgeFoamWidth: 0.251
+    - _EdgeStrength: 0.485
+    - _EdgeThreshold: 0.1
+    - _EdgeWidth: 0.2
+    - _FoamCutoff: 0.397
+    - _FoamDepth: 0.92
     - _FoamDistance: 1
-    - _FoamIntensity: 1
+    - _FoamFalloff: 2.94
+    - _FoamIntensity: 1.007
     - _FoamMaxDistance: 1.2
     - _FoamMinDistance: 0.1
+    - _FoamNoiseCutoff: 0.5
+    - _FoamNoiseScale: 3.13
+    - _FoamNoiseScaleA: 0.49
+    - _FoamNoiseScaleB: 1
+    - _FoamNoiseSpeed: 0.1
+    - _FoamNoiseSpeedA: 0.1
+    - _FoamNoiseSpeedB: -0.07
+    - _FoamScale: 1
+    - _FoamSpeed: 0
+    - _FoamTiling: 1
+    - _FoamWidth: 3.81
     - _FresnelPower: 5
     - _NormalScale: 0.4
     - _NormalSpeed: 0.1
@@ -53,19 +110,37 @@ Material:
     - _ShallowAlpha: 0.5
     - _ShoreDistance: 1
     - _ShoreFade: 1
-    - _Smoothness: 0.493
+    - _ShoreHeight: -4.3
+    - _ShoreUV2Threshold: 0.552
+    - _ShoreUVThreshold: 0.1
+    - _Smoothness: 0.555
     - _SurfaceDistortionAmount: 0.257
-    - _SurfaceNoiseCutoff: 0
-    - _SurfaceNoiseScale: 1.7
+    - _SurfaceNoise2Scale: 1.6
+    - _SurfaceNoiseCutoff: 0.222
+    - _SurfaceNoiseScale: 1.25
     - _TextureSpeed: 0.3
-    - _WaveFrequency: 5
-    - _WaveHeight: 0.1
-    - _WaveSpeed: 1
+    - _UseUVShore: 1
+    - _VertexColorFoamWidth: 0.3
+    - _WaveFrequency: 2.55
+    - _WaveGerstnerOn: 0
+    - _WaveHeight: 0.08
+    - _WaveSineOn: 1
+    - _WaveSpeed: 0.95
+    - _WaveSteepness: 0.5
+    - _WavesOn: 0
     m_Colors:
-    - _DeepColor: {r: 0, g: 0.7264151, b: 0.67566013, a: 0.749}
+    - _BaseColor: {r: 0, g: 1, b: 0.9534545, a: 0.8509804}
+    - _Color: {r: 0, g: 0.5, b: 1, a: 0.8}
+    - _DeepColor: {r: 0, g: 0.9803924, b: 1, a: 0.78431374}
     - _FoamColor: {r: 1, g: 1, b: 1, a: 1}
+    - _FoamSpeed: {r: 0.1, g: 0.1, b: 0, a: 0}
+    - _FoamSpeedA: {r: 0.1, g: 0.1, b: 0, a: 0}
+    - _FoamSpeedB: {r: -0.08, g: 0.06, b: 0, a: 0}
     - _NormalTiling: {r: 40, g: 40, b: 0, a: 0}
-    - _ShallowColor: {r: 0.086908154, g: 0.8773585, b: 0.8218133, a: 1}
+    - _ShallowColor: {r: 0, g: 0.9806142, b: 1, a: 1}
+    - _WaterColor: {r: 0.19999996, g: 0.6, b: 0.8, a: 0.8}
     - _WaveDirection: {r: 1, g: 1, b: 0, a: 0}
+    - _WaveSpeed1: {r: 0.05, g: 0.03, b: 0, a: 0}
+    - _WaveSpeed2: {r: -0.03, g: 0.04, b: 0, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1

Assets/PerfectWorld/Prefab/GameController.prefab

@@ -1,332 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1907375868528687128
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3488899534283412697}
-  - component: {fileID: 7907247812297230186}
-  - component: {fileID: 4758101108332602619}
-  - component: {fileID: 1387587181254949733}
-  m_Layer: 0
-  m_Name: AreaTouchCam
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3488899534283412697
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1907375868528687128}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3233441867675090637}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7907247812297230186
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1907375868528687128}
-  m_CullTransparentMesh: 1
---- !u!114 &4758101108332602619
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1907375868528687128}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1387587181254949733
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1907375868528687128}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cbda204e0e5552e4692f0f5e234f062d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _cinemachineCamera: {fileID: 0}
-  orbital: {fileID: 0}
-  minSwipeDistance: 0.1
-  speedX: 300
-  speedY: 500
---- !u!1 &2486392142327362049
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3233441867675090637}
-  - component: {fileID: 7894129013412138377}
-  - component: {fileID: 1184637750286334292}
-  - component: {fileID: 7240944814921333938}
-  m_Layer: 0
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3233441867675090637
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2486392142327362049}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3488899534283412697}
-  m_Father: {fileID: 2780428059708698453}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!223 &7894129013412138377
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2486392142327362049}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: -1
-  m_TargetDisplay: 0
---- !u!114 &1184637750286334292
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2486392142327362049}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &7240944814921333938
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2486392142327362049}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!1 &5522724576952329669
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 330835371656537333}
-  m_Layer: 0
-  m_Name: Debug
-  m_TagString: EditorOnly
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &330835371656537333
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5522724576952329669}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1346904365279017329}
-  m_Father: {fileID: 2780428059708698453}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6950113420985123515
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2780428059708698453}
-  - component: {fileID: 1890210201668811196}
-  m_Layer: 0
-  m_Name: GameController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2780428059708698453
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6950113420985123515}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3233441867675090637}
-  - {fileID: 330835371656537333}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1890210201668811196
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6950113420985123515}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d21c02a79936b334da12ef5379524df2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  uiRoot: {fileID: 0}
-  uiPrefabs: []
-  npsUI: {fileID: 0}
-  currentTargetNPCID: 0
-  dialogResouce: {fileID: 11400000, guid: 540bc8e61556ba4479407a2d68e17580, type: 2}
-  canvasDlg: {fileID: 7894129013412138377}
-  cDlgQuickBar: {fileID: 0}
-  btnSecondClick: {fileID: 0}
-  m_pDlgQuickBar1: {fileID: 0}
---- !u!1 &7671247430617142335
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1346904365279017329}
-  - component: {fileID: 7689112185835118274}
-  m_Layer: 0
-  m_Name: TestCmdGoTo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1346904365279017329
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7671247430617142335}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 330835371656537333}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7689112185835118274
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7671247430617142335}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a84bac74bd843ff9a59a95f80db46f0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _targetLayer:
-    serializedVersion: 2
-    m_Bits: 64
-  _target: {x: 0, y: 0, z: 0}

Assets/Prefabs/BoostrapForTest.prefab

@@ -78,8 +78,6 @@ Transform:
   - {fileID: 3304007787827206689}
   - {fileID: 2466055582606182659}
   - {fileID: 1374891186888298875}
-  - {fileID: 711777080245215489}
-  - {fileID: 7364935673883923056}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6961568406954853849
@@ -522,510 +520,3 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
   m_PrefabInstance: {fileID: 1374891186868484667}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1597073214178286216
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8647913387955223815}
-    m_Modifications:
-    - target: {fileID: 5713000252331107611, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_Name
-      value: Canvas_Skill
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
---- !u!224 &7364935673883923056 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8078455359151753464, guid: be3a491baf7e4be4487c4eb18ea11468, type: 3}
-  m_PrefabInstance: {fileID: 1597073214178286216}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &6181970391454287574
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8647913387955223815}
-    m_Modifications:
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_text
-      value: 150K/150K
-      objectReference: {fileID: 0}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSize
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMax
-      value: 30
-      objectReference: {fileID: 0}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMin
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeBase
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 1313768687643874887, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2}
-    - target: {fileID: 1501462210578865223, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 1662003704246427283, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -9
-      objectReference: {fileID: 0}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSize
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMax
-      value: 18
-      objectReference: {fileID: 0}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMin
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeBase
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 1737072187259709926, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2}
-    - target: {fileID: 1822625665170167719, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 2.300003
-      objectReference: {fileID: 0}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_text
-      value: '105
-
-'
-      objectReference: {fileID: 0}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontStyle
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMax
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMin
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3632374887765724611, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2}
-    - target: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Type
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_FillMethod
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -20.6339
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4495930669477963121, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -2.8752
-      objectReference: {fileID: 0}
-    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: expImage
-      value: 
-      objectReference: {fileID: 3733224041861329312}
-    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: manaImage
-      value: 
-      objectReference: {fileID: 6244221233348898833}
-    - target: {fileID: 4616316815177720404, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: healthImage
-      value: 
-      objectReference: {fileID: 7824698984410963527}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -25.7078
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6306963712940686582, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -4.397293
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_margin.z
-      value: 0.030044556
-      objectReference: {fileID: 0}
-    - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
-    - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: 2100000, guid: 13f71bf0225d0c0439db9931000d75d0, type: 2}
-    - target: {fileID: 6716045574192280964, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_VerticalAlignment
-      value: 4096
-      objectReference: {fileID: 0}
-    - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 262.3562
-      objectReference: {fileID: 0}
-    - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 25.9796
-      objectReference: {fileID: 0}
-    - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 74.25657
-      objectReference: {fileID: 0}
-    - target: {fileID: 7023923657206919726, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 28.228401
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -18.9426
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9083539964745989859, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -5.0738983
-      objectReference: {fileID: 0}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSize
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 369c2e14814cc9a4b8e3ad4e37769134, type: 2}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMax
-      value: 18
-      objectReference: {fileID: 0}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeMin
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_fontSizeBase
-      value: 17
-      objectReference: {fileID: 0}
-    - target: {fileID: 9091953190536401803, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: 2100000, guid: 31b77628c21b17e45a6577a3d3d5aef0, type: 2}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
---- !u!224 &711777080245215489 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6641252726352799703, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-  m_PrefabInstance: {fileID: 6181970391454287574}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &3733224041861329312 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7351517459147011958, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-  m_PrefabInstance: {fileID: 6181970391454287574}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &6244221233348898833 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 246901321761552071, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-  m_PrefabInstance: {fileID: 6181970391454287574}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &7824698984410963527 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4133230328392276113, guid: 85e1921c890476a48be07e3cc7d5e69d, type: 3}
-  m_PrefabInstance: {fileID: 6181970391454287574}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

Assets/Prefabs/UI/DialogNPC.prefab

@@ -644,7 +644,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.5019608}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1099,8 +1099,8 @@ RectTransform:
   m_GameObject: {fileID: 5717174923209038532}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4417434749515336320}
   - {fileID: 6721994976154660856}

Assets/Prefabs/UI/DialogNPCShop.prefab

@@ -279,7 +279,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 111.435, y: -208.8725}
-  m_SizeDelta: {x: 222.87, y: 159.49}
+  m_SizeDelta: {x: 222.87, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4686984658772048795
 CanvasRenderer:
@@ -483,8 +483,8 @@ RectTransform:
   m_GameObject: {fileID: 936487781243711958}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.6, y: 1.6, z: 1.6}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2620840836205932051}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -671,9 +671,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6395384702497515303}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 100, y: -338.745}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7885220584006353194
@@ -895,12 +895,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8456b18cc099671499414348dc8b6833, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  itemNameText: {fileID: 2676848775259769377}
   itemDescriptionText:
     legacy: {fileID: 0}
     tmp: {fileID: 1509498505529622136}
   itemIconImage: {fileID: 5729739685989188916}
-  itemPriceText: {fileID: 3533247489785110134}
   closeButton: {fileID: 0}
   buyButton: {fileID: 8389070210905274962}
 --- !u!1 &4908057423142066038
@@ -937,9 +935,9 @@ RectTransform:
   - {fileID: 748424451840968806}
   m_Father: {fileID: 6395384702497515303}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 80, y: -403.8725}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3048280743589918903
@@ -1248,8 +1246,8 @@ RectTransform:
   m_GameObject: {fileID: 5717174923209038532}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.6, y: 1.6, z: 1.6}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 4417434749515336320}
   - {fileID: 6721994976154660856}
@@ -1537,9 +1535,9 @@ RectTransform:
   - {fileID: 9142139139664456862}
   m_Father: {fileID: 6395384702497515303}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 40, y: -64}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4747854579702091263
@@ -1987,7 +1985,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5268642982485591419}
   - {fileID: 617338231045505643}

Assets/Scenes/a61.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e061f4870d980f3ea929a34fa1dc95ea640cd5d8071ed5638bcdd9a7ac5461c
-size 200797970
+oid sha256:93bd71a1075577b8cfeb184d2dd0dbe13c961132bb7dbffbf13f53c62f694dff
+size 200524005

Assets/Settings/PC_Renderer.asset

@@ -26,8 +26,7 @@ MonoBehaviour:
     probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3}
   m_RendererFeatures:
   - {fileID: 7833122117494664109}
-  - {fileID: 8125385250427379991}
-  m_RendererFeatureMap: ad6b866f10d7b46c1721eccad52ac370
+  m_RendererFeatureMap: ad6b866f10d7b46c
   m_UseNativeRenderPass: 1
   xrSystemData: {fileID: 0}
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
@@ -79,25 +78,3 @@ MonoBehaviour:
     BlurQuality: 0
     Falloff: 100
     SampleCount: -1
---- !u!114 &8125385250427379991
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8ef155ec9c34edb4b8b06643ee9d03e6, type: 3}
-  m_Name: BloomRenderFeature
-  m_EditorClassIdentifier: 
-  m_Active: 1
-  settings:
-    passEvent: 600
-    blurShader: {fileID: 4800000, guid: 4d6d9b12d1a898149a1306f40a209743, type: 3}
-    compositeShader: {fileID: 4800000, guid: 02922202fbca48c49bbfd2e2f221b152, type: 3}
-    downsample: 2
-    threshold: 0.936
-    radius: 1
-    intensity: 1.68
-    weights: {x: 0.2, y: 0.4, z: 0.8}

Assets/water.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7fa8f3034a9b2e34dbb43ab302864e9f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/water/caust00.dds.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 89c13dff71f555349bbeed61fd7f0402
+IHVImageFormatImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  isReadable: 0
+  sRGBTexture: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  ignoreMipmapLimit: 0
+  mipmapLimitGroupName: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/water/caust10.dds.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 064ebb4006db3934697a80619febcb44
+IHVImageFormatImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  isReadable: 0
+  sRGBTexture: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  ignoreMipmapLimit: 0
+  mipmapLimitGroupName: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: