修改bug

Assets/Res/UI/CombatPanel.prefab

@@ -308,139 +308,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &419259494787934164
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8004126912541115552}
-  - component: {fileID: 7413568053751522834}
-  - component: {fileID: 8622882730747295033}
-  - component: {fileID: 3340256974330815082}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: lanLiang
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8004126912541115552
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 419259494787934164}
-  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: 687994586889443964}
-  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: 0}
-  m_SizeDelta: {x: 256, y: 256}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7413568053751522834
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 419259494787934164}
-  m_CullTransparentMesh: 1
---- !u!114 &8622882730747295033
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 419259494787934164}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 0
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 3340256974330815082}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &3340256974330815082
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 419259494787934164}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  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: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 2
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_gf_di_xingchendao
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
-  packInfo:
-    packName: battle
-    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
-    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
-    lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &445599964018324979
 GameObject:
   m_ObjectHideFlags: 0
@@ -1816,7 +1683,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: 50, y: 50}
+  m_SizeDelta: {x: 66, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5813397527180937717
 CanvasRenderer:
@@ -2747,6 +2614,7 @@ GameObject:
   - component: {fileID: 7379876164923794512}
   - component: {fileID: 3673213195066014232}
   - component: {fileID: 5640076176315460570}
+  - component: {fileID: 1434618165824868393}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage
@@ -2796,7 +2664,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2824,6 +2692,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &1434618165824868393
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3067265402439781276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5640076176315460570}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3104343098119091553
 GameObject:
   m_ObjectHideFlags: 0
@@ -3473,21 +3385,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: lanLiang
-    gameObject: {fileID: 3340256974330815082}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: jin_shangshi
     gameObject: {fileID: 5232945183627015844}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: lanLiang_button
-    gameObject: {fileID: 8622882730747295033}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: WuXingGongFaWidget
     gameObject: {fileID: 6377944810843125593}
     isAssetBundle: 0
@@ -3528,6 +3430,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: zhuanpan_chongneng
+    gameObject: {fileID: 4056834096103020777}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: lanLiang_button
+    gameObject: {fileID: 1434618165824868393}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &3803760356459375620
 GameObject:
@@ -5438,7 +5350,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8004126912541115552}
   - {fileID: 82124290928860448}
   - {fileID: 7379876164923794512}
   - {fileID: 1561856407173457271}
@@ -7200,7 +7111,7 @@ GameObject:
   - component: {fileID: 4056834096103020777}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: zhuanpan chongneng
+  m_Name: zhuanpan_chongneng
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -7258,9 +7169,9 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
-  m_FillAmount: 0.742
+  m_FillAmount: 0
   m_FillClockwise: 1
-  m_FillOrigin: 0
+  m_FillOrigin: 2
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_yuanhuan_quse

Assets/Scenes/testCombat.scene

@@ -2246,7 +2246,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: isZhanZhuang
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: zhanZhuangTime

Assets/Scripts/GameLogic/Combat/Skill/DS60101.cs

@@ -58,7 +58,7 @@ namespace GameLogic.Combat.Skill
             if (_updateTime)
             {
                 _currTime += time;
-                if (_currTime >= SelfSkillConfig.effectValue[3])
+                if (_currTime >= SelfSkillConfig.effectValue[4])
                 {
                     Finish();
                 }

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

@@ -52,7 +52,7 @@ namespace Fort23.Mono
 
         private void Update()
         {
-            if (!transform.gameObject.activeSelf)
+            if (!transform.gameObject.activeSelf&&skillBasic!=null)
             {
                 if (skillBasic.DelayUseSkillCd < 0)
                 {

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

@@ -23,6 +23,7 @@ namespace Fort23.Mono
 
         private Map<WuXingType, WuXingGongFaWidget> _wuXingGongFaWidgets = new Map<WuXingType, WuXingGongFaWidget>();
 
+        private ParticleSystemPool fx_ui_zhuangPan;
         public async CTask ShowPanel()
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
@@ -36,6 +37,15 @@ namespace Fort23.Mono
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_huo_tw", Prestore: true));
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_tu_tw", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_zhuanpanBuff_xingchendao",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        fx_ui_zhuangPan=pool;
+                        pool.transform.SetParent(pan);
+                        pool.transform.localPosition=new Vector3(0, 0, 0);
+                        pool.SetActive(false);
+                    }));
 
             await cTaskAwaitBuffer.WaitAll();
             cTaskAwaitBuffer.Dispose();
@@ -354,10 +364,16 @@ namespace Fort23.Mono
                 DS60101 ds60101 = combatHeroSkillControl.taoismSkillBasic as DS60101;
                 if (ds60101 != null)
                 {
-                    lanLiang.fillAmount = ds60101.currEnergy / ds60101.SelfSkillConfig.effectValue[1];
-                    lanLiang.color = !ds60101._updateTime
-                        ? new Color(1f, 0.96f, 0f)
-                        : new Color(0.96f, 0f, 1f);
+                    if (fx_ui_zhuangPan != null)
+                    {
+                        fx_ui_zhuangPan.gameObject.SetActive(ds60101._updateTime);
+                    }
+
+                    zhuanpan_chongneng.gameObject.SetActive(!ds60101._updateTime);
+                    zhuanpan_chongneng.fillAmount = ds60101.currEnergy / ds60101.SelfSkillConfig.effectValue[1];
+                    // lanLiang.color = !ds60101._updateTime
+                    //     ? new Color(1f, 0.96f, 0f)
+                    //     : new Color(0.96f, 0f, 1f);
                 }
             }
 

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

@@ -43,17 +43,6 @@ namespace Fort23.Mono
 	      return _jin;
 	     }
 	   }
-	  private MyImage _lanLiang;
-	  public MyImage lanLiang
-	   {
-	   get{
-	      if (_lanLiang == null)
-	       {
-	         _lanLiang  = GetUIUnit<MyImage>("lanLiang"); 
-	       }
-	      return _lanLiang;
-	     }
-	   }
 	  private Text _jin_shangshi;
 	  public Text jin_shangshi
 	   {
@@ -65,17 +54,6 @@ namespace Fort23.Mono
 	      return _jin_shangshi;
 	     }
 	   }
-	  private Button _lanLiang_button;
-	  public Button lanLiang_button
-	   {
-	   get{
-	      if (_lanLiang_button == null)
-	       {
-	         _lanLiang_button  = GetUIUnit<Button>("lanLiang_button"); 
-	       }
-	      return _lanLiang_button;
-	     }
-	   }
 	  private GameObject _WuXingGongFaWidget;
 	  public GameObject WuXingGongFaWidget
 	   {
@@ -164,6 +142,28 @@ namespace Fort23.Mono
 	      return _fxRoot;
 	     }
 	   }
+	  private MyImage _zhuanpan_chongneng;
+	  public MyImage zhuanpan_chongneng
+	   {
+	   get{
+	      if (_zhuanpan_chongneng == null)
+	       {
+	         _zhuanpan_chongneng  = GetUIUnit<MyImage>("zhuanpan_chongneng"); 
+	       }
+	      return _zhuanpan_chongneng;
+	     }
+	   }
+	  private Button _lanLiang_button;
+	  public Button lanLiang_button
+	   {
+	   get{
+	      if (_lanLiang_button == null)
+	       {
+	         _lanLiang_button  = GetUIUnit<Button>("lanLiang_button"); 
+	       }
+	      return _lanLiang_button;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{