功法选择开发

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -201,6 +201,8 @@ RectTransform:
   - {fileID: 8429437205222156808}
   - {fileID: 2435727960284862901}
   - {fileID: 5614831832456575891}
+  - {fileID: 2140549312652121987}
+  - {fileID: 7716599432344587041}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -226,6 +228,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Marsk
+    gameObject: {fileID: 5661546328325043756}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1269921678863901166
 GameObject:
@@ -311,6 +318,163 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+--- !u!1 &1520061693375276812
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 234782566907562466}
+  - component: {fileID: 9004169807973307310}
+  - component: {fileID: 7365213337883119231}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &234782566907562466
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520061693375276812}
+  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: 2140549312652121987}
+  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 &9004169807973307310
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520061693375276812}
+  m_CullTransparentMesh: 1
+--- !u!114 &7365213337883119231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520061693375276812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E3B\u52A8"
+--- !u!1 &1659073380297634169
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2140549312652121987}
+  - component: {fileID: 1928960951993751644}
+  - component: {fileID: 3617144668025052707}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2140549312652121987
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1659073380297634169}
+  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: 234782566907562466}
+  m_Father: {fileID: 8817738242950991828}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 46.6261, y: 18.4206}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1928960951993751644
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1659073380297634169}
+  m_CullTransparentMesh: 1
+--- !u!114 &3617144668025052707
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1659073380297634169}
+  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: 0.5019608, g: 0.5019608, b: 0.5019608, 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: 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!1 &2751874343717437709
 GameObject:
   m_ObjectHideFlags: 0
@@ -659,6 +823,83 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &5661546328325043756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7716599432344587041}
+  - component: {fileID: 7377986201002905578}
+  - component: {fileID: 5853083613061359053}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Icon_Marsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7716599432344587041
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5661546328325043756}
+  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: 7442873173985491102}
+  m_Father: {fileID: 8817738242950991828}
+  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 &7377986201002905578
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5661546328325043756}
+  m_CullTransparentMesh: 1
+--- !u!114 &5853083613061359053
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5661546328325043756}
+  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: 0, g: 0, b: 0, a: 0.8156863}
+  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!1 &5707983195688373430
 GameObject:
   m_ObjectHideFlags: 0
@@ -828,6 +1069,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &7078492729563374827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7442873173985491102}
+  - component: {fileID: 570341425408612011}
+  - component: {fileID: 1907319539921901149}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7442873173985491102
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7078492729563374827}
+  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: 7716599432344587041}
+  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: -69, y: -1539}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &570341425408612011
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7078492729563374827}
+  m_CullTransparentMesh: 1
+--- !u!114 &1907319539921901149
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7078492729563374827}
+  m_Enabled: 0
+  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: 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
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
 --- !u!1 &8426038513191564165
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/GameApplction.cs

@@ -146,6 +146,7 @@ public class GameApplction : IGameStart
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
         await CombatDrive.Instance.StartCombat(startCombatInfo);
+        PlayerManager.Instance.GongFaControl.SaveUseSkill();
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
             await MainPanel.OpenPanel();

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

@@ -14,6 +14,7 @@ namespace Fort23.Mono
     {
         private bool _isSelectSkill;
         private List<SkillKongWidget> allKongSkill = new List<SkillKongWidget>();
+        List<WuXingGongFaWidget> _wuXingGongFaWidgets = new List<WuXingGongFaWidget>();
         private SkillInfo selectSkillConfig;
         private bool isAlter;
 
@@ -133,6 +134,7 @@ namespace Fort23.Mono
             {
                 PlayerManager.Instance.GongFaControl.RemoveSkillInfo(dianjiSkillKongWidget.index);
                 dianjiSkillKongWidget.Cleared();
+                UpdateSkillWidget();
                 CloseSelect();
             });
         }
@@ -192,7 +194,6 @@ namespace Fort23.Mono
 
             if (type2 == 0)
             {
-                showSkillInfo = showSkillInfo.ToList();
             }
             else
             {
@@ -206,9 +207,6 @@ namespace Fort23.Mono
         public override async CTask Open()
         {
             await base.Open();
-            allKongSkill.Clear();
-            UIManager.Instance.DormancyAllGComponent<SkillKongWidget>();
-            UIManager.Instance.DormancyAllGComponent<SkillWidget>();
 
 
             Sort(type1, type2);
@@ -225,9 +223,10 @@ namespace Fort23.Mono
                 double y = c * 0 + d * 172;
 
                 int index = i;
-                WuXingGongFaWidget widget = await UIManager.Instance.CreateGComponent<WuXingGongFaWidget>(null, root: WuXingGongFaRoot);
+                WuXingGongFaWidget widget = await UIManager.Instance.CreateGComponent<WuXingGongFaWidget>(null, root: WuXingGongFaRoot,poolName:"132");
                 widget.transform.anchoredPosition = new Vector2((float)x, (float)y);
                 widget.ShowWidget(index);
+                _wuXingGongFaWidgets.Add(widget);
             }
 
 
@@ -266,6 +265,7 @@ namespace Fort23.Mono
                 skillKongWidget.SetSKill(selectSkillConfig);
                 selectSkillConfig.index = skillKongWidget.index;
                 PlayerManager.Instance.GongFaControl.AddUseSkill(selectSkillConfig);
+
                 CloseSelect();
             }
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
@@ -314,6 +314,8 @@ namespace Fort23.Mono
                     CloseSelect();
                 }
             }
+
+            UpdateSkillWidget();
         }
 
 
@@ -352,6 +354,8 @@ namespace Fort23.Mono
             isAlter = false;
         }
 
