Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

Assets/Art/DiMian.shadergraph

@@ -180,8 +180,8 @@
     ],
     "m_VertexContext": {
         "m_Position": {
-            "x": 0.0,
-            "y": 0.0
+            "x": 274.9999694824219,
+            "y": 47.00000762939453
         },
         "m_Blocks": [
             {
@@ -197,8 +197,8 @@
     },
     "m_FragmentContext": {
         "m_Position": {
-            "x": 0.0,
-            "y": 200.0
+            "x": 274.9999694824219,
+            "y": 247.0000457763672
         },
         "m_Blocks": [
             {
@@ -500,10 +500,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -179.0,
-            "y": 349.0,
-            "width": 0.0,
-            "height": 0.0
+            "x": -207.0,
+            "y": 383.0,
+            "width": 118.0,
+            "height": 34.0
         }
     },
     "m_Slots": [
@@ -761,10 +761,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -737.0,
-            "y": 320.99993896484377,
+            "x": -1485.0001220703125,
+            "y": 240.00001525878907,
             "width": 208.0,
-            "height": 435.00006103515627
+            "height": 435.0
         }
     },
     "m_Slots": [
@@ -898,8 +898,8 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -235.0,
-            "y": 403.0,
+            "x": -221.0,
+            "y": 431.0,
             "width": 132.0,
             "height": 34.0
         }
@@ -965,10 +965,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -428.0,
-            "y": 303.9999694824219,
+            "x": -1184.0001220703125,
+            "y": 279.0000305175781,
             "width": 131.0,
-            "height": 34.00006103515625
+            "height": 33.999969482421878
         }
     },
     "m_Slots": [
@@ -1016,10 +1016,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -297.0,
-            "y": 454.0,
+            "x": -880.0000610351563,
+            "y": 186.99996948242188,
             "width": 208.0,
-            "height": 302.0
+            "height": 302.0000305175781
         }
     },
     "m_Slots": [
@@ -1599,10 +1599,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -1048.9998779296875,
-            "y": 304.0,
-            "width": 131.99993896484376,
-            "height": 34.00006103515625
+            "x": -1689.0001220703125,
+            "y": 206.00001525878907,
+            "width": 132.0,
+            "height": 34.0
         }
     },
     "m_Slots": [

Assets/Art/Forest Ruins Pack Cute Series/Materials/Forest Ruins.mat

@@ -173,6 +173,8 @@ Material:
     - _MainTexChannel: {r: 1, g: 0, b: 0, a: 0}
     - _SPECULAR_COLOR: {r: 1, g: 1, b: 1, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &7155648188083352423
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Grass 01A.mat

@@ -147,6 +147,8 @@ Material:
     - _WindQuality: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0.6764634, g: 0.8867924, b: 0.0292809, a: 1}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
@@ -157,6 +159,8 @@ Material:
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &5234974988858769547
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Grass 01B.mat

@@ -141,6 +141,8 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0.76049316, g: 1, b: 0, a: 1}
     - _Color: {r: 0.76049316, g: 1, b: 0, a: 1}
@@ -148,4 +150,6 @@ Material:
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []

Assets/Art/Forest Ruins Pack Cute Series/Materials/Grid Grass 01A.mat

@@ -111,6 +111,8 @@ Material:
     - _SrcBlend: 5
     - _UVSec: 0
     - _ZWrite: 0
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0, a: 0}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
@@ -118,6 +120,7 @@ Material:
     - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &7285955555417085157
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Grid Grass 02A.mat

@@ -111,6 +111,8 @@ Material:
     - _SrcBlend: 5
     - _UVSec: 0
     - _ZWrite: 0
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0, a: 0}
     - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
@@ -118,6 +120,7 @@ Material:
     - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &2041398829699054531
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Tree 01 Leaves Green.mat

@@ -138,6 +138,8 @@ Material:
     - _WindQuality: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0.04313723, g: 1, b: 0.4078936, a: 1}
     - _Color: {r: 0.04313723, g: 1, b: 0.4078936, a: 1}
@@ -147,6 +149,7 @@ Material:
     - _TranslucencyColor: {r: 0.73, g: 0.85, b: 0.40999997, a: 1}
     - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &402184684913458375
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Tree 02 Leaves Blue.mat

@@ -137,6 +137,8 @@ Material:
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &6178421185832259137
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/Tree 02 Leaves Orange.mat

@@ -128,6 +128,8 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 0.5696164, b: 0, a: 1}
     - _Color: {r: 1, g: 0.5696164, b: 0, a: 1}
@@ -135,6 +137,8 @@ Material:
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &8407060923207839452
 MonoBehaviour:

Assets/Art/Forest Ruins Pack Cute Series/Materials/water.mat

