Browse Source

渡劫动画

lzx 3 days ago
parent
commit
476a68166b

+ 3 - 3
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

+ 12 - 12
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}

+ 1 - 1
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:

+ 798 - 53
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &234597154156495760
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 567943526521562570}
+  - component: {fileID: 6819466101312657486}
+  - component: {fileID: 5185276306852609774}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &567943526521562570
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234597154156495760}
+  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: 389517420566117365}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6819466101312657486
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234597154156495760}
+  m_CullTransparentMesh: 1
+--- !u!114 &5185276306852609774
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234597154156495760}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d570df61e5e429dc2d9169bbaecec167
+  imageH: 10
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &686241986462251838
 GameObject:
   m_ObjectHideFlags: 0
@@ -28,13 +117,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 686241986462251838}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6830660241309542230}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -183,7 +272,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1772753141541214691}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -397,13 +486,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 904154690949135262}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6784987615536610523}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -619,7 +708,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1535638494222853882}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -627,7 +716,7 @@ RectTransform:
   - {fileID: 2358926622837069003}
   - {fileID: 2341375139629853098}
   - {fileID: 3878032607523875495}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -774,6 +863,96 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &2143211940181038495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 389517420566117365}
+  - component: {fileID: 5928534571558450226}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Slider_Hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &389517420566117365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2143211940181038495}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 567943526521562570}
+  - {fileID: 8707292690727122296}
+  m_Father: {fileID: 5280865914155831809}
+  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: -634.3021}
+  m_SizeDelta: {x: 487.0609, y: 41.8041}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5928534571558450226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2143211940181038495}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0}
+  m_FillRect: {fileID: 8746549949437352055}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 100
+  m_WholeNumbers: 0
+  m_Value: 100
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2713101091723102553
 GameObject:
   m_ObjectHideFlags: 0
@@ -801,13 +980,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2713101091723102553}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4847353937859667548}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -909,6 +1088,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2747918479148385504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8746549949437352055}
+  - component: {fileID: 5257616696453348221}
+  - component: {fileID: 9152956641951100196}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8746549949437352055
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2747918479148385504}
+  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: 8707292690727122296}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5257616696453348221
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2747918479148385504}
+  m_CullTransparentMesh: 1
+--- !u!114 &9152956641951100196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2747918479148385504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.69411767, g: 0.15294118, b: 0.15686275, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d570df61e5e429dc2d9169bbaecec167
+  imageH: 10
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2830513542758730728
 GameObject:
   m_ObjectHideFlags: 0
@@ -951,7 +1219,7 @@ RectTransform:
   - {fileID: 7401228172309310412}
   - {fileID: 8338860588973310608}
   - {fileID: 5105472397468528539}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1218,12 +1486,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3042626415887802354}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1579,7 +1847,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1758,7 +2026,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!20 &1117134768091027707
 Camera:
@@ -1980,12 +2248,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4310037918721046610}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2113,12 +2381,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4570710641719408853}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2167,6 +2435,71 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: LV35
+--- !u!1 &4866959085157834762
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2859865283014944201}
+  - component: {fileID: 1135428080984447248}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2859865283014944201
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4866959085157834762}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3106622106931745522}
+  - {fileID: 5624694180497915839}
+  - {fileID: 7058732367293901820}
+  - {fileID: 3296466721338208283}
+  - {fileID: 7447784581765122494}
+  - {fileID: 8034867944299354957}
+  - {fileID: 3204115114962956502}
+  - {fileID: 3039944541514686334}
+  - {fileID: 4451187143981537632}
+  - {fileID: 5496005517712940668}
+  - {fileID: 2074141334421181977}
+  - {fileID: 4792204723085321954}
+  - {fileID: 6945085581065943726}
+  - {fileID: 5064725350204833939}
+  - {fileID: 8254445196056779358}
+  - {fileID: 5668257681158111763}
+  - {fileID: 6341706220095682999}
+  - {fileID: 1177809280148261388}
+  - {fileID: 1155106644705196333}
+  - {fileID: 871529640652062368}
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1135428080984447248
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4866959085157834762}
+  m_CullTransparentMesh: 1
 --- !u!1 &4972535905059789851
 GameObject:
   m_ObjectHideFlags: 0
@@ -2256,6 +2589,43 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5177286114868873111
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8707292690727122296}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8707292690727122296
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5177286114868873111}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8746549949437352055}
+  m_Father: {fileID: 389517420566117365}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.21200562, y: -0.3179989}
+  m_SizeDelta: {x: -3.3915, y: -3.1795}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5521144525306163039
 GameObject:
   m_ObjectHideFlags: 0
@@ -2282,12 +2652,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5521144525306163039}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2362,7 +2732,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2510253786452685598}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2581,13 +2951,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5686636881236467809}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1850109316740755711}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2822,7 +3192,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2987,7 +3357,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3298,12 +3668,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7078139987169931433}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3674,12 +4044,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7809232107031970724}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -3901,7 +4271,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4030,12 +4400,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8742744849944818760}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -4122,7 +4492,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2520275275624947179}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4210,28 +4580,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5280865914155831809}
   - {fileID: 8212670971040085124}
   - {fileID: 307469801909214118}
