Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/Dujie/DujiePanel.controller

@@ -63,10 +63,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -8319875679377244832}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 330, y: 110, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -4115728751167415764}
-    m_Position: {x: 300, y: 140, z: 0}
+    m_Position: {x: 340, y: 220, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -76,7 +76,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -8319875679377244832}
+  m_DefaultState: {fileID: -4115728751167415764}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.8902296
+    - _Alpha: 0.07477751
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.5876296
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/LanguageChineseConfig.json

@@ -38359,6 +38359,74 @@
     {
       "ID": 10330,
       "txt": "兑换商店"
+    },
+    {
+      "ID": 10331,
+      "txt": "达到{0}解锁！"
+    },
+    {
+      "ID": 10332,
+      "txt": "({0}后，恢复1点神识)"
+    },
+    {
+      "ID": 10333,
+      "txt": "({0}后，恢复全部神识)"
+    },
+    {
+      "ID": 10334,
+      "txt": "已全部恢复满！"
+    },
+    {
+      "ID": 10335,
+      "txt": "0"
+    },
+    {
+      "ID": 10336,
+      "txt": "0"
+    },
+    {
+      "ID": 10337,
+      "txt": "0"
+    },
+    {
+      "ID": 10338,
+      "txt": "0"
+    },
+    {
+      "ID": 10339,
+      "txt": "0"
+    },
+    {
+      "ID": 10340,
+      "txt": "0"
+    },
+    {
+      "ID": 10341,
+      "txt": "0"
+    },
+    {
+      "ID": 10342,
+      "txt": "0"
+    },
+    {
+      "ID": 10343,
+      "txt": "0"
+    },
+    {
+      "ID": 10344,
+      "txt": "0"
+    },
+    {
+      "ID": 10345,
+      "txt": "0"
+    },
+    {
+      "ID": 10346,
+      "txt": "0"
+    },
+    {
+      "ID": 10347,
+      "txt": "0"
     }
   ]
 }

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -233,7 +233,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -317}
+  m_AnchoredPosition: {x: 56, y: -202}
   m_SizeDelta: {x: 476, y: 480}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6314531365833353803
@@ -1426,6 +1426,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Close2
+    gameObject: {fileID: 7780452130953075245}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &7117668935224744481
 GameObject:
@@ -1493,7 +1498,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2581320567985479042
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1590,8 +1595,8 @@ 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: 0.000030517578, y: 433}
-  m_SizeDelta: {x: 476, y: 480}
+  m_AnchoredPosition: {x: 79, y: 517}
+  m_SizeDelta: {x: 387, y: 209}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1005241967001750870
 CanvasRenderer:
@@ -1621,7 +1626,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 364c5610f3fe4b144853acd3a029fa68, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f86db51770ecec14f8009f2ff3fe12f3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1631,7 +1636,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_shibai_di
+  _icon_name: bg_shibai
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
@@ -1655,9 +1660,10 @@ GameObject:
   - component: {fileID: 1038308334976805047}
   - component: {fileID: 33079179799988925}
   - component: {fileID: 8155787864348620891}
+  - component: {fileID: 7780452130953075245}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Btn_Close
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1734,6 +1740,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7780452130953075245
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8795936321024693190}
+  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: 8155787864348620891}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9039228642630835706
 GameObject:
   m_ObjectHideFlags: 0
@@ -1818,7 +1868,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9039228642630835706}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 

Assets/Res/UI/CombatHPPanel.prefab

@@ -175,7 +175,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -362,7 +362,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -811,7 +811,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -959,7 +959,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/CombatPanel.prefab

@@ -394,7 +394,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 43
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -710,7 +710,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 38.8
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -799,7 +799,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 61
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -947,7 +947,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4287798501111193387
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1155,7 +1155,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5837590194851709526
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1515,7 +1515,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 68
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1942,7 +1942,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2310,7 +2310,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 8
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4573,7 +4573,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 95
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5035,7 +5035,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 31
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -6434,7 +6434,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 75
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -8482,7 +8482,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}

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -307,7 +307,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0
   isUpdate: 0
-  currTime: 0.50041944
+  currTime: 0.51546496
   GrpupInfos:
   - Foldout: 1
     isActive: 0

Assets/Res/UI/DivineSence/DivineSenceRestoredPanel.prefab

