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

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -1294,6 +1294,7 @@ RectTransform:
   - {fileID: 6131283213059370231}
   - {fileID: 1977479323307174205}
   - {fileID: 3289851963449376272}
+  - {fileID: 5812057225866309631}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1528,6 +1529,15 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: Text_SkillCd
+    gameObject: {fileID: 8135164377214459410}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &2864693667708896535
 GameObject:
@@ -2867,6 +2877,86 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6233593762380004246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5812057225866309631}
+  - component: {fileID: 2100578571696428461}
+  - component: {fileID: 8135164377214459410}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_SkillCd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5812057225866309631
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  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: 6694772361877173011}
+  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: 2.7098, y: 327.19}
+  m_SizeDelta: {x: 317.0255, y: 36.152}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2100578571696428461
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  m_CullTransparentMesh: 1
+--- !u!114 &8135164377214459410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  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: 27
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u8FD0\u4F5C\u5468\u671F\uFF1A1\u8F6C"
 --- !u!1 &6394406755354776696
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1316,9 +1316,9 @@ RectTransform:
   - {fileID: 6759585373036420113}
   m_Father: {fileID: 4244019806394961563}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 269.013, y: -32.1347}
   m_SizeDelta: {x: 66.70511, y: 63.477}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8562629278153307331
@@ -1877,7 +1877,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 437.71, y: 301.1}
-  m_SizeDelta: {x: 0, y: 64.2694}
+  m_SizeDelta: {x: 302.36557, y: 64.2694}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &149598352085747197
 CanvasRenderer:
@@ -3654,6 +3654,7 @@ RectTransform:
   m_Children:
   - {fileID: 2849870254427059589}
   - {fileID: 1774812024264171205}
+  - {fileID: 4341027774775577007}
   m_Father: {fileID: 953277807175961835}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3704,9 +3705,9 @@ RectTransform:
   - {fileID: 3086478416449874210}
   m_Father: {fileID: 4244019806394961563}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 210.09789, y: -32.1347}
   m_SizeDelta: {x: 66.70511, y: 63.477}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5668826745793188999
@@ -3879,6 +3880,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 3544125264546083741}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5280469173278725104
 GameObject:
@@ -4036,9 +4042,9 @@ RectTransform:
   - {fileID: 7441309815319907224}
   m_Father: {fileID: 4244019806394961563}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 151.18277, y: -32.1347}
   m_SizeDelta: {x: 66.70511, y: 63.477}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7022963007068931577
@@ -4583,9 +4589,9 @@ RectTransform:
   - {fileID: 7951490181330357733}
   m_Father: {fileID: 4244019806394961563}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 33.352554, y: -32.1347}
   m_SizeDelta: {x: 66.70511, y: 63.477}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &137162416073161416
@@ -5486,9 +5492,9 @@ RectTransform:
   - {fileID: 1578375374096071859}
   m_Father: {fileID: 4244019806394961563}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 92.26766, y: -32.1347}
   m_SizeDelta: {x: 66.70511, y: 63.477}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &255801767607311433
@@ -5780,6 +5786,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8896063498617044909
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4341027774775577007}
+  - component: {fileID: 4137030802211889487}
+  - component: {fileID: 3544125264546083741}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4341027774775577007
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8896063498617044909}
+  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: 8031870718418499362}
+  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: 57.798}
+  m_SizeDelta: {x: 160, y: 23.1409}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4137030802211889487
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8896063498617044909}
+  m_CullTransparentMesh: 1
+--- !u!114 &3544125264546083741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8896063498617044909}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8F85\u52A9"
 --- !u!1 &8903738403727791632
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroIdleState.cs

@@ -29,6 +29,7 @@ namespace GameLogic.Combat.Hero.State
 
             FightIdleSubState FightIdleSubState = combatHeroEntity.CombatAIBasic.GetSubStatus<FightIdleSubState>();
             if (FightIdleSubState == null)
+                
             {
                 FightIdleSubState = new FightIdleSubState();
                 combatHeroEntity.CombatAIBasic.AddSubStatus(FightIdleSubState);

Assets/Scripts/GameStart/GameStart.cs

@@ -40,8 +40,7 @@ public class GameStart : MonoBehaviour
         QualitySettings.vSyncCount = 0;
         Application.targetFrameRate = 60;
 
-        PottingMobile.InitializeSdk();
-        PottingMobile.withLogDebug(true);
+
         ShaderVariantCollection.WarmUp();
         _gameStartUIPanel = GetComponent<GameStartUIPanel>();
         HotSyncContent.isOpenDllStreamingLoad = isLoadDll;

Assets/Scripts/GameUI/GameApplctionMono.cs

@@ -19,7 +19,7 @@ namespace GameUI
             // }
 #endif
 
-
+         
             EventSystem.Instance.Update();
             AssetBundleLoadManager.Instance.UpdateBundle();
             TimeHelper.clientFrame = TimeHelper.ClientFrame() + (long)(Time.deltaTime * 1000);

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

@@ -77,6 +77,9 @@ namespace Fort23.Mono
             icon.gameObject.SetActive(true);
             SkillConfig skillConfig = SkillInfo.skillConfig;
             icon.icon_name = skillConfig.icon;
+            
+            
+            Text_Tips.gameObject.SetActive(skillConfig.ID != 0 && skillConfig.SkillType == 2);
         }
 
         public void InitWidget(int index, SkillSelectPanel skillSelectPanel)
@@ -85,6 +88,7 @@ namespace Fort23.Mono
             this.index = index;
             icon.gameObject.SetActive(false);
             SkillInfo = null;
+            Text_Tips.gameObject.SetActive(false);
         }
         
       

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

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

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