@@ -116,11 +116,15 @@ Material:
     - _Surface: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 0.12871677, g: 0.4479763, b: 0.58599997, a: 1}
     - _Color: {r: 0.12871677, g: 0.4479763, b: 0.58599997, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+    - _aaa: {r: 0, g: 0, b: 0, a: 0}
+    - _fogColor: {r: 0.25342646, g: 0.48305833, b: 0.6320754, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &761660482403588892
 MonoBehaviour:

Assets/Art/UIAnimation/StartBossPanel.anim

@@ -0,0 +1,177 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: StartBossPanel
+  serializedVersion: 8
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 15, y: 15, z: 15}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.6166667
+        value: {x: 2, y: 2, z: 2}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Text (Legacy)
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 3763599388
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.6166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 15
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6166667
+        value: 2
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: Text (Legacy)
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 15
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6166667
+        value: 2
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: Text (Legacy)
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 15
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6166667
+        value: 2
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: Text (Legacy)
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Scenes/testCombat/NavMesh-Chapter01 3.asset.meta → Assets/Art/UIAnimation/StartBossPanel.anim.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: WixO5C6tASge1UmmlG0958UZHp6LHtM/8f/56QbwCXxRFkbfUqH+Arw=
+guid: XXIYtiP/ACldAkUx/aEllzdbBaq/Fu8ek27Hwr+xvviprWEqjoronJU=
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 23800000
+  mainObjectFileID: 7400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Art/UIAnimation/StartBossPanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: StartBossPanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 8327298518550566643}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &5602816658526159849
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: StartBossPanel
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: b8739bcb322489e43b6d00af03b5aa82, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &8327298518550566643
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5602816658526159849}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  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: 5602816658526159849}

Assets/Scenes/testCombat/NavMesh-Chapter01 1.asset.meta → Assets/Art/UIAnimation/StartBossPanel.controller.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: WX4Z4H78Angli17sSV0UDsZw0hzMerTzDZsSGJVi6uU0XDWQWxUvePU=
+guid: XH0WsSP5BXti11TSKcm9M8HPblsvCrzcj8tuU8bLRbGhcQQ8HXavsz0=
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 23800000
+  mainObjectFileID: 9100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Layer Lab/GUI Pro-SuperCasual/ResourcesData/Sprites/Components/Frame/ItemFrame01_Single_Red.png.meta

@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 6cd43d4887bea46f5ba2b77d25206fad
+guid: CSlLsSn5V3MT3hK5+uCSpYxKoZ1EfdZQezXw8zW5B0G8G3X5yzge0CU=
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,11 +20,15 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -48,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 30, y: 82, z: 30, w: 40}
+  spriteBorder: {x: 22, y: 86, z: 23, w: 27}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -63,11 +67,13 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,11 +81,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: WebGL
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -87,11 +95,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -99,11 +109,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -111,6 +123,21 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -127,9 +154,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Layer Lab/GUI Pro-SuperCasual/ResourcesData/Sprites/Components/UI_Etc/InputField04.png.meta

@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: b5602d762bb4d4193a0d058f6bbcd26d
+guid: XX8ZtSj5VH0xE3+P1qEuTy2kxv7yt22qaOvlgvOT+V6G6Lv+sgzTF4s=
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,11 +20,15 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -48,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 23, y: 23, z: 23, w: 23}
+  spriteBorder: {x: 18, y: 20, z: 20, w: 18}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -63,11 +67,13 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,11 +81,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: WebGL
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -87,11 +95,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -99,11 +109,13 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -111,6 +123,21 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -127,9 +154,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Res/UI/CombatHPPanel.prefab

@@ -93,7 +93,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 60, y: 9}
+  m_SizeDelta: {x: 60, y: 10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8101501801323372671
 CanvasRenderer:
@@ -123,8 +123,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: b5602d762bb4d4193a0d058f6bbcd26d, type: 3}
+  m_Type: 2
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -132,7 +132,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_PixelsPerUnitMultiplier: 4.9
 --- !u!1 &3198516901098534151
 GameObject:
   m_ObjectHideFlags: 0
@@ -169,7 +169,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -30, y: 0}
-  m_SizeDelta: {x: 60, y: 9}
+  m_SizeDelta: {x: 60, y: 10}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2560041063302510898
 CanvasRenderer:
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: b5602d762bb4d4193a0d058f6bbcd26d, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -208,7 +208,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_PixelsPerUnitMultiplier: 5.14
 --- !u!1 &5166503702879688492
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -108,7 +108,7 @@ Animator:
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: 3c91826ef943c154eae9ee16d745531b, type: 2}
   m_CullingMode: 0
-  m_UpdateMode: 0
+  m_UpdateMode: 2
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -219,6 +219,231 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
+--- !u!1 &292838646372743710
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 690121723901557809}
+  - component: {fileID: 3062904392940559701}
+  - component: {fileID: 6143139382776230165}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bossName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &690121723901557809
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 292838646372743710}
+  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: 4207053513884661540}
+  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: -138.8}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3062904392940559701
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 292838646372743710}
+  m_CullTransparentMesh: 1
+--- !u!114 &6143139382776230165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 292838646372743710}
+  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.8679245, g: 0.67857033, b: 0.38074043, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u81F4\u547D\u6BD2\u86C7"
+--- !u!1 &299903550837345205
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 172306735297197653}
+  - component: {fileID: 6550732654377192495}
+  - component: {fileID: 8157086283513000940}
+  - component: {fileID: 2769935772698356797}
+  - component: {fileID: 4134183460199500448}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_Hp_Boss
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &172306735297197653
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 299903550837345205}
+  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: 2250993577439367798}
+  - {fileID: 4467886094601239176}
+  - {fileID: 5326636482702459410}
+  m_Father: {fileID: 4207053513884661540}
+  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: -130.49995}
+  m_SizeDelta: {x: 600, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6550732654377192495
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 299903550837345205}
+  m_CullTransparentMesh: 1
+--- !u!114 &8157086283513000940
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 299903550837345205}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.15686275, g: 0.15686275, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8eb45b886387640cfac290c17bd769cd, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2769935772698356797
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 299903550837345205}
+  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: 0
+  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: 0
+  m_TargetGraphic: {fileID: 8157086283513000940}
+  m_FillRect: {fileID: 2946191979770722486}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 0.442
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4134183460199500448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 299903550837345205}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &501653731502256918
 GameObject:
   m_ObjectHideFlags: 0