@@ -104,6 +104,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Tips1
+    gameObject: {fileID: 5638955351412264767}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips2
+    gameObject: {fileID: 2563108577358148519}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &719445197697255642
 GameObject:
@@ -230,6 +240,8 @@ RectTransform:
   - {fileID: 8842124393281780795}
   - {fileID: 7663317156490623705}
   - {fileID: 2708046515207152597}
+  - {fileID: 6275148584250070916}
+  - {fileID: 3375913756600433316}
   - {fileID: 5866622043385976589}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -561,6 +573,86 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10325
+--- !u!1 &2453067890370699829
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3375913756600433316}
+  - component: {fileID: 2600124819267049154}
+  - component: {fileID: 2563108577358148519}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3375913756600433316
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2453067890370699829}
+  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: 5852862441037819201}
+  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: 15.075, y: -284.6}
+  m_SizeDelta: {x: 525.9169, y: 47.657}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2600124819267049154
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2453067890370699829}
+  m_CullTransparentMesh: 1
+--- !u!114 &2563108577358148519
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2453067890370699829}
+  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, g: 0, b: 0, 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: 1
+    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: "(10\u5206\u949F\u540E\uFF0C\u6062\u590D\u5168\u90E8\u795E\u8BC6)"
 --- !u!1 &2661625032725589361
 GameObject:
   m_ObjectHideFlags: 0
@@ -1144,6 +1236,86 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!1 &8525321932716564819
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6275148584250070916}
+  - component: {fileID: 1376453331867545162}
+  - component: {fileID: 5638955351412264767}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6275148584250070916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8525321932716564819}
+  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: 5852862441037819201}
+  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: 15.075, y: -241.9}
+  m_SizeDelta: {x: 525.9169, y: 47.657}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1376453331867545162
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8525321932716564819}
+  m_CullTransparentMesh: 1
+--- !u!114 &5638955351412264767
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8525321932716564819}
+  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, g: 0, b: 0, 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: 1
+    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: "(1.2\u79D2\u540E\uFF0C\u6062\u590D1\u70B9\u795E\u8BC6)"
 --- !u!1 &8974309411131815615
 GameObject:
   m_ObjectHideFlags: 0
@@ -1155,7 +1327,6 @@ GameObject:
   - component: {fileID: 305009398688895597}
   - component: {fileID: 4294669017348956789}
   - component: {fileID: 5689669388365980960}
-  - component: {fileID: 2940199970345716077}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_DivineSencePoint
@@ -1225,19 +1396,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 100
---- !u!114 &2940199970345716077
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8974309411131815615}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 10254
 --- !u!1001 &4650861149860321092
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab

@@ -60,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -226,7 +226,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -343,7 +343,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -473,7 +473,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.8470589, g: 0.9725491, b: 0.8705883, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -718,7 +718,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 0
+  imageH: 230
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -894,7 +894,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/MarskPanel/MarskPanel.prefab

@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -126,5 +126,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  data: []
+  data:
+  - key: Image
+    gameObject: {fileID: 7262357348388706855}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -29,7 +29,7 @@ public class DialogueManager : Singleton<DialogueManager>
     /// <summary>
     /// 开始对话
     /// </summary>
-    public void StartDialogue(AccountFileInfo.EventList CurrentEventList, int dialogueID, int eventId, Action onComplete = null, Action onCancel = null)
+    public async CTask StartDialogue(AccountFileInfo.EventList CurrentEventList, int dialogueID, int eventId, Action onComplete = null, Action onCancel = null)
     {
         this.onCancel = onCancel;
         this.CurrentEventList = CurrentEventList;
@@ -42,7 +42,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            PlayDialogue(dialogueID,true);
+             await PlayDialogue(dialogueID,true);
         }
 
         // EndDialogue1();
@@ -67,7 +67,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
     }
 
-    private async void PlayDialogue(int dialogueID,bool isShowTips  = false)
+    private async CTask PlayDialogue(int dialogueID,bool isShowTips  = false)
     {
         currentDialogueID = dialogueID;
 
@@ -145,7 +145,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            DialogueBubblePanel.OpenDialoguePanel(dialogueConfig.ID, FishDialogue);
+            await DialogueBubblePanel.OpenDialoguePanel(dialogueConfig.ID, FishDialogue);
         }
     }
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -654,7 +654,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <summary>
     /// 其他类型事件触发
     /// </summary>