+        List<SkillWidget> _skillWidgets = new List<SkillWidget>();
+
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
         {
             if (index < 0 || index >= showSkillInfo.Count)
@@ -360,12 +364,41 @@ namespace Fort23.Mono
             SkillWidget skillWidget = await UIManager.Instance.CreateGComponent<SkillWidget>(null, ContentRoot);
             skillWidget.InitSkillWidget(skillInfo, this);
             skillWidget.onClick = OnClick;
+            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+            {
+                skillWidget.Icon_Marsk.SetActive(true);
+            }
+            else
+            {
+                skillWidget.Icon_Marsk.SetActive(false);
+            }
+
+            _skillWidgets.Add(skillWidget);
             return skillWidget;
         }
 
+        private void UpdateSkillWidget()
+        {
+            foreach (var skillWidget in _skillWidgets)
+            {
+                if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+                {
+                    skillWidget.Icon_Marsk.SetActive(true);
+                }
+                else
+                {
+                    skillWidget.Icon_Marsk.SetActive(false);
+                }
+            }
+        }
+
         private void OnClick(ItemWidgetBasic obj)
         {
             SkillWidget skillWidget = obj as SkillWidget;
+            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+            {
+              return;
+            }
             Btn_RemoveGongFa.gameObject.SetActive(false);
             SelectSkill(skillWidget.skillConfigId);
         }
@@ -373,6 +406,33 @@ namespace Fort23.Mono
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as SkillWidget);
+            _skillWidgets.Remove(widget as SkillWidget);
+        }
+
+        public override void Close()
+        {
+            foreach (var skillWidget in _skillWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(skillWidget);
+            }
+
+            _skillWidgets.Clear();
+
+            foreach (var skillKongWidget in allKongSkill)
+            {
+                UIManager.Instance.DormancyGComponent(skillKongWidget);
+            }
+
+            allKongSkill.Clear();
+
+            foreach (var wuXingGongFaWidget in _wuXingGongFaWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(wuXingGongFaWidget);
+            }
+
+            _wuXingGongFaWidgets.Clear();
+
+            base.Close();
         }
     }
 }

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

@@ -19,6 +19,17 @@ namespace Fort23.Mono
 	      return _icon;
 	     }
 	   }
+	  private GameObject _Icon_Marsk;
+	  public GameObject Icon_Marsk
+	   {
+	   get{
+	      if (_Icon_Marsk == null)
+	       {
+	         _Icon_Marsk  = GetUIUnit<GameObject>("Icon_Marsk"); 
+	       }
+	      return _Icon_Marsk;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -25,7 +25,6 @@ namespace Fort23.Mono
 
         private void RemoveEvent(IEventData e)
         {
-            
             Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
@@ -42,7 +41,6 @@ namespace Fort23.Mono
         private void DivineSensePointChange(IEventData e)
         {
             Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
-           
         }
 
         private void ChagneShenshiBtnActive()
@@ -61,18 +59,18 @@ namespace Fort23.Mono
         {
             bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
-            
+
             Btn_Event.onClick.AddListener(() =>
             {
                 EventSystemManager.Instance.isOpenUi = true;
                 DivineSenceEventPreviewPanel.OpenPanel();
             });
-            
-            
+
+
             Btn_HeroInfomation.onClick.AddListener(async () =>
             {
                 EventSystemManager.Instance.isOpenUi = true;
-                HeroInformationPanel  heroInformationPanel = await HeroInformationPanel.OpenPanel();
+                HeroInformationPanel heroInformationPanel = await HeroInformationPanel.OpenPanel();
                 await heroInformationPanel.UIClosed();
                 EventSystemManager.Instance.isOpenUi = false;
             });
@@ -92,7 +90,21 @@ namespace Fort23.Mono
         public async override CTask Show()
         {
             await base.Show();
-            SkillSelectPanel.OpenSkillSelectPanel();
+            bool isHIde = false;
+            foreach (var skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
+            {
+                if (skillInfo != null)
+                {
+                    isHIde = true;
+                    break;
+                }
+            }
+                
+            if (!isHIde)
+            {
+                SkillSelectPanel.OpenSkillSelectPanel();
+            }
+
             CameraSelect.value = 0.2f;
         }
 
@@ -132,7 +144,7 @@ namespace Fort23.Mono
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 return;
             }
-              
+
 
             List<AccountFileInfo.EventList> reeultEventLists = new List<AccountFileInfo.EventList>();
             reeultEventLists = eventLists.Where((el) =>
@@ -146,13 +158,14 @@ namespace Fort23.Mono
             {
                 foreach (var reeultEventList in reeultEventLists)
                 {
-                    EventSystemManager.Instance.CompleteEvent(reeultEventList,true);
+                    EventSystemManager.Instance.CompleteEvent(reeultEventList, true);
                     eventLists.Remove(reeultEventList);
                 }
-                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists,count);
+
+                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
                 await divineSenceEventResultPanel.UIClosed();
             }
-         
+
             EventSystemManager.Instance.isTriggerEvent = false;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
             AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
@@ -165,11 +178,11 @@ namespace Fort23.Mono
         public async void CreatShengShiEvent()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            int count = AccountFileInfo.Instance.playerData.eventList.Count >=1 ? 1 : AccountFileInfo.Instance.playerData.eventList.Count;
+            int count = AccountFileInfo.Instance.playerData.eventList.Count >= 1 ? 1 : AccountFileInfo.Instance.playerData.eventList.Count;
             for (var i = 0; i < count; i++)
             {
                 ShengShiEventWidget shengShiEventWidget =
-                    await UIManager.Instance.CreateGComponent<ShengShiEventWidget>(null,DynamicEvent);
+                    await UIManager.Instance.CreateGComponent<ShengShiEventWidget>(null, DynamicEvent);
                 shengShiEventWidget.InitShengShiEventWidget(AccountFileInfo.Instance.playerData.eventList[i]);
             }
         }