@@ -295,6 +520,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &709490475292508899
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4467886094601239176}
+  - component: {fileID: 6946297553114181735}
+  - component: {fileID: 8884207522203186992}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4467886094601239176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709490475292508899}
+  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: 172306735297197653}
+  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: 0}
+  m_SizeDelta: {x: 468.8, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6946297553114181735
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709490475292508899}
+  m_CullTransparentMesh: 1
+--- !u!114 &8884207522203186992
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709490475292508899}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 1, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0D\u53EF\u601D\u8BAE\u7684\u5927\u86C7"
 --- !u!1 &711202643630758425
 GameObject:
   m_ObjectHideFlags: 0
@@ -328,6 +633,7 @@ RectTransform:
   m_Children:
   - {fileID: 3456306615374035144}
   - {fileID: 3769348636957715381}
+  - {fileID: 4207053513884661540}
   m_Father: {fileID: 2306360978136577391}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -1222,6 +1528,79 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2439310446158271825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3468098832702461023}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: expPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3468098832702461023
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2439310446158271825}
+  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: 2946191979770722486}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -12, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2730092245929220139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2250993577439367798}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FillArea
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2250993577439367798
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2730092245929220139}
+  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: 2946191979770722486}
+  m_Father: {fileID: 172306735297197653}
+  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: 8.320007, y: 0}
+  m_SizeDelta: {x: 616.65, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2764896937034663281
 GameObject:
   m_ObjectHideFlags: 0
@@ -1966,6 +2345,82 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &3483752019383459044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2164720003180004667}
+  - component: {fileID: 6711690020208574591}
+  - component: {fileID: 2511412495675166438}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2164720003180004667
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3483752019383459044}
+  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: 2946191979770722486}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -2.1200256, y: 0.049987793}
+  m_SizeDelta: {x: -4.2401, y: -8.31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6711690020208574591
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3483752019383459044}
+  m_CullTransparentMesh: 1
+--- !u!114 &2511412495675166438
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3483752019383459044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.47058824}
+  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: 21300000, guid: ca59c73723e594741bfdb2f8be04a5d7, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3546345666168643637
 GameObject:
   m_ObjectHideFlags: 0
@@ -2394,6 +2849,90 @@ RectTransform:
   m_AnchoredPosition: {x: -12, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4286239112590953480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8426596969858224986}
+  - component: {fileID: 2947818160454252326}
+  - component: {fileID: 7834777001322306280}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8426596969858224986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4286239112590953480}
+  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: 4207053513884661540}
+  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: -138.6}
+  m_SizeDelta: {x: 247.8, y: 31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2947818160454252326
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4286239112590953480}
+  m_CullTransparentMesh: 1
+--- !u!114 &7834777001322306280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4286239112590953480}
+  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: 0.5529412}
+  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: 1
+  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_Round12
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: dd1ae99907455de02f982f8917839d4c
 --- !u!1 &4307235955464270579
 GameObject:
   m_ObjectHideFlags: 0
@@ -2875,6 +3414,84 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4776579272028201064
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2946191979770722486}
+  - component: {fileID: 8511772474124218940}
+  - component: {fileID: 8506472763397081751}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2946191979770722486
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4776579272028201064}
+  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: 2164720003180004667}
+  - {fileID: 3468098832702461023}
+  m_Father: {fileID: 2250993577439367798}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0.442, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8511772474124218940
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4776579272028201064}
+  m_CullTransparentMesh: 1
+--- !u!114 &8506472763397081751
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4776579272028201064}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.990566, g: 0.047975745, 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: 21300000, guid: 32c8c5cf5857d43989c30a394e737428, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4804264927101951070
 GameObject:
   m_ObjectHideFlags: 0
@@ -3705,7 +4322,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1125, y: 2436}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1056032702526251692
 MonoBehaviour:
@@ -3783,7 +4400,91 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Slider_Exp_Process
+    gameObject: {fileID: 2784682568499014237}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: bossHp
+    gameObject: {fileID: 6750499123037776255}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Slider_Hp_Boss
+    gameObject: {fileID: 2769935772698356797}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: bossName
+    gameObject: {fileID: 6143139382776230165}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: bossHpText
+    gameObject: {fileID: 1928288362979320852}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
+--- !u!1 &6750499123037776255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4207053513884661540}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bossHp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4207053513884661540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6750499123037776255}
+  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: 172306735297197653}
+  - {fileID: 8426596969858224986}
+  - {fileID: 690121723901557809}
+  m_Father: {fileID: 3100148146476530636}
+  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: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6780802483241756600
 GameObject:
   m_ObjectHideFlags: 0