@@ -154,6 +154,8 @@ namespace Fort23.Mono
                 {
                     if (skills[i] == null)
                         continue;
+                    if(!IsMainGongFaChange(skills[i].skillConfig))
+                        continue;
                     allKongSkill[indexList[i]].SetSKill(skills[i]);
                     allUseSkill[indexList[i]] = skills[i];
                 }
@@ -502,22 +504,13 @@ namespace Fort23.Mono
                 return;
             }
 
-            int count = 0;
-            for (var i = 0; i < allUseSkill.Length; i++)
-            {
-                if (allUseSkill[i] != null)
-                {
-                    count++;
-                }
-            }
-
 
             //直接上功法
             if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                if (count >= 4)
+                if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
                 {
-                    TipMessagePanel.OpenTipMessagePanel("功法已经上满");
+                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
                     CloseSelect();
                     return;
                 }
@@ -531,6 +524,12 @@ namespace Fort23.Mono
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
+                if (!IsMainGongFaChange(selectSkillConfig.skillConfig) &&   allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                    CloseSelect();
+                    return;
+                }
                 isAlter = true;
                 allUseSkill[skillKongWidget.SkillInfo.index] = null;
                 skillKongWidget.SetSKill(selectSkillConfig);
@@ -657,7 +656,6 @@ namespace Fort23.Mono
 
         private void UpdateSkillWidget()
         {
-            int count = 0;
             foreach (var skillWidget in _skillWidgets)
             {
                 if (allUseSkill.Contains(skillWidget.skillConfigId))
@@ -670,16 +668,8 @@ namespace Fort23.Mono
                 }
             }
 
-            for (var i = 0; i < allUseSkill.Length; i++)
-            {
-                if (allUseSkill[i] != null)
-                {
-                    count++;
-                }
-            }
-
 
-            Text_GongFaCount.text = $"功法数量{count}/4";
+            Text_GongFaCount.text = $"功法数量{GetMainGongFaCount()}/4";
         }
 
         private async void OnClick(ItemWidgetBasic obj)
@@ -702,17 +692,10 @@ namespace Fort23.Mono
                     return;
                 }
 
-                int count = 0;
-                for (var i = 0; i < allUseSkill.Length; i++)
-                {
-                    if (allUseSkill[i] != null)
-                    {
-                        count++;
-                    }
-                }
-
                 Btn_RemoveGongFa.gameObject.SetActive(false);
-                if (count >= 4)
+
+
+                if (!IsMainGongFaChange(skillWidget.skillConfigId.skillConfig))
                 {
                     SelectSkill(skillWidget.skillConfigId, true);
                 }
@@ -723,6 +706,33 @@ namespace Fort23.Mono
             }
         }
 
+        private int GetMainGongFaCount()
+        {
+            int count = 0;
+            for (var i = 0; i < allUseSkill.Length; i++)
+            {
+                if (allUseSkill[i] != null && allUseSkill[i].skillConfig.SkillType == 1)
+                {
+                    count++;
+                }
+            }
+
+            return count;
+        }
+
+        private bool IsMainGongFaChange(SkillConfig s)
+        {
+            if (GetMainGongFaCount() < 4 || s.SkillType != 1)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+          
+        }
+
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as SkillWidget);

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -20,7 +20,7 @@ namespace Fort23.Mono
 
         private List<SkillPowerupConfig> _skillPowerupConfigs;
         private SkillConstant skillConstant;
-        
+
         bool isUpgrade = false;
 
         private void Init()
@@ -41,23 +41,21 @@ namespace Fort23.Mono
         {
             Btn_Back.onClick.AddListener(() =>
             {
-                
                 if (isUpgrade)
                 {
                     isUpgrade = false;
                     Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(185.0133f, 76.141f);
-                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(-137.8784f,-704.8f);
+                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(-137.8784f, -704.8f);
                     Btn_UpGrade.gameObject.SetActive(true);
                     return;
                 }
+
                 UIManager.Instance.HideUIUIPanel<GongFaUpgradePanel>();
             });
 
 
             Btn_UpGrade.onClick.AddListener(() =>
             {
-          
-                
                 if (_skillInfo.SkillData == null)
                 {
                     return;
@@ -94,10 +92,11 @@ namespace Fort23.Mono
                 {
                     isUpgrade = true;
                     Btn_UpStar.GetComponent<RectTransform>().sizeDelta = new Vector2(569.34f, 76.141f);
-                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(54.285f,-704.8f);
+                    Btn_UpStar.GetComponent<RectTransform>().anchoredPosition = new Vector2(54.285f, -704.8f);
                     Btn_UpGrade.gameObject.SetActive(false);
                     return;
                 }
+
                 if (_skillInfo.SkillData == null)
                 {
                     return;
@@ -139,6 +138,8 @@ namespace Fort23.Mono
             Text_Level1.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
             Text_Level.text = "Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
 
+            Text_SkillCd.text = $"功法运作周期：{skillConfig.cd}转";
+
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
             if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
@@ -214,7 +215,7 @@ namespace Fort23.Mono
                     Text_Attribute.text = "土";
                     break;
             }
-            
+
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage myImage = StarRoot[i] as MyImage;
@@ -227,7 +228,6 @@ namespace Fort23.Mono
                 MyImage icon = StarRoot[i] as MyImage;
                 if (skillInfo.skillConfig.level > 5)
                 {
-                  
                     if (i < yinstar)
                     {
                         icon.icon_name = "dec_star_2";
@@ -248,7 +248,7 @@ namespace Fort23.Mono
                     }
                 }
             }
-         
+
 
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

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

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

@@ -206,6 +206,7 @@ namespace Fort23.Mono
                 EventSystemManager.Instance.DetectRandomEvents();
             }
 
+         
 
             int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);