修改bug

Assets/Res/UI/CombatPanel.prefab

@@ -1604,7 +1604,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: -122222
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2031,7 +2031,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: 50
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3417,7 +3417,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: fa664d9ea4ccef6c085c162ff5ace3d4
-  imageH: 0
+  imageH: 60
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4055,7 +4055,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 40, y: 40}
+  m_SizeDelta: {x: 45, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5573053399008908919
 CanvasRenderer:
@@ -4103,7 +4103,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4823,7 +4823,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 65
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -8129,7 +8129,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 50
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -8838,7 +8838,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9143,7 +9143,7 @@ RectTransform:
   m_GameObject: {fileID: 8285700531098452215}
   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.1502, y: 1.1502, z: 1.1502}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6055247483393311122}
@@ -10036,7 +10036,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: 50
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -556,7 +556,7 @@ namespace GameLogic.Combat.CombatTool
                     break;
             }
 
-            return Color.white;
+            return new Color(1,1,1,0.3f);
         }
 
         public Color GetColor(int wuXingType)

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

@@ -225,7 +225,7 @@ namespace GameLogic.Combat.Hero.Turntable
                 return;
             }
 
-      
+
             if (!_combatHeroEntity.IsCantAddGongFa())
             {
                 return;
@@ -279,8 +279,11 @@ namespace GameLogic.Combat.Hero.Turntable
             for (int i = 0; i < allSkillSlots.Count; i++)
             {
                 SkillSlots skillSlots = allSkillSlots[i];
+
                 skillSlots.Dispose();
+                skillSlots.Replace();
             }
+
             allSkillSlots.Clear();
         }
     }

Assets/Scripts/GameUI/UI/CombatPanel/gf_widget.cs

@@ -80,7 +80,7 @@ namespace Fort23.Mono
             if (SkillBasic == null)
             {
                 useSkillIcon.transform.parent.gameObject.SetActive(false);
-                quan.color = new Color(1, 1, 1, 1);
+                quan.color = new Color(1, 1, 1, 0.3f);
                 // if (PlayerGf_widget != null)
                 // {
                 //     PlayerGf_widget.Play("likai",false);