@@ -4394,6 +5095,141 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &7986928048791964427
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5326636482702459410}
+  - component: {fileID: 1385873915202112644}
+  - component: {fileID: 1928288362979320852}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bossHpText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5326636482702459410
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986928048791964427}
+  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: 172306735297197653}
+  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: 0}
+  m_SizeDelta: {x: 600, y: 71}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1385873915202112644
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986928048791964427}
+  m_CullTransparentMesh: 1
+--- !u!114 &1928288362979320852
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7986928048791964427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 10/50
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 18
+  m_fontSizeMax: 36
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: -3
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &8160896584844719095
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/StartBossPanel.prefab

@@ -0,0 +1,157 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1982712059821832727
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8572648582706539958}
+  - component: {fileID: 8022557792156321457}
+  - component: {fileID: 5195237129462952716}
+  - component: {fileID: 600412903902951279}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8572648582706539958
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1982712059821832727}
+  m_LocalRotation: {x: -0, y: -0, z: 0.3020252, w: 0.95329994}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3498362433174556111}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 35.159}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 22, y: 247}
+  m_SizeDelta: {x: 612, y: 60.31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8022557792156321457
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1982712059821832727}
+  m_CullTransparentMesh: 1
+--- !u!114 &5195237129462952716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1982712059821832727}
+  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.9811321, g: 0.36561054, b: 0.36561054, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 42
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "Boss\u6765\u88AD"
+--- !u!114 &600412903902951279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1982712059821832727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 1, g: 0.5349453, b: 0, a: 0.5}
+  m_EffectDistance: {x: 2.03, y: -3.59}
+  m_UseGraphicAlpha: 1
+--- !u!1 &5248254883604704175
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3498362433174556111}
+  - component: {fileID: 7539559931875000743}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StartBossPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3498362433174556111
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5248254883604704175}
+  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: 8572648582706539958}
+  m_Father: {fileID: 0}
+  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: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!95 &7539559931875000743
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5248254883604704175}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: c7949df010d5a7845a822f98407d7f09, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0

Assets/Res/UI/StartBossPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WnJO4HuuAS803scIC4Icmc3TuL0N0y/N9guZj1ncEua56+PAJzbCYQM=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -124,6 +124,11 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!224 &20562867 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+  m_PrefabInstance: {fileID: 3341871095928010210}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &235899919
 GameObject:
   m_ObjectHideFlags: 0
@@ -294,6 +299,115 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &785438226
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Name
+      value: Canvas
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 20562867}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+--- !u!224 &785438227 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+  m_PrefabInstance: {fileID: 785438226}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &852523981
 GameObject:
   m_ObjectHideFlags: 0
@@ -702,6 +816,103 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &3341871095928010210
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 785438227}
+    m_Modifications:
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3498362433174556111, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5248254883604704175, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
+      propertyPath: m_Name
+      value: StartBossPanel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e8aea3bdf3db3384c8ba47cec6e71c51, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -711,3 +922,4 @@ SceneRoots:
   - {fileID: 376281607}
   - {fileID: 855042511}
   - {fileID: 235899921}
+  - {fileID: 785438226}

Assets/Scenes/testCombat/NavMesh-Chapter01 4.asset.meta → Assets/Scenes/testCombat/LightingData.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: Wy5JvXmvVi4vLzONLTq2cYItmMXEoHe+Or+KSHIV0/5DKWXCHrdp98s=
+guid: Dn8fvXiuAX98b87uvgb+nwauspTMbyqr/JRHSm1XZz02evY1aBT4xJw=
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 23800000
+  mainObjectFileID: 112000000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/testCombat/NavMesh-Chapter01 5.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: DCxL4SuoUXg2CgI7o+uKC8x48rDd31yNNRS13npn55PO9JBaU4/x3CY=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/testCombat/NavMesh-Chapter01 6.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: XXxK4S+vWn40wIFAmZF849hJKsh/jp0jbqRx4PrnsYW2ml4Ewe6ZY8U=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/testCombat/NavMesh-Chapter01 7.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: DSkZtiOsBnLewze33h+wMMSpKrNqX1LokPQgfcdgqAnvsUlK3e7WWy4=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/testCombat/NavMesh-Chapter01.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: W3Mb5yyqAC/2CG5pZ8fMES/l/iT0QNgSRD5OfFvu1bOEdlnv5JDFARQ=
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/testCombat/New Lighting Settings.lighting

@@ -0,0 +1,66 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Lighting Settings
+  serializedVersion: 6
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 0
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 2
+  m_LightmapMaxSize: 512
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 1
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+  m_RespectSceneVisibilityWhenBakingGI: 0