-  - {fileID: 3106622106931745522}
-  - {fileID: 5624694180497915839}
-  - {fileID: 7058732367293901820}
-  - {fileID: 3296466721338208283}
-  - {fileID: 7447784581765122494}
-  - {fileID: 8034867944299354957}
-  - {fileID: 3204115114962956502}
-  - {fileID: 3039944541514686334}
-  - {fileID: 4451187143981537632}
-  - {fileID: 5496005517712940668}
-  - {fileID: 2074141334421181977}
-  - {fileID: 4792204723085321954}
-  - {fileID: 6945085581065943726}
-  - {fileID: 5064725350204833939}
-  - {fileID: 8254445196056779358}
-  - {fileID: 5668257681158111763}
-  - {fileID: 6341706220095682999}
-  - {fileID: 1177809280148261388}
-  - {fileID: 1155106644705196333}
-  - {fileID: 871529640652062368}
+  - {fileID: 2859865283014944201}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4377,4 +4729,397 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: root
+    gameObject: {fileID: 4866959085157834762}
+    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: DujiePanelAnim
+    gameObject: {fileID: 8568358918166002202}
+    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: fx_ui_dujie_guodu
+    gameObject: {fileID: 5964384238786122931}
+    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: fx_ui_dujie_hun
+    gameObject: {fileID: 1731733503807496625}
+    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: fx_ui_dujie_sd
+    gameObject: {fileID: 1233512913528227498}
+    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: Slider_Hp
+    gameObject: {fileID: 5928534571558450226}
+    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
+--- !u!1001 &2752137599948016585
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 9037135992368401232}
+    m_Modifications:
+    - target: {fileID: 21777499529448212, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 21777499529448212, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1390095519037479326, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1390095519037479326, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1811408266080149339, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966741057589406045, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966741057589406045, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2035030925446816039, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2035030925446816039, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2058697329654817927, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2058697329654817927, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2733326372389011073, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2775445794141986602, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2775445794141986602, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3539116978588044446, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3539116978588044446, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3969142725988242099, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3969142725988242099, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4884000142392749412, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4884000142392749412, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4884000142392749412, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5085283694769159289, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5085283694769159289, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5170923307864588658, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5170923307864588658, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5170923307864588658, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5185382667339226610, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5185382667339226610, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5203073339430596382, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Name
+      value: DujiePanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 5535801099866804413, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5556781585606017402, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5556781585606017402, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6024746020349331645, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7300921845982502601, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7300921845982502601, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8101636400812440899, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8488367257602713692, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8488367257602713692, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 389517420566117365}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+--- !u!114 &1233512913528227498 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3976643171929083235, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+  m_PrefabInstance: {fileID: 2752137599948016585}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1731733503807496625 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4483848973399059064, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+  m_PrefabInstance: {fileID: 2752137599948016585}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &5280865914155831809 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+  m_PrefabInstance: {fileID: 2752137599948016585}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5964384238786122931 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8427415011666485114, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+  m_PrefabInstance: {fileID: 2752137599948016585}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!95 &8568358918166002202 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5825797102444245459, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+  m_PrefabInstance: {fileID: 2752137599948016585}
+  m_PrefabAsset: {fileID: 0}

+ 1 - 1
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: -10.84, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 7 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -111,6 +111,8 @@ namespace Fort23.Mono
                     }
                 }
 
+                HeroInformationPanel heroInformationPanel =
+                    UIManager.Instance.GetComponent<HeroInformationPanel>();
 
                 var list = GetBl();
 
@@ -120,6 +122,11 @@ namespace Fort23.Mono
                 //突破成功
                 if (ramdomValue < list[0])
                 {
+                    GObjectPoolInterface.SetActive(false);
+                    BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
+                    backgroundPanel.GObjectPoolInterface.SetActive(false);
+                    await heroInformationPanel.Dujie();
+
                     bool isTuPoSuccess = true;
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                     {

+ 38 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -254,6 +254,11 @@ namespace Fort23.Mono
                 Text_Speed.text = LanguageManager.Instance.Text(10266,
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
+
+            if (Input.GetKeyDown(KeyCode.R))
+            {
+                Dujie();
+            }
         }
 
 
@@ -325,5 +330,38 @@ namespace Fort23.Mono
 
             HeroAttributeWidgets.Clear();
         }
+
+        public async CTask Dujie()
+        {
+            root.SetActive(false);
+            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();
+            int hp = 100;
+            Slider_Hp.value = hp;
+
+
+            await TimerComponent.Instance.WaitAsync(1000);
+            Slider_Hp.gameObject.SetActive(true);
+            for (int i = 0; i < 3; i++)
+            {
+                fx_ui_dujie_sd.gameObject.SetActive(true);
+                fx_ui_dujie_sd.Play();
+                await TimerComponent.Instance.WaitAsync(200);
+                hp -= 20;
+                Slider_Hp.value = hp;
+                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);
+            DujiePanelAnim.Play("guodu_idle");
+            root.SetActive(true);
+        }
     }
 }

+ 68 - 0
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,72 @@ 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;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{