Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Art/cs3.scene   resolved by master version

Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat

@@ -17,13 +17,17 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2950
+  m_CustomRenderQueue: 3000
   stringTagMap: {}
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _DepthTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 58718a051bb586b42a7dd166d366d188, type: 3}
         m_Scale: {x: 10, y: 10}
@@ -42,12 +46,12 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 1
+    - _Alpha: 0.753
     - _AlphaContrast: 0.5
     - _AlphaExtent: 5
-    - _MoveSpeed: 0.03
-    - _ParallaxLayers: 50
-    - _ParallaxSize: 0.1
+    - _MoveSpeed: 0.15
+    - _ParallaxLayers: 12.6
+    - _ParallaxSize: 0.0753
     - _ParallaxType: 4
     - _SteepParallax: 1
     - _ViewOffset: 0

Assets/Art/ParallaxCloud/Shader/ParallaxCloud.shader

@@ -2,19 +2,19 @@ Shader "Custom/ParallaxCloud"
 {
     Properties
     {
-        _MainTex        ("BaseMap：基础贴图", 2D) = "white" {}
-        _Color          ("Color：颜色", Color) = (0.0, 0.0, 0.0, 1.0)
-        _ParallaxSize   ("ParallaxSize：视差映射强度", Range(0.0, 0.1)) = 0.0
-        _ParallaxLayers ("ParallaxLayers：视差映射层数",  Range(1.0, 50.0)) = 20
-        _MoveSpeed      ("MoveSpeed：移动速度", Range(-0.5, 0.5)) = 0.1
-        _Alpha          ("Alpha：透明度", Range(0, 1)) = 0.5
-        _AlphaExtent    ("AlphaExtent：透明对比度", Range(0.0, 5.0)) = 5.0
+        _MainTex ("BaseMap：基础贴图", 2D) = "white" {}
+        _Color ("Color：颜色", Color) = (0.0, 0.0, 0.0, 1.0)
+        _ParallaxSize ("ParallaxSize：视差映射强度", Range(0.0, 0.1)) = 0.0
+        _ParallaxLayers ("ParallaxLayers：视差映射层数", Range(1.0, 50.0)) = 20
+        _MoveSpeed ("MoveSpeed：移动速度", Range(-0.5, 0.5)) = 0.1
+        _Alpha ("Alpha：透明度", Range(0, 1)) = 0.5
+        _AlphaExtent ("AlphaExtent：透明对比度", Range(0.0, 5.0)) = 5.0
     }
-    
+
     SubShader
     {
-        Tags       
-        { 
+        Tags
+        {
             "RenderPipeline"="UniversalPipeline"
             "Queue"="Transparent"
             "RenderType"="Transparent"
@@ -24,67 +24,120 @@ Shader "Custom/ParallaxCloud"
         {
             Blend SrcAlpha OneMinusSrcAlpha
             Cull off
-            
+            ZWrite off
+
             HLSLPROGRAM
             #pragma vertex vert
             #pragma fragment frag
             #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl"
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
-            
+
             struct Attributes
             {
                 float4 positionOS : POSITION;
-                float3 normalOS   : NORMAL;
-                float2 uv         : TEXCOORD0;
-                float4 tangent    : TANGENT;
+                float3 normalOS : NORMAL;
+                float2 uv : TEXCOORD0;
+                float4 tangent : TANGENT;
             };
 
             struct Varyings
             {
                 float4 positionCS : SV_POSITION;
                 float3 positionWS : TEXCOORD0;
-                float4 uv         : TEXCOORD1;
-                float3 nDirWS     : TEXCOORD2;
-                float3 tDirWS     : TEXCOORD3;
-                float3 bDirWS     : TEXCOORD4;
+                float4 uv : TEXCOORD1;
+                float3 nDirWS : TEXCOORD2;
+                float3 tDirWS : TEXCOORD3;
+                float3 bDirWS : TEXCOORD4;
+                float4 screenPos : TEXCOORD5;
             };
 
             CBUFFER_START(UnityPerMaterial)
-            half4 _MainTex_ST;
-            half4 _Color;
-            half _ParallaxSize;
-            half _ParallaxLayers;
-            half _MoveSpeed;
-            half _Alpha;
-            half _AlphaExtent;
+                half4 _MainTex_ST;
+                half4 _Color;
+                half _ParallaxSize;
+                half _ParallaxLayers;
+                half _MoveSpeed;
+                half _Alpha;
+                half _AlphaExtent;
             CBUFFER_END
-            TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex);
-            TEXTURE2D(_NormalTex); SAMPLER(sampler_NormalTex);
-            TEXTURE2D(_ParallaxTex); SAMPLER(sampler_ParallaxTex);
-            
-            Varyings vert (Attributes v)
+
+            TEXTURE2D(_MainTex);
+            SAMPLER(sampler_MainTex);
+            TEXTURE2D(_NormalTex);
+            SAMPLER(sampler_NormalTex);
+            TEXTURE2D(_ParallaxTex);
+            SAMPLER(sampler_ParallaxTex);
+            sampler2D _CameraDepthTexture;
+
+            Varyings vert(Attributes v)
             {
                 Varyings o;
                 o.positionCS = TransformObjectToHClip(v.positionOS.xyz);
                 o.positionWS = TransformObjectToWorld(v.positionOS.xyz);
-                o.nDirWS  = TransformObjectToWorldNormal(v.normalOS);
+                o.nDirWS = TransformObjectToWorldNormal(v.normalOS);
                 o.tDirWS = normalize(TransformObjectToWorld(v.tangent.xyz));
                 o.bDirWS = normalize(cross(o.nDirWS, o.tDirWS) * v.tangent.w);
-                o.uv.xy = TRANSFORM_TEX(v.uv, _MainTex) + float2(frac(_Time.y * _MoveSpeed), 0.0);
+                // o.uv.xy = TRANSFORM_TEX(v.uv, _MainTex) + float2(frac(_Time.y * _MoveSpeed), 0.0);
+                 o.uv.xy=  o.positionWS.xz*0.06+ float2(frac(_Time.y * _MoveSpeed), 0.0);
                 o.uv.zw = v.uv;
+                o.screenPos = ComputeScreenPos(o.positionCS);
                 return o;
             }
 
-            half4 frag (Varyings i) : SV_Target
+            // 从深度值重建世界坐标
+            float3 ReconstructWorldPosition(float2 uv, float depth)
             {
+                // 1. 将 UV 转换为 NDC 空间 (Normalized Device Coordinates)
+                float4 ndc = float4(uv * 2.0 - 1.0, depth, 1.0);
+
+                // 2. 从 NDC 转换到裁剪空间
+                float4 clipPos = ndc;
+                clipPos.z = depth * 2.0 - 1.0; // 将深度从 [0,1] 转换为 [-1,1]
+
+                // 3. 应用逆投影矩阵，转换到视图空间
+                float4 viewPos = mul(unity_CameraInvProjection, clipPos); // 使用 Unity 内置的逆投影矩阵
+                viewPos /= viewPos.w; // 透视除法
+
+                // 4. 应用逆视图矩阵，转换到世界空间
+                float4 worldPos = mul(UNITY_MATRIX_I_V, viewPos); // 使用 Unity 内置的逆视图矩阵
+
+                return worldPos.xyz;
+            }
+
+            half4 frag(Varyings i) : SV_Target
+            {
+                float2 positionSS = i.positionCS.xy * (_ScreenParams.zw - 1);
+                float depth = tex2D(_CameraDepthTexture, positionSS).r;
+                float3 positionNDC = float3(positionSS * 2 - 1, depth);
+
+                #if UNITY_UV_STARTS_AT_TOP
+                positionNDC.y = -positionNDC.y;
+                #endif
+
+                #if REQUIRE_POSITION_VS
+        float4 positionVS = mul(UNITY_MATRIX_I_P, float4(positionNDC, 1));
+        positionVS /= positionVS.w;
+        float4 positionWS = mul(UNITY_MATRIX_I_V, positionVS);
+                #else
+                float4 positionWS = mul(UNITY_MATRIX_I_VP, float4(positionNDC, 1));
+                positionWS /= positionWS.w;
+                #endif
+                float dist = length(positionWS - i.positionWS);
+                // return half4(dist * 0.1, 0, 0, 1.0);
+                dist = dist * 0.2;
+                dist = clamp(dist, 0, 1);
+
+                float ptcpos=length(i.positionWS-_WorldSpaceCameraPos);
+                ptcpos= 1-(ptcpos-100)/50;
+                ptcpos=clamp(ptcpos,0,1);
                 //Light mylight = GetMainLight();
                 //half3 light = mylight.color;
                 float3x3 TBN = float3x3(i.tDirWS, i.bDirWS, i.nDirWS);
                 float3 vDir = normalize(i.positionWS - _WorldSpaceCameraPos.xyz);
                 float3 vDirTS = mul(TBN, vDir);
-                
-                float3 var_MainTex = SAMPLE_TEXTURE2D(_MainTex,sampler_MainTex,i.uv.zw).rgb;
-                
+
+                float3 var_MainTex = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.uv.zw).rgb;
+
                 half2 offset = 0.0;
                 half currentDepth = 0.0;
                 half parallaxDepth = 0.0;
@@ -93,7 +146,8 @@ Shader "Custom/ParallaxCloud"
                 half2 offsetTemp = vDirTS.xy / -vDirTS.z * _ParallaxSize;
                 for (int j = 0; j < _ParallaxLayers; j++)
                 {
-                    parallaxDepth = 1.0 - SAMPLE_TEXTURE2D_LOD(_MainTex, sampler_MainTex, i.uv.xy + offset, 0).r * var_MainTex.r;
+                    parallaxDepth = 1.0 - SAMPLE_TEXTURE2D_LOD(_MainTex, sampler_MainTex, i.uv.xy + offset, 0).r *
+                        var_MainTex.r;
                     if (currentDepth > parallaxDepth) break;
                     preParallaxDepth = parallaxDepth;
                     currentDepth += heightStep;
@@ -106,13 +160,13 @@ Shader "Custom/ParallaxCloud"
                 half height = lerp(preDepth, currentDepth, t);
                 offset += offsetTemp * height;
                 i.uv.xy += offset;
-                
+
                 half3 finalColor = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.uv.xy).rgb * var_MainTex.rgb;
-                float alphaTex = max(var_MainTex.r * finalColor.r,0.0);
-                half alpha = max(pow(abs(lerp(alphaTex, 1.0, _Alpha)), _AlphaExtent), 0.0) * _Alpha;
+                float alphaTex = max(var_MainTex.r * finalColor.r, 0.0);
+                half alpha = max(pow(abs(lerp(alphaTex, 1.0, _Alpha)), _AlphaExtent), 0.0) * _Alpha * dist*ptcpos;
                 return half4(finalColor * _Color.rgb, alpha);
             }
             ENDHLSL
         }
     }
-}
+}

Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Fog Settings.asset