-    public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null)
+    public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null,Action uiOpenOverCallBack = null)
     {
         // ChancleEvent();
         if (isTriggerEvent)
@@ -762,7 +762,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, () =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, () =>
         {
             CompleteEvent(CurrentEventList);
             cTask.SetResult();
@@ -771,6 +771,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             CancelEvent(CurrentEventList);
             cTask.SetResult();
         });
+        uiOpenOverCallBack?.Invoke();
 
         DivineSenceEventPreviewPanel divineSenceEventPreviewPanel =
             UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>();

Assets/Scripts/GameUI/GameApplction.cs

@@ -115,7 +115,10 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
-
+        if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+        {
+            await MarskPanel.OpenPanel(255);
+        }
         EventSystemManager.Instance.CustomInit();
         PlayerManager.Instance.Init();
         await ShowItemMoveToTargetPanel.OpenShowItemMoveToTargetPanel();
@@ -138,6 +141,7 @@ public class GameApplction : IGameStart
         //     PlayerManager.Instance.FaBaoControl.FightFaBao[i] = PlayerManager.Instance.FaBaoControl.myAllFaBao[i];
         // }
         // PlayerManager.Instance.InitTestHero();
+       
 
         await CombatDrive.Instance.Init();
         StartCombatInfo startCombatInfo = new StartCombatInfo();
@@ -165,10 +169,18 @@ public class GameApplction : IGameStart
         }
 
         EventSystemManager.Instance.UpdateZuizhongEventData();
+
+
+        // if (PlayerGuideManager.Instance.GuideIsCanDo(1))
+        // {
+        //     await MarskPanel.OpenPanel(255);
+        // }
+
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
         PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData
             .TaoismSkillId);
+
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
             MainPanel mainPanel = await MainPanel.OpenPanel();
@@ -187,10 +199,13 @@ public class GameApplction : IGameStart
 
     public async void XinShouCombat()
     {
+        MarskPanel.ClosePanel();
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
             AccountFileInfo.EventList eventList2 = EventSystemManager.Instance.AddEvent(9999);
-            await EventSystemManager.Instance.TriggerEvent(eventList2);
+            await EventSystemManager.Instance.TriggerEvent(eventList2,
+                uiOpenOverCallBack: () => { MarskPanel.ClosePanel(); });
+
             CTask cTask = CTask.Create();
             await CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
                 delegate(bool isWin)
@@ -206,7 +221,6 @@ public class GameApplction : IGameStart
             mainPanel.GObjectPoolInterface.SetActive(true);
             await EventSystemManager.Instance.TriggerEvent(eventList1);
 
-
             AccountFileInfo.Instance.SavePlayerData();
 
 

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -36,7 +36,7 @@ namespace Fort23.Mono
         private void DivineSensePointChange(IEventData e)
         {
             Text_divineSensePoint.text =
-                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
+                $"{(int)AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax}";
         }
 
         public override void AddButtonEvent()

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -33,6 +33,12 @@ namespace Fort23.Mono
                 callBack?.Invoke();
                 callBack = null;
             });
+            Btn_Close2.onClick.AddListener(async() =>
+            {
+                await UIManager.Instance.HideUIUIPanel(this);
+                callBack?.Invoke();
+                callBack = null;
+            });
         }
 
         public async void CustomInit(bool isWin, System.Action callBack)
@@ -41,6 +47,7 @@ namespace Fort23.Mono
             AudioManager.Instance.PauseBGM();
             if (isWin)
             {
+                Btn_Close.enabled = true;
                 AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
@@ -50,11 +57,14 @@ namespace Fort23.Mono
             }
             else
             {
+                Btn_Close.enabled = false;
                 AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
 
-                SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null, SkipToContent);
+                SkipToWidget skipToWidget =
+                    await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null,
+                        SkipToContent);
                 skipToWidget.CustonInit(1);
                 skipToWidgets.Add(skipToWidget);
                 skipToWidget.OnClick = OnClick;
@@ -74,7 +84,8 @@ namespace Fort23.Mono
 
         public static async CTask<BattleSettlementPanel> OpenPanel(bool isWin, System.Action callBack)
         {
-            BattleSettlementPanel battleSettlementPanel = await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null,isShowBG:true);
+            BattleSettlementPanel battleSettlementPanel =
+                await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null, isShowBG: true);
             battleSettlementPanel.CustomInit(isWin, callBack);
 
             return battleSettlementPanel;

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanelData.cs

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

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

