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

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -160,14 +160,16 @@ GameObject:
   - component: {fileID: 3106622106931745522}
   - component: {fileID: 3703191467005982840}
   - component: {fileID: 1942332183402266682}
+  - component: {fileID: 7624787522536036482}
+  - component: {fileID: 7250883919371346337}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: TipsRoot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3106622106931745522
 RectTransform:
   m_ObjectHideFlags: 0
@@ -186,7 +188,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.04831, y: -946.8596}
-  m_SizeDelta: {x: 539.2465, y: 63.071}
+  m_SizeDelta: {x: 563, y: 63.071}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703191467005982840
 CanvasRenderer:
@@ -239,6 +241,46 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7624787522536036482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &7250883919371346337
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 761335188077721832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &850832341217663533
 GameObject:
   m_ObjectHideFlags: 0
@@ -2298,9 +2340,10 @@ GameObject:
   - component: {fileID: 8034867944299354957}
   - component: {fileID: 989892582208681239}
   - component: {fileID: 8330416603729543246}
+  - component: {fileID: 1871237412076693942}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Tips
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2323,7 +2366,7 @@ RectTransform:
   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: -137.7, y: -234.2}
+  m_AnchoredPosition: {x: 37, y: -234.2}
   m_SizeDelta: {x: 35.2913, y: 35.291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &989892582208681239
@@ -2377,6 +2420,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &1871237412076693942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5606048332584031267}
+  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: 1
+  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: 8330416603729543246}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5639472365745752167
 GameObject:
   m_ObjectHideFlags: 0
@@ -2633,7 +2720,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2510253786452685598
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2651,7 +2738,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -0.000015258789}
-  m_SizeDelta: {x: 35.2913, y: 35.291}
+  m_SizeDelta: {x: 15.358, y: 25.0577}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3079895378528370827
 CanvasRenderer:
@@ -2674,7 +2761,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.20000002, g: 0.3647059, b: 0.4431373, a: 1}
+  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
@@ -2691,14 +2778,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_shenshi_fuhao_wenhao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
   packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+    packName: shenshi
+    packgJsonPath: /Art/UIAssets/TextrueJson\shenshi.txt
+    packgSpritePath: Assets/Res/UIAtlas/shenshi.spriteatlasv2
+    lasetJsonGUID: 390613cb2a0c25f30d6ab3483d292479
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -3203,7 +3290,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3039944541514686334
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3220,7 +3307,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 366.83, y: -1021.1}
+  m_AnchoredPosition: {x: 215, y: -1021.1}
   m_SizeDelta: {x: 172.0734, y: 44.236}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8287794321715321591
@@ -3365,6 +3452,7 @@ GameObject:
   - component: {fileID: 1772753141541214691}
   - component: {fileID: 9156104007059516416}
   - component: {fileID: 1994731080098573646}
+  - component: {fileID: 6885229464675915263}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Speed
@@ -3387,11 +3475,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3106622106931745522}
   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}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -32}
+  m_SizeDelta: {x: 533, y: 64}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9156104007059516416
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3434,7 +3522,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: " \u4FEE\u70BC\u901F\u5EA6: 100/\u79D2       \u4E0B\u6B21\u7A81\u7834:
-    3\u5929+"
+    3\u5929+111"
+--- !u!114 &6885229464675915263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7204648226655871677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7368366197341708070
 GameObject:
   m_ObjectHideFlags: 0
@@ -4231,4 +4333,34 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: Btn_Tips
+    gameObject: {fileID: 1871237412076693942}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: TipsRoot
+    gameObject: {fileID: 761335188077721832}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -2679,7 +2679,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5812057225866309631
 RectTransform:
   m_ObjectHideFlags: 0

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: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameUI/GameApplction.cs

@@ -202,13 +202,14 @@ public class GameApplction : IGameStart
             await cTask;
 
             AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(10000);
+            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            mainPanel.GObjectPoolInterface.SetActive(true);
             await EventSystemManager.Instance.TriggerEvent(eventList1);
           
 
             AccountFileInfo.Instance.SavePlayerData();
 
-            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
-            mainPanel.GObjectPoolInterface.SetActive(true);
+           
             AccountFileInfo.Instance.playerData.isTiggerPlot = true;
             // PlayerGuideManager.Instance.NextGuide();
             mainPanel.GetFocus();

Assets/Scripts/GameUI/UI/GuidePanel/GuidePanel.cs

@@ -13,6 +13,7 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            isAddStack = false;
         }
 
 
@@ -54,9 +55,8 @@ namespace Fort23.Mono
 
             Btn_MessageBG.onClick.AddListener(() => { PlayerGuideManager.Instance.dialogBox.OnClickScreen(); });
         }