@@ -93,8 +93,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Effect Material
-  m_Shader: {fileID: -6465566751694194690, guid: c77db07224d9f784d90d7eb0e84c57f7,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: c77db07224d9f784d90d7eb0e84c57f7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:

Assets/FlatKit/Demos/[Demo] Wanderer/Wanderer-FogSettings.asset

@@ -8,8 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Effect Material
-  m_Shader: {fileID: -6465566751694194690, guid: c77db07224d9f784d90d7eb0e84c57f7,
-    type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: c77db07224d9f784d90d7eb0e84c57f7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:

Assets/Res/UI/CombatPanel.prefab

@@ -35,9 +35,9 @@ RectTransform:
   - {fileID: 7940440888945818258}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -65, y: -530.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -65, y: 428}
   m_SizeDelta: {x: 100, y: 10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3628140979434712568
@@ -2397,7 +2397,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5559010447687375213
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/ZhuanPanPanel.prefab

@@ -893,7 +893,7 @@ RectTransform:
   m_GameObject: {fileID: 4262349429609714494}
   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_LocalScale: {x: 1.5127, y: 1.5127, z: 1.5127}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6731311925923818131}
@@ -907,9 +907,9 @@ RectTransform:
   - {fileID: 2805882514726104012}
   m_Father: {fileID: 8510026615150398487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -678}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 206}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5024599011792226539