@@ -53,6 +53,59 @@ namespace Fort23.Mono
             }
 
 
+            // if (isHarm)
+            // {
+            //     text.color=heroEntity.IsEnemy?Color.white:Color.red;
+            // }
+            // else
+            // {
+            //     text.color=Color.green;
+            // }
+
+            text.text = att.ToString();
+            anim.Play(playName, false);
+            // if (Animator != null)
+            // {
+            //     if (harmType.HasFlag(HarmType.BaoJi))
+            //     {
+            //         Animator.Play("ShowTextWidgetBaoji");
+            //     }
+            //     else
+            //     {
+            //         Animator.Play("ShowTextWidgetShow");
+            //     }
+            // }
+
+            CombatTimerManager.Instance.AddTimer(1, delegate { GObjectPool.Instance.Recycle(this); });
+        }
+
+
+        public void ShowUI(Vector3 p2, long att, HarmType harmType, bool isHarm)
+        {
+            // Vector3 worldPos = heroEntity.combatHeroGameObject.hpTransform.position;
+            // Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
+            // Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            transform.position = p2;
+            string playName = "show";
+            if (harmType.HasFlag(HarmType.Shields))
+            {
+                text.color = Color.cyan;
+            }
+            else if (harmType.HasFlag(HarmType.Buff))
+            {
+                playName = "buffshow";
+                text.color = Color.white;
+            }
+            else if (harmType.HasFlag(HarmType.Recover))
+            {
+                text.color = Color.green;
+            }
+            else if (harmType.HasFlag(HarmType.Default))
+            {
+                text.color = Color.red;
+            }
+
+
             // if (isHarm)
             // {
             //     text.color=heroEntity.IsEnemy?Color.white:Color.red;

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -273,6 +273,7 @@ namespace Fort23.Mono
             shengShiEventWidgetTypeList.Clear();
             EventSystemManager.Instance.isOpenUi = false;
             saixuanType = 1;
+            mainShengShiEventWidgetType2?.DormancyObj();
             mainShengShiEventWidgetType2 = null;
             isTriggerEvent = false;
             await base.Close();

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs

@@ -35,7 +35,7 @@ namespace Fort23.Mono
                 Icon_ShenIcon.gameObject.SetActive(true);
                 // Icon_ItemIcon.icon_name = ItemInfo.config.icon;
                 Text_ItemCount.text =
-                    $"<color=#EF9F32>{100 * 1}</color>/{AccountFileInfo.Instance.playerData.divineSensePoint}";
+                    $"<color=#EF9F32>{100 * 1}</color>/{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
             }
             else
             {
@@ -76,7 +76,7 @@ namespace Fort23.Mono
             if (type == 1)
             {
                 Text_ItemCount.text =
-                    $"<color=#EF9F32>{100 * selectCount}</color>/{AccountFileInfo.Instance.playerData.divineSensePoint}";
+                    $"<color=#EF9F32>{100 * selectCount}</color>/{(int)AccountFileInfo.Instance.playerData.divineSensePoint}";
             }
             else
             {

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredPanel.cs

@@ -1,3 +1,5 @@
+using Core.Language;
+using Excel2Json;
 using Fort23.Core;
 
 namespace Fort23.Mono
@@ -29,6 +31,8 @@ namespace Fort23.Mono
         {
         }
 
+        private float miao;
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             Text_DivineSencePoint.text =
@@ -48,15 +52,49 @@ namespace Fort23.Mono
                     DivineSenceRestoredWidget3, null,
                     Content);
             divineSenceRestoredWidget3.CustomInit1(1703);
+
+
+            HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
+
+
+            TimerComponent.Instance.AddTimer(1000, null, int.MaxValue, () =>
+            {
+                if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
+                {
+                    if (AccountFileInfo.Instance.playerData.todayDivineSensePoint <
+                        PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[0])
+                    {
+                        miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
+                    }
+                    else
+                    {
+                        miao = 1 / PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
+                    }
+
+                    Text_Tips1.text =
+                        LanguageManager.Instance.Text(10332, PlayerManager.TimeToHSM((long)(miao)));
+                    int shengyuPoint =
+                        (int)(heroPowerUpConfig.ShenshiMax - AccountFileInfo.Instance.playerData.divineSensePoint);
+                    
+                    Text_Tips2.text =
+                        LanguageManager.Instance.Text(10333, PlayerManager.TimeToHSM((long)(shengyuPoint * miao )));
+                }
+                else
+                {
+                    Text_Tips1.text = LanguageManager.Instance.Text(10334);
+                    Text_Tips2.text = LanguageManager.Instance.Text(10334);
+                }
+
+              
+            });
+
             return await base.AsyncInit(uiData);
         }
 
 
         public async static CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null,UILayer.Top,isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<DivineSenceRestoredPanel>(null, UILayer.Top, isShowBG: true);
         }