Assets/Scenes/testCombat/NavMesh-Chapter01 2.asset.meta → Assets/Scenes/testCombat/New Lighting Settings.lighting.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: D3gctyKpAXJSaosQEIY94m1Pfc8sNqTSqM+5ER/3DnAKibSYYF2ZVnk=
+guid: Cn4dvCqsU30rh456ivEZaacM2jRIz9gIdDmB/6gKfEAvoT1yN6wvRlw=
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 23800000
+  mainObjectFileID: 4890085278179872738
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/testCombat/ReflectionProbe-0.exr.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: CXwW437+UH36Qifr6GUgQHRqdvYVDj9JVmwYgavw9px4iGfl08FyRWA=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 1
+  seamlessCubemap: 1
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 2
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -35,5 +35,14 @@ namespace Fort23.Core
       /// 点击到英雄的UI部件
       /// </summary>
       HeroClick,
+      /// <summary>
+      /// 显示boss血条
+      /// </summary>
+      ShowBossHp,
+      /// <summary>
+      /// 显示战斗经验UI
+      /// </summary>
+      ShowBattleExp,
+      StartBossBattle,
     }
 }

Assets/Scripts/Core/Event/Event/EventManager.cs

@@ -2,7 +2,6 @@
 
 using System;
 using System.Collections.Generic;
-
 using Utility;
 
 namespace Fort23.Core
@@ -36,7 +35,7 @@ namespace Fort23.Core
             else
             {
                 _eventHandlers[type] -= handle;
-                
+
                 _eventHandlers[type] += handle;
             }
         }
@@ -67,10 +66,11 @@ namespace Fort23.Core
         }
 
         // ReSharper restore Unity.ExpensiveCode
+
         /// <summary>
         /// 事件触发执行的方法，Public方便外界调用，谁执行，谁给执行细节
         /// </summary>
-        public void Dispatch(CustomEventType type, IEventData eventData,bool isRecycle=true)
+        public void Dispatch(CustomEventType type, IEventData eventData, bool isRecycle = true)
         {
             if (_eventHandlers.ContainsKey(type))
             {
@@ -80,7 +80,7 @@ namespace Fort23.Core
                 }
             }
 
-            if (isRecycle)
+            if (isRecycle && eventData != null)
             {
                 eventData?.Recycle();
             }

Assets/Scripts/Core/Timer/TimerComponent.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Fort23.Core;
+
 
 namespace Fort23.Core
 {
@@ -20,7 +20,7 @@ namespace Fort23.Core
         /// 计时时间，毫秒
         /// </summary>
         public long time;
-
+       
         /// <summary>
         /// 完成回调
         /// </summary>
@@ -83,6 +83,8 @@ namespace Fort23.Core
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
+            
+           
             if (this._timeID.Count == 0)
             {
                 return;
@@ -131,28 +133,7 @@ namespace Fort23.Core
                 this._timeID.Remove(time);
             }
 
-            // while (this._timeOutTime.Count > 0)
-            // {
-            //     long time = this._timeOutTime.Dequeue();
-            //     foreach (long timerId in this._timeID[time])
-            //     {
-            //         this._timeOutTimerIds.Enqueue(timerId);
-            //     }
-            //
-            //     this._timeID.Remove(time);
-            // }
-            //
-            // while (this._timeOutTimerIds.Count > 0)
-            // {
-            //     long timerId = this._timeOutTimerIds.Dequeue();
-            //     TimerEntity timerEntity = this.GetChild<TimerEntity>(timerId);
-            //     if (timerEntity == null)
-            //     {
-            //         continue;
-            //     }
-            //
-            //     Run(timerEntity, timerId);
-            // }
+        
         }
 
         private void Run(TimerEntity timerEntity, long timestamp)

Assets/Scripts/GameLogic/Combat/CombatEvent/ShowBossHpEventData.cs

@@ -0,0 +1,15 @@
+using Core.Utility.Event;
+using Fort23.UTool;
+
+namespace Common.Utility.CombatEvent
+{
+    public class ShowBossHpEventData : EventDataBasic<ShowBossHpEventData>
+    {
+        public CombatHeroEntity boss;
+
+        protected override void ProDispose()
+        {
+            boss = null;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/ShowBossHpEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 637969e6f7b14887a3579c8e354dabbb
+timeCreated: 1732784897

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCameraControllder.cs

@@ -2,6 +2,7 @@
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using UnityEngine;
+using Utility;
 using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -16,7 +17,7 @@ namespace GameLogic.Combat.CombatTool
 
         private bool isStartShake;
 
-        private int _followHeroId=-1;
+        private int _followHeroId = -1;
 
         public void Init(CombatController combatController, Camera camera)
         {
@@ -92,13 +93,18 @@ namespace GameLogic.Combat.CombatTool
             EventManager.Instance.RemoveEventListener(CustomEventType.HeroClick, HeroClick);
         }
 
-        public void Shaking(CameraShakingSerializtion cameraShakingSerializtion)
+        public void Shaking(float qiangDu)
         {
             if (StressReceiver != null)
             {
                 isStartShake = true;
-                StressReceiver.InduceStress(cameraShakingSerializtion.qiangDu, ShakeFinish);
+                StressReceiver.InduceStress(qiangDu, ShakeFinish);
             }
         }
+
+        public void Shaking(CameraShakingSerializtion cameraShakingSerializtion)
+        {
+            Shaking(cameraShakingSerializtion.qiangDu);
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using Common.Utility.CombatTimer;
 using Core.Audio;
 using Core.State;
 using Fort23.Core;
@@ -24,7 +25,12 @@ namespace GameLogic.Combat.CombatTool
         public GameObject gameObject;
         public GameTimeLineParticleFactory GameTimeLineParticleFactory;
         public bool isUpdate;
-        
+        /// <summary>
+        /// 涨停游戏英雄AI行为
+        /// </summary>
+        public bool isStopAi;
+
+        public float speed=1;
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }
@@ -81,8 +87,11 @@ namespace GameLogic.Combat.CombatTool
                 return;
             }
 
+            t *= speed;
+
             stateControl.Update(t);
             CombatTypeBasic?.Update(t);
+            CombatTimerManager.Instance.ComabtUpdate(t);
         }
 
         public void PlayAudio(string audioName, bool isLoop)

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Common.Utility.CombatTimer;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.CombatScenesTool;
@@ -86,7 +88,6 @@ namespace GameLogic.Combat.CombatType
                 }
                 else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
                 {
-                   
                     BossKo();
                 }
             }