-        
-        
-        
+
+
         [CustomMethod(customMethodType: CustomMethodType.Update)]
         public void Update()
         {
@@ -65,16 +65,13 @@ namespace Fort23.Mono
             //     return;
             // }
 
-            Vector3 worldPos = CombatDrive.Instance.CombatController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 worldPos = CombatDrive.Instance.CombatController.playerHeroEntity.combatHeroGameObject.hpTransform
+                .position;
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             dotPoint.transform.position = p2;
-
-          
-            
         }
-        
-        
+
 
         public void SetTarget(GameObject gameObject)
         {

Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -721,7 +721,7 @@ namespace Fort23.Mono
 
             int[] fPos = guideConfig.fingerPos;
             int[] dPos = guideConfig.dialogPos;
-            //int[] nPos = guideConfig.NpcPos;
+          
 
 
             isReadFingerPos = true;
@@ -731,22 +731,14 @@ namespace Fort23.Mono
             SetFingerPos(fPos);
 
             SetDialogPos(dPos);
-            // if (guideConfig.SpeakerStyle == 3)
-            // {
-            //     SetDilogBGSize(new Vector2(guideConfig.TextSize[0], guideConfig.TextSize[1]));
-            // }
-
-
-            // SetNpcPos(nPos);
-
-
+            
             SetBlackBaseVisiable(true);
 
             SetBlackAlpha(guideConfig.blackAlpha);
             ShowDialogBox(action, str);
             await dialogBox.SetDiTex(guideConfig, guideConfig.SpeakerImage);
-            // int[] scale = new[] { 750, 750 };
-            //  SetNpcSize(scale);
+            UIManager.Instance.SetEventSystemEnable(true);
+
         }
 
         /// <summary>
@@ -1207,6 +1199,7 @@ namespace Fort23.Mono
         /// </summary>
         public void StepInit()
         {
+            UIManager.Instance.SetEventSystemEnable(false);
             _customVectorTween?.Kill();
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -57,6 +57,8 @@ namespace Fort23.Mono
 
             Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
 
+            Btn_Tips.onClick.AddListener(() => { TipsRoot.gameObject.SetActive(!TipsRoot.gameObject.activeSelf); });
+
 
             Btn_Dujie.onClick.AddListener(async () =>
             {
@@ -124,6 +126,7 @@ namespace Fort23.Mono
                 }
                 else
                 {
+                    HeroBreakthroughPanel.OpenPanel();
                     // TipMessagePanel.OpenTipMessagePanel("")
                 }
             });
@@ -201,7 +204,8 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";
+                Text_Speed.text =
+                    $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{PlayerManager.TimeToHSM(miao)}";
             }
             else
             {
@@ -212,14 +216,14 @@ namespace Fort23.Mono
             Text_exp.text =
                 $"{PlayerManager.Instance.myHero.exp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
-            // if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
-            // {
-            //     Text_TuPo.text = "突破";
-            // }
-            // else
-            // {
-            //     Text_TuPo.text = "渡劫";
-            // }
+            if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+            {
+                Text_TuPo.text = "突破";
+            }
+            else
+            {
+                Text_TuPo.text = "渡劫";
+            }
         }
 
         [CustomMethod(CustomMethodType.Update)]
@@ -239,7 +243,7 @@ namespace Fort23.Mono
                              PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             if (miao > 0)
             {
-                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{miao}秒";
+                Text_Speed.text = $"修炼速度：{PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei}/秒 | 下次突破时间{PlayerManager.TimeToHSM(miao)}秒";
             }
             else
             {

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

@@ -195,6 +195,28 @@ namespace Fort23.Mono
 	      return _JingJieIcons;
 	     }
 	   }
+	  private Button _Btn_Tips;
+	  public Button Btn_Tips
+	   {
+	   get{
+	      if (_Btn_Tips == null)
+	       {
+	         _Btn_Tips  = GetUIUnit<Button>("Btn_Tips"); 
+	       }
+	      return _Btn_Tips;
+	     }
+	   }
+	  private GameObject _TipsRoot;
+	  public GameObject TipsRoot
+	   {
+	   get{
+	      if (_TipsRoot == null)
+	       {
+	         _TipsRoot  = GetUIUnit<GameObject>("TipsRoot"); 
+	       }
+	      return _TipsRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -130,6 +130,11 @@ namespace Fort23.Mono
 
             Btn_Event.onClick.AddListener(() =>
             {
+                if (PlayerGuideManager.Instance.curPhase == 1)
+                {
+                    return;
+                }
+
                 EventSystemManager.Instance.isOpenUi = true;
                 DivineSenceEventPreviewPanel.OpenPanel();
             });