-        
-        
     }
 }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredPanelData.cs

@@ -118,6 +118,28 @@ namespace Fort23.Mono
 	      return _DivineSenceRestoredWidget3;
 	     }
 	   }
+	  private Text _Text_Tips1;
+	  public Text Text_Tips1
+	   {
+	   get{
+	      if (_Text_Tips1 == null)
+	       {
+	         _Text_Tips1  = GetUIUnit<Text>("Text_Tips1"); 
+	       }
+	      return _Text_Tips1;
+	     }
+	   }
+	  private Text _Text_Tips2;
+	  public Text Text_Tips2
+	   {
+	   get{
+	      if (_Text_Tips2 == null)
+	       {
+	         _Text_Tips2  = GetUIUnit<Text>("Text_Tips2"); 
+	       }
+	      return _Text_Tips2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -111,6 +111,8 @@ namespace Fort23.Mono
                     }
                 }
 
+                HeroInformationPanel heroInformationPanel =
+                    UIManager.Instance.GetComponent<HeroInformationPanel>();
 
                 var list = GetBl();
 
@@ -120,15 +122,22 @@ namespace Fort23.Mono
                 //突破成功
                 if (ramdomValue < list[0])
                 {
+              
+
                     bool isTuPoSuccess = true;
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                     {
                         if (PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages != null &&
                             PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages.Length > 1)
                         {
+                            GObjectPoolInterface.SetActive(false);
+                            BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
+                            backgroundPanel.GObjectPoolInterface.SetActive(false);
+                          
                             type1 = 3;
                             ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
                                 PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
+                            await heroInformationPanel.Dujie(ramdomValue);
                             //渡劫失败
                             if (ramdomValue >= PlayerManager.Instance.myHero.hp.Value)
                             {
@@ -143,7 +152,7 @@ namespace Fort23.Mono
                             }
                         }
                     }
-
+                
                     if (isTuPoSuccess)
                     {
                         AudioManager.Instance.PlayAudio("ui_tupo.wav");
@@ -159,7 +168,7 @@ namespace Fort23.Mono
                         await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                     await heroBreakthroughFailPanel.UIClosed();
                 }
-
+                heroInformationPanel.RecoverDujie();
                 UIManager.Instance.HideUIUIPanel(this);
             });
 
@@ -282,7 +291,7 @@ namespace Fort23.Mono
                     }
                     else
                     {
-                        Text_HeroHp.color = Color.black;
+                        Text_HeroHp.color = new Color32(249,240,204,255);
                     }
                 }
                 else

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

@@ -7,6 +7,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
 
@@ -254,6 +255,16 @@ namespace Fort23.Mono
                 Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
+
+            if (Input.GetKeyDown(KeyCode.R))
+            {
+                Dujie(90);
+            }
+
+            if (Input.GetKeyDown(KeyCode.E))
+            {
+                RecoverDujie();
+            }
         }
 
 
@@ -325,5 +336,66 @@ namespace Fort23.Mono
 
             HeroAttributeWidgets.Clear();
         }