Assets/Resources/Shader/Toon.shadergraph

@@ -18236,7 +18236,7 @@
     "m_AllowMaterialOverride": false,
     "m_SurfaceType": 0,
     "m_ZTestMode": 4,
-    "m_ZWriteControl": 0,
+    "m_ZWriteControl": 1,
     "m_AlphaMode": 0,
     "m_RenderFace": 2,
     "m_AlphaClip": true,

Assets/SceneDependencyCache/07793abdc40fb69731a535dc4a920685.sceneWithBuildSettings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 07793abdc40fb69731a535dc4a920685
+DefaultImporter:
+  externalObjects: {}
+  userData:
+  assetBundleName:
+  assetBundleVariant:

Assets/Scenes/testCombat.scene

@@ -124,6 +124,38 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &2622623
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2622624}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Pool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2622624
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2622623}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8535239
 GameObject:
   m_ObjectHideFlags: 0
@@ -183,6 +215,7 @@ MonoBehaviour:
     - {x: -19.720566, y: 4, z: -7.2300005}
     - {x: -13.670565, y: 1, z: 4.8900003}
     - {x: -16.310566, y: 0, z: 9.89}
+    allDis: 0
   isRun: 0
 --- !u!1 &21371307
 GameObject:
@@ -658,221 +691,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   massgeText: {fileID: 773560731}
   loadSlider: {fileID: 1324294698}
