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

Assets/Art/Environment/Mountain010.prefab

@@ -9,9 +9,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 8909352204525286337}
-  - component: {fileID: 2068246416621670301}
-  - component: {fileID: 3660374313649103400}
-  - component: {fileID: 8479685889786791212}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Mountain010
@@ -28,28 +25,63 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3683907582521372588}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.17462842, z: -0, w: 0.9846344}
+  m_LocalRotation: {x: 0, y: -0.17462774, z: 0, w: 0.9846345}
   m_LocalPosition: {x: -37.3, y: -0.1, z: 31.9}
   m_LocalScale: {x: 0.4593453, y: 0.4593453, z: 0.4593453}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6160607818222336233}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: -20.114, z: 0}
---- !u!33 &2068246416621670301
+--- !u!1 &9199455106843585400
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6160607818222336233}
+  - component: {fileID: 4184708956986779086}
+  - component: {fileID: 6289977199233966943}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Mountain010 (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6160607818222336233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9199455106843585400}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -14.11, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8909352204525286337}
+  m_LocalEulerAnglesHint: {x: 0, y: -20.114, z: 0}
+--- !u!33 &4184708956986779086
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
+  m_GameObject: {fileID: 9199455106843585400}
   m_Mesh: {fileID: 4300000, guid: 5953a2cf6bd0f2e4eb4f51f546d07264, type: 3}
---- !u!23 &3660374313649103400
+--- !u!23 &6289977199233966943
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
+  m_GameObject: {fileID: 9199455106843585400}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -88,18 +120,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!111 &8479685889786791212
-Animation:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3683907582521372588}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Animation: {fileID: 0}
-  m_Animations: []
-  m_WrapMode: 0
-  m_PlayAutomatically: 1
-  m_AnimatePhysics: 0
-  m_CullingType: 0

Assets/Res/Config/GroupConfig.json

@@ -1057,7 +1057,7 @@
         100
       ],
       "attQiangDu": [
-        1000
+        100
       ],
       "duipingQiangDu": [
         100
@@ -1132,7 +1132,7 @@
         100
       ],
       "attQiangDu": [
-        1000
+        100
       ],
       "duipingQiangDu": [
         100

Assets/Res/Config/ItemConfig.json

@@ -78,7 +78,7 @@
         0
       ],
       "stack_1": 0,
-      "associateID": 0,
+      "associateID": 13,
       "sort": 0,
       "itemDesc2": 0
     },

Assets/Res/UI/CombatPanel.prefab

@@ -947,7 +947,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4287798501111193387
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1155,7 +1155,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5837590194851709526
 RectTransform:
   m_ObjectHideFlags: 0
@@ -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/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/GameLogic/Combat/Skill/S2007.cs

@@ -23,7 +23,7 @@ namespace GameLogic.Combat.Skill
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddUseGongFa, AddUseGongFa);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.StartInjured, StartInjured);
-            Finish();
+            // Finish();
         }
 
         protected override void ProActiveSkill()
@@ -47,6 +47,11 @@ namespace GameLogic.Combat.Skill
 
         private void Finish()
         {
+            if (CombatHeroEntity == null)
+            {
+                return;
+            }
+
             CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= _addSpeed;
             _addSpeed = 0;
             _isUpdate = false;

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);