@@ -137,10 +138,10 @@ namespace GameLogic.Combat.CombatType
 
 
             List<string> allEquip = new List<string>();
-            for (int i = 0; i < 10; i++)
+            for (int i = 0; i < 3; i++)
             {
                 int odds = CombatCalculateTool.Instance.GetOdd();
-                if (odds < 30)
+                if (odds < 20)
                 {
                     allEquip.Add(equipName[CombatCalculateTool.Instance.GetOdd(0, equipName.Count)]);
                 }
@@ -225,14 +226,26 @@ namespace GameLogic.Combat.CombatType
             {
                 _levelBattleConfig = levelBattleConfig;
             }
+
             exp = 0;
             _currLevelBattleNodeIndex = 0;
             InitNewMonsterConfig();
+            EventManager.Instance.Dispatch(CustomEventType.ShowBattleExp, null);
+            // CombatController.currActiveCombat.speed = 0.3f;
+            Time.timeScale = 0.3f;
+            CombatController.currActiveCombat.isStopAi = true;
+            TimerComponent.Instance.AddTimer(2000, delegate
+            {
+                CombatController.currActiveCombat.isStopAi = false;
+                Time.timeScale = 1f;
+                // CombatController.currActiveCombat.speed = 1;
+            });
         }
 
         protected void StartBossCombat()
         {
             isBossCombat = true;
+            CombatController.currActiveCombat.isStopAi = true;
             HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
             harmReturnInfo.harmType = HarmType.SystemKo;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
@@ -242,7 +255,7 @@ namespace GameLogic.Combat.CombatType
             {
                 heroEntities[i].HeroDie(harmReturnInfo);
             }
-
+            
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             FindNextConfig();
             _currWavesConfig =
@@ -250,8 +263,25 @@ namespace GameLogic.Combat.CombatType
                     _levelBattleConfig.BossMonsterWavesId);
             _currNodeWavesIndex = -1;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            CreateEnemy(cTaskAwaitBuffer, _levelBattleConfig.bossMonsterId, _levelBattleConfig.bossLv, 0);
+            CreateEnemy(cTaskAwaitBuffer, _levelBattleConfig.bossMonsterId, _levelBattleConfig.bossLv, 0,
+                delegate(CombatHeroEntity entity)
+                {
+                    ShowBossHpEventData showBossHpEventData = ShowBossHpEventData.Create();
+                    showBossHpEventData.boss = entity;
+                    EventManager.Instance.Dispatch(CustomEventType.ShowBossHp, showBossHpEventData);
+                    EventManager.Instance.Dispatch(CustomEventType.StartBossBattle, null);
+                });
             CreateEnemy(cTaskAwaitBuffer);
+            CombatTimerManager.Instance.AddTimer(2, delegate
+            {
+                StartBossBattle();
+            });
+           
+        }
+
+        public void StartBossBattle()
+        {
+            CombatController.currActiveCombat.isStopAi = false;
         }
 
 
@@ -293,7 +323,8 @@ namespace GameLogic.Combat.CombatType
             }
         }
 
-        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int index)
+        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int index,
+            System.Action<CombatHeroEntity> callBack = null)
         {
             CombatHeroEntity heroEntity = new CombatHeroEntity();
             heroEntity.IsEnemy = true;
@@ -307,6 +338,7 @@ namespace GameLogic.Combat.CombatType
                     Vector3 pos = nextConfig.monsterPoint[index].position + new Vector3(
                         CombatCalculateTool.Instance.GetOdd(-4, 4), 0, CombatCalculateTool.Instance.GetOdd(-4, 4));
                     heroEntity.combatHeroGameObject.SetPosition(pos);
+                    callBack?.Invoke(entity);
                 }));
         }
 
@@ -347,7 +379,7 @@ namespace GameLogic.Combat.CombatType
                 CombatHeroEntity heroEntity = new CombatHeroEntity();
                 heroEntity.IsEnemy = false;
                 heroEntity.number = i;
-             
+
                 cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), PlayerManager.Instance.heroListInLead[i],
                     delegate(CombatHeroEntity entity)
                     {
@@ -357,28 +389,28 @@ namespace GameLogic.Combat.CombatType
             }
         }
 