+
+        List<ShowTextWidget> showTextWidgets = new List<ShowTextWidget>();
+
+        public async CTask Dujie(int hart)
+        {
+            root.SetActive(false);
+            using (CTaskAwaitBuffer<ShowTextWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<ShowTextWidget>())
+            {
+                for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
+                {
+                    cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponentForObject<ShowTextWidget>(
+                        ShowTextWidgetGam, null, transform, isInstance: true));
+                }
+
+                showTextWidgets = await cTaskAwaitBuffer.WaitAll();
+            }
+
+
+            DujiePanelAnim.Play("guodu");
+            fx_ui_dujie_guodu.gameObject.SetActive(true);
+            fx_ui_dujie_hun.gameObject.SetActive(true);
+            fx_ui_dujie_guodu.Play();
+            fx_ui_dujie_hun.Play();
+            long hp = PlayerManager.Instance.myHero.hp.Value;
+
+            Slider_Hp.maxValue = PlayerManager.Instance.myHero.hp.Value;
+            Text_Hp.text = $"{hp}/{hp}";
+
+
+            await TimerComponent.Instance.WaitAsync(1000);
+            Slider_Hp.gameObject.SetActive(true);
+
+
+            int h = hart / PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2];
+            for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
+            {
+                fx_ui_dujie_sd.gameObject.SetActive(true);
+                fx_ui_dujie_sd.Play();
+                await TimerComponent.Instance.WaitAsync(200);
+                showTextWidgets[i].ShowUI(hpPos.transform.position, -h, HarmType.Default, false);
+     
+                hp -= h;
+                hp = hp < 0 ? 0 : hp;
+                Slider_Hp.value = hp;
+                Text_Hp.text = $"{hp}/{PlayerManager.Instance.myHero.hp.Value}";
+                await TimerComponent.Instance.WaitAsync(1000);
+            }
+
+            await TimerComponent.Instance.WaitAsync(150);
+            fx_ui_dujie_guodu.gameObject.SetActive(false);
+            fx_ui_dujie_hun.gameObject.SetActive(false);
+            fx_ui_dujie_sd.gameObject.SetActive(false);
+            Slider_Hp.gameObject.SetActive(false);
+        }
+
+
+        public async CTask RecoverDujie()
+        {
+            DujiePanelAnim.Play("guodu_idle");
+            root.SetActive(true);
+        }
     }
 }

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

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class HeroInformationPanel 
@@ -217,6 +219,105 @@ namespace Fort23.Mono
 	      return _TipsRoot;
 	     }
 	   }
+	  private GameObject _root;
+	  public GameObject root
+	   {
+	   get{
+	      if (_root == null)
+	       {
+	         _root  = GetUIUnit<GameObject>("root"); 
+	       }
+	      return _root;
+	     }
+	   }
+	  private Animator _DujiePanelAnim;
+	  public Animator DujiePanelAnim
+	   {
+	   get{
+	      if (_DujiePanelAnim == null)
+	       {
+	         _DujiePanelAnim  = GetUIUnit<Animator>("DujiePanelAnim"); 
+	       }
+	      return _DujiePanelAnim;
+	     }
+	   }
+	  private UIParticle _fx_ui_dujie_guodu;
+	  public UIParticle fx_ui_dujie_guodu
+	   {
+	   get{
+	      if (_fx_ui_dujie_guodu == null)
+	       {
+	         _fx_ui_dujie_guodu  = GetUIUnit<UIParticle>("fx_ui_dujie_guodu"); 
+	       }
+	      return _fx_ui_dujie_guodu;
+	     }
+	   }
+	  private UIParticle _fx_ui_dujie_hun;
+	  public UIParticle fx_ui_dujie_hun
+	   {
+	   get{
+	      if (_fx_ui_dujie_hun == null)
+	       {
+	         _fx_ui_dujie_hun  = GetUIUnit<UIParticle>("fx_ui_dujie_hun"); 
+	       }
+	      return _fx_ui_dujie_hun;
+	     }
+	   }
+	  private UIParticle _fx_ui_dujie_sd;
+	  public UIParticle fx_ui_dujie_sd
+	   {
+	   get{
+	      if (_fx_ui_dujie_sd == null)
+	       {
+	         _fx_ui_dujie_sd  = GetUIUnit<UIParticle>("fx_ui_dujie_sd"); 
+	       }
+	      return _fx_ui_dujie_sd;
+	     }
+	   }
+	  private Slider _Slider_Hp;
+	  public Slider Slider_Hp
+	   {
+	   get{
+	      if (_Slider_Hp == null)
+	       {
+	         _Slider_Hp  = GetUIUnit<Slider>("Slider_Hp"); 
+	       }
+	      return _Slider_Hp;
+	     }
+	   }
+	  private GameObject _ShowTextWidgetGam;
+	  public GameObject ShowTextWidgetGam
+	   {
+	   get{
+	      if (_ShowTextWidgetGam == null)
+	       {
+	         _ShowTextWidgetGam  = GetUIUnit<GameObject>("ShowTextWidgetGam"); 
+	       }
+	      return _ShowTextWidgetGam;
+	     }
+	   }
+	  private Text _Text_Hp;
+	  public Text Text_Hp
+	   {
+	   get{
+	      if (_Text_Hp == null)
+	       {
+	         _Text_Hp  = GetUIUnit<Text>("Text_Hp"); 
+	       }
+	      return _Text_Hp;
+	     }
+	   }
+	  private RectTransform _hpPos;
+	  public RectTransform hpPos
+	   {
+	   get{
+	      if (_hpPos == null)
+	       {
+	         _hpPos  = GetUIUnit<RectTransform>("hpPos"); 
+	       }
+	      return _hpPos;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -33,6 +33,12 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            foreach (var itemDetailsWidget in itemDetailsWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(itemDetailsWidget);
+            }
+            itemDetailsWidgets.Clear();
+            
             itemInfo = uiData[0] as ItemInfo;
 
             Text_Name.text = LanguageManager.Instance.Text(itemInfo.config.itemName);

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Animancer;
 using Animancer.TransitionLibraries;
+using Core.Language;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
@@ -156,8 +158,18 @@ namespace Fort23.Mono
         private async void OnClick(ItemWidgetBasic obj)
         {
             BtnFaBaoWidget btnFaBaoWidget = obj as BtnFaBaoWidget;
+          
             if (btnFaBaoWidget.index > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum - 1)
             {
+                HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>();
+                foreach (var heroPowerUpConfig in heroPowerUpConfigs)
+                {
+                    if (heroPowerUpConfig.MaxFabaoNum > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum)
+                    {
+                        TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10331,LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0])+LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1])+LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])));
+                        return;
+                    }
+                }
                 TipMessagePanel.OpenTipMessagePanel("当前位置未解锁");
                 return;
             }

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