---- !u!213 &150101289
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: icon_skill_10003(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 128
-    height: 128
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    49a56cefdb25e1d4781964df6ef99cee: 21300000
-  m_AtlasTags:
-  - skillIcon
-  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: 49a56cefdb25e1d4781964df6ef99cee, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 128
-      height: 128
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 544
-      y: 272
-      width: 128
-      height: 128
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 544, y: 272}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 608, z: 100, w: 336}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: -0.64, y: 0.64}
-    - {x: -0.64, y: -0.64}
-    - {x: 0.64, y: -0.64}
-    - {x: 0.64, y: 0.64}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!4 &156078686 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5857502490606678529, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
@@ -2147,6 +1965,7 @@ MonoBehaviour:
     - {x: -24.810566, y: -3.93, z: 19.470001}
     - {x: -14.860565, y: -3.0799997, z: 4.6}
     - {x: -16.310566, y: 0, z: 0}
+    allDis: 0
   isRun: 0
 --- !u!1 &611864968
 GameObject:
@@ -2190,6 +2009,7 @@ MonoBehaviour:
     - {x: -15.332, y: -0.28999996, z: 13.17}
     - {x: 9.228001, y: -3.0799997, z: -3.5600004}
     - {x: -3.4419997, y: 0, z: 0}
+    allDis: 0
   isRun: 0
 --- !u!4 &611864970
 Transform:
@@ -3410,6 +3230,67 @@ Transform:
   - {fileID: 312708677}
   m_Father: {fileID: 584408559}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1584646302
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3767015184114747861, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608849421738120184, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_Name
+      value: ParallaxCloud
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608849421738120184, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c3fdbd1922dbf5b4dafa882d98c4522e, type: 3}
 --- !u!1 &1612509951
 GameObject:
   m_ObjectHideFlags: 0
@@ -4399,222 +4280,8 @@ MonoBehaviour:
     - {x: -13.311999, y: 4, z: 2}
     - {x: 9.218, y: 1, z: 4.8900003}
     - {x: -3.4419997, y: 0, z: 9.89}