-        private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
-        {
-            testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
-            if (testCombatHeroConfig != null)
-            {
-                for (int i = 0; i < testCombatHeroConfig.myHeroInfo.Length; i++)
-                {
-                    int index = i;
-                    TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[i];
-                    CombatHeroEntity heroEntity = new CombatHeroEntity();
-                    heroEntity.IsEnemy = false;
-                    heroEntity.number = i;
-                    CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-                    testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
-                    cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo,
-                        delegate(CombatHeroEntity entity)
-                        {
-                            combatController.CombatHeroController.AddHero(entity);
-                            heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
-                        }));
-                }
-            }
-        }
+        // private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
+        // {
+        //     testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
+        //     if (testCombatHeroConfig != null)
+        //     {
+        //         for (int i = 0; i < testCombatHeroConfig.myHeroInfo.Length; i++)
+        //         {
+        //             int index = i;
+        //             TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[i];
+        //             CombatHeroEntity heroEntity = new CombatHeroEntity();
+        //             heroEntity.IsEnemy = false;
+        //             heroEntity.number = i;
+        //             CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
+        //             testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
+        //             cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo,
+        //                 delegate(CombatHeroEntity entity)
+        //                 {
+        //                     combatController.CombatHeroController.AddHero(entity);
+        //                     heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
+        //                 }));
+        //         }
+        //     }
+        // }
     }
 }

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -38,7 +38,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
 
     private float _injuriedShowTime;
     private bool _isAddinjuriedShow;
-    private float _addInjuiedValue = (1.0f / 0.2f) *1f;
+    private float _addInjuiedValue = (1.0f / 0.2f) * 1f;
 
     public Vector3 dotPos
     {
@@ -144,7 +144,10 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
 
     public void Update(float t)
     {
-        CombatAIBasic.Update(t);
+        if (!CombatController.currActiveCombat.isStopAi)
+        {
+            CombatAIBasic.Update(t);
+        }
         CombatHeroSkillControl.Update(t);
         combatHeroTimeLineControl.Update(t);
         combatHeroAnimtion.Update(t);

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Core.Language;
 using Core.Utility;
 using Excel2Json;
 using Fort23.UTool;
@@ -47,6 +48,7 @@ public class CombatHeroInfo
     public float maxDisTo=2*2;
     public int[] skillId;
     public bool isGpu;
+    public string heroName;
 
     public CombatHeroInfo()
     {
@@ -112,6 +114,7 @@ public class CombatHeroInfo
         promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
         this.level = (EncryptionInt)level;
         this.star = (EncryptionInt)star;
+        heroName = LanguageManager.Instance.Text(modelConfig.name);
     }
     
     public void InitMonster(int modelID,int level, int star = 1)

Assets/Scripts/GameUI/GameApplction.cs

@@ -6,6 +6,9 @@ using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.CTween;
@@ -66,6 +69,14 @@ public class GameApplction : MonoBehaviour
 
     public void Update()
     {
+#if UNITY_EDITOR
+        if (EditorApplication.isPaused)
+        {
+            return;
+        }
+#endif
+        
+
         EventSystem.Instance.Update();
         AssetBundleLoadManager.Instance.UpdateBundle();
         TimeHelper.clientFrame = TimeHelper.ClientFrame() + (long)(Time.deltaTime * 1000);

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

@@ -1,3 +1,4 @@
+using Common.Utility.CombatTimer;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
@@ -40,7 +41,10 @@ namespace Fort23.Mono
             }
 
             text.text = harmReturnInfo.att.ToString();
-            TimerComponent.Instance.AddTimer(500, delegate { GObjectPool.Instance.Recycle(this); });
+            CombatTimerManager.Instance.AddTimer(1, delegate
+            {
+                GObjectPool.Instance.Recycle(this);
+            });
         }
     }
 }

Assets/Scripts/GameUI/UI/Combat/StartBossPanel.cs

@@ -0,0 +1,37 @@
+using Common.Utility.CombatTimer;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "StartBossPanel")]
+    public partial class StartBossPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public async override CTask Open()
+        {
+            CombatTimerManager.Instance.AddTimer(0.7f, delegate
+            {
+                CombatController.currActiveCombat.CombatCameraControllder.Shaking(0.5f);
+            });
+            
+            CombatTimerManager.Instance.AddTimer(1.5f, delegate() { UIManager.Instance.HideUIUIPanel(this); });
+            await base.Open();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/Combat/StartBossPanel.cs.meta

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

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -12,9 +12,10 @@ namespace Fort23.Mono
     [UIBinding(prefab = "MainUIPanel")]
     public partial class MainUIPanel : UIPanel
     {
+        private CombatHeroEntity bossHeroEntity;
+
         private void Init()
         {
-            
             InitBattleHero();
         }
 
@@ -22,18 +23,65 @@ namespace Fort23.Mono
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
             EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroUpgrade);
+            EventManager.Instance.AddEventListener(CustomEventType.ShowBossHp, ShowBossHp);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
+            EventManager.Instance.AddEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
+            EventManager.Instance.AddEventListener(CustomEventType.StartBossBattle, StartBossBattle);
+        }
+
+        private void StartBossBattle(IEventData iEventData)
+        {
+            UIManager.Instance.LoadAndOpenPanel<StartBossPanel>(null, UILayer.Top);
+        }
+
+        private void ShowBattleExp(IEventData iEventData)
+        {
+            bossHp.SetActive(false);
+            Slider_Exp_Process.SetActive(true);
+            bossHeroEntity = null;
+        }
+
+        private void HeroHpUpdateEventData(IEventData iEventData)
+        {
+            HeroHpUpdateEventData heroHpUpdateEventData = iEventData as HeroHpUpdateEventData;
+            if (heroHpUpdateEventData.combatHeroEntity == bossHeroEntity)
+            {
+                UpdateBossHp();
+            }
         }
 
         protected override void DelEvent()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
             EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroUpgrade);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBossHp, ShowBossHp);