@@ -57,14 +57,14 @@ namespace Fort23.Mono
 
         public async void CustomInit()
         {
-            if (PlayerManager.Instance.PlayerName == "")
-            {
-                AlterNamePanel alterNamePanel = await AlterNamePanel.OpenPanel();
-                await alterNamePanel.UIClosed();
-            }
-
             if (AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
+                if (PlayerManager.Instance.PlayerName == "")
+                {
+                    AlterNamePanel alterNamePanel = await AlterNamePanel.OpenPanel();
+                    await alterNamePanel.UIClosed();
+                }
+
                 if (PlayerGuideManager.Instance.GuideIsCanDo(1))
                 {
                     await PlayerGuideManager.Instance.SetGuid(1);

Assets/Scripts/GameUI/UI/MarskPanel/MarskPanel.cs

@@ -1,4 +1,5 @@
 using Fort23.Core;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -22,9 +23,12 @@ namespace Fort23.Mono
 
 		}
 
-		public async static CTask OpenPanel()
+		public async static CTask OpenPanel(byte a = 1)
 		{
-			await UIManager.Instance.LoadAndOpenPanel<MarskPanel>(null,UILayer.Loading);
+			MarskPanel marskPanel = await UIManager.Instance.LoadAndOpenPanel<MarskPanel>(null,UILayer.Loading);
+			Color32 color = marskPanel.Image.color;
+			color.a = a;
+			marskPanel.Image.color = color;
 		}
 		
 		public async static CTask ClosePanel()

Assets/Scripts/GameUI/UI/MarskPanel/MarskPanelData.cs

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class MarskPanel 
+	{
+	  #region 自定义数据 
+	  private Image _Image;
+	  public Image Image
+	   {
+	   get{
+	      if (_Image == null)
+	       {
+	         _Image  = GetUIUnit<Image>("Image"); 
+	       }
+	      return _Image;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/MarskPanel/MarskPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XSsY5yqsUnz25hAY04kzrNk750p3iBcbjJROhA+aVGTdqTfaajUuVnI5L3q1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

XiuXianGame.sln.DotSettings.user

@@ -11,6 +11,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACameraType_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F07_003F2a422d04_003FCameraType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollectionExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fde80aed0bd3646409e8bfb15c101f005e2000_003Fb3_003F5c77f01e_003FCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColor32_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fb2_003F92c348cf_003FColor32_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F13_003F4d8b1ee1_003FColor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>