+    allDis: 0
   isRun: 0
---- !u!213 &1913479537
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: icon_skill_10003(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 128
-    height: 128
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    49a56cefdb25e1d4781964df6ef99cee: 21300000
-  m_AtlasTags:
-  - skillIcon
-  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: 49a56cefdb25e1d4781964df6ef99cee, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 128
-      height: 128
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 64, z: 100, w: 64}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: df05f928400d848c387e627e40486378, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 0ad723bf0ad7233f000000000ad7233f0ad723bf000000000ad7233f0ad7233f000000000ad723bf0ad723bf000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 544
-      y: 272
-      width: 128
-      height: 128
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 544, y: 272}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 608, z: 100, w: 336}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: -0.64, y: 0.64}
-    - {x: -0.64, y: -0.64}
-    - {x: 0.64, y: -0.64}
-    - {x: 0.64, y: 0.64}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &1927815585
 GameObject:
   m_ObjectHideFlags: 0
@@ -4984,14 +4651,6 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 1371450738590366279, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 1913479537}
-    - target: {fileID: 6377344707678363892, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 150101289}
     - target: {fileID: 8621307692776546600, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
@@ -6918,3 +6577,5 @@ SceneRoots:
   - {fileID: 1856735312}
   - {fileID: 1396997705}
   - {fileID: 7971796013686853673}
+  - {fileID: 1584646302}
+  - {fileID: 2622624}

Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -142,7 +142,7 @@ namespace GameLogic.Combat.Hero.Turntable
                             }
 
                             break;
-                        case WuXingType.Wood:
+                        case WuXingType.Water:
                             if (triggerType == 1)
                             {
                                 skillSlots.SetSkill(dengDaiSkill);
@@ -151,7 +151,7 @@ namespace GameLogic.Combat.Hero.Turntable
                             }
 
                             break;
-                        case WuXingType.Water:
+                        case WuXingType.Wood:
                             if (triggerType == 2)
                             {
                                 skillSlots.SetSkill(dengDaiSkill);

UserSettings/EditorUserSettings.asset

@@ -21,28 +21,28 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5207575055075d580f595a2046720d44431619287b2e71637e7f4b67e4e5626e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5400010356575a0d5d0d587a14710644104f4c2f7c2c2469787c4461e3b2326f
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a53025f0407580f0b08597b48765b441216197d28292461297b496ae3b8326b
+      value: 5402055e01025b5a095e587749765c44464e4b78292a20322c7f4b67b3b4653e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
+      value: 5409015152055b030e085b7212215944454f4d727c7b73677f7b4437e4e3646f
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 555206545c000f095f0a08711577071214164e7c7f7d2033747c4832e7b3626b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0607055350075e5d0e56587042210b444e164173747a24357c784c62b1b5373e
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 53010604000559080958097347250f44444e48732e707e34797e1f30b4e3376f
+      value: 515702525d040a085b0d0e70167706484515492c2e7f27322c7c1f6abae26539
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 57000255510d585a580d0a7042775e4447151c7d747d20647b781931e6b36168
+      value: 5454505755025b5d5d5f0a74487709404516192f287971662e2b4564e3e4373e
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
@@ -54,13 +54,13 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bac405d49904f9449914a449c4d4c9c9e4984af97dbebc2d7f9eec2d1d1b4f3f8dfe8fee6f4b1b9f0fbaa8efff8afe5fc9295949798ee9c94958585b7ede2daa4d69089c2949d9483d5888b97ddeccfbbd2fdf0c3f3eacec0f2c8ffcacccde437eaf9397b7a
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba7455d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd8b8b91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969b89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c828d84dd848bd58e8e8fdff5c1e089e5fec2f3f1d8c4f1cbf3c5cdcfe230e4f731343275a7a1
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5aae0fe8c9396999fe29c9f929091ea8b859ffcca90898c86d198899ac5
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5465d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fbafe0e1928b86d888ed919c928797a7cf
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1