+
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
         }
 
         public override void AddButtonEvent()
         {
         }
 
+        private void ShowBossHp(IEventData eventData)
+        {
+            ShowBossHpEventData showBossHpEventData = eventData as ShowBossHpEventData;
+            bossHeroEntity = showBossHpEventData.boss;
+            bossHp.SetActive(true);
+            Slider_Exp_Process.SetActive(false);
+            bossName.text = bossHeroEntity.CurrCombatHeroInfo.heroName;
+            UpdateBossHp();
+        }
+
+        protected void UpdateBossHp()
+        {
+            Slider_Hp_Boss.value = bossHeroEntity.CurrCombatHeroInfo.hp.Value * 1.0f /
+                                   bossHeroEntity.MaxCombatHeroInfo.hp.Value;
+            bossHpText.text = bossHeroEntity.CurrCombatHeroInfo.hp.Value + "/" +
+                               bossHeroEntity.MaxCombatHeroInfo.hp.Value;
+        }
+
         private void CombatExpAlter(IEventData eventData)
         {
             ExpAlter();
@@ -53,7 +101,7 @@ namespace Fort23.Mono
             TextExp.text = levelBattleCombatType.exp + "/" + levelBattleCombatType.CurrMaxExp;
         }
 
-        private void OnHeroUpgrade(IEventData eventData) 
+        private void OnHeroUpgrade(IEventData eventData)
         {
             HeroPowerUpEventData data = eventData as HeroPowerUpEventData;
             HeroInfo heroInfo = (HeroInfo)PlayerManager.Instance.GetHeroInfo(data.heroModelID);
@@ -68,9 +116,9 @@ namespace Fort23.Mono
             }
         }
 
-        
-        private List<WidgetHero> widgetHeroes = new List<WidgetHero>(); 
-            
+
+        private List<WidgetHero> widgetHeroes = new List<WidgetHero>();
+
         private async void InitBattleHero()
         {
             widgetHeroes.Clear();
@@ -80,7 +128,7 @@ namespace Fort23.Mono
                 WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                     poolName: "WidgetHero", root: rectTransform);
                 itemHero.InitHero(PlayerManager.Instance.heroListInLead[i]);
-                
+
                 widgetHeroes.Add(itemHero);
             }
         }

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -66,7 +66,6 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _TextExp;
-	  
 	  public TextMeshProUGUI TextExp
 	   {
 	   get{
@@ -88,6 +87,61 @@ namespace Fort23.Mono
 	      return _coinText;
 	     }
 	   }
+	  private GameObject _Slider_Exp_Process;
+	  public GameObject Slider_Exp_Process
+	   {
+	   get{
+	      if (_Slider_Exp_Process == null)
+	       {
+	         _Slider_Exp_Process  = GetUIUnit<GameObject>("Slider_Exp_Process"); 
+	       }
+	      return _Slider_Exp_Process;
+	     }
+	   }
+	  private GameObject _bossHp;
+	  public GameObject bossHp
+	   {
+	   get{
+	      if (_bossHp == null)
+	       {
+	         _bossHp  = GetUIUnit<GameObject>("bossHp"); 
+	       }
+	      return _bossHp;
+	     }
+	   }
+	  private Slider _Slider_Hp_Boss;
+	  public Slider Slider_Hp_Boss
+	   {
+	   get{
+	      if (_Slider_Hp_Boss == null)
+	       {
+	         _Slider_Hp_Boss  = GetUIUnit<Slider>("Slider_Hp_Boss"); 
+	       }
+	      return _Slider_Hp_Boss;
+	     }
+	   }
+	  private Text _bossName;
+	  public Text bossName
+	   {
+	   get{
+	      if (_bossName == null)
+	       {
+	         _bossName  = GetUIUnit<Text>("bossName"); 
+	       }
+	      return _bossName;
+	     }
+	   }
+	  private TextMeshProUGUI _bossHpText;
+	  public TextMeshProUGUI bossHpText
+	   {
+	   get{
+	      if (_bossHpText == null)
+	       {
+	         _bossHpText  = GetUIUnit<TextMeshProUGUI>("bossHpText"); 
+	       }
+	      return _bossHpText;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Settings/rpAsset_Renderer.asset

@@ -19,6 +19,7 @@ MonoBehaviour:
   m_RendererFeatureMap: 
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

UserSettings/EditorUserSettings.asset

@@ -54,7 +54,7 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae445d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd8e908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae415d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf