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

Assets/Art/Environment/cj03.prefab

@@ -152,7 +152,7 @@ Transform:
   serializedVersion: 2
   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_LocalScale: {x: 1.7513, y: 1.7513, z: 1.7513}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2446320557680373064}

Assets/Art/Environment/fukong dao2.prefab

@@ -8,6 +8,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
       propertyPath: m_LocalPosition.x
       value: 3.6000004

Assets/Art/Environment/fukong dao3.prefab

@@ -10,15 +10,15 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.9810997
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.9810997
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1.9811
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Art/Environment/fukong dao4.prefab

@@ -8,6 +8,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
       propertyPath: m_LocalPosition.x
       value: -18.58

Assets/Res/CombatScenes/CombatRoot.prefab

@@ -34,6 +34,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7320235550895006129}
   - {fileID: 4445399462343019278}
   m_Father: {fileID: 5999369449934832163}
   m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0}
@@ -46,7 +47,7 @@ Camera:
   m_GameObject: {fileID: 65994213146227239}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_ClearFlags: 4
   m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
@@ -238,6 +239,161 @@ Transform:
   - {fileID: 6818137407374040233}
   m_Father: {fileID: 5344611500333309412}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8735217549368148119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7320235550895006129}
+  - component: {fileID: 3969240094559576283}
+  - component: {fileID: 6389208801088549056}
+  - component: {fileID: 231374772603165284}
+  - component: {fileID: 8228194044419918282}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7320235550895006129
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  serializedVersion: 2
+  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: 6818137407374040233}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &3969240094559576283
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -2
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 128
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_enableGDRP: 1
+  m_backfaceCulling: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!81 &6389208801088549056
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+--- !u!114 &231374772603165284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 0
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+--- !u!114 &8228194044419918282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 926bf6ad5fa4e0b4a96dded275d10878, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetCamera: {fileID: 5136129069556543016}
+  myCamera: {fileID: 3969240094559576283}
 --- !u!1 &9046924969066059369
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &2586944165049089298
+--- !u!1 &2632760491527924325
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5603251483434550935}
-  - component: {fileID: 7483920492279363149}
+  - component: {fileID: 5927203370302625784}
+  - component: {fileID: 2956897150922469964}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: LevelBattle01
@@ -18,263 +18,148 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5603251483434550935
+--- !u!4 &5927203370302625784
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2586944165049089298}
+  m_GameObject: {fileID: 2632760491527924325}
   serializedVersion: 2
   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: 3874186678662227420}
+  - {fileID: 8368877462968469787}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7483920492279363149
+--- !u!114 &2956897150922469964
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2586944165049089298}
+  m_GameObject: {fileID: 2632760491527924325}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9970cf7521114b5ebfee32908aec5603, type: 3}
+  m_Script: {fileID: 11500000, guid: 43f1d0747d2d4b1ab0a3a298f9db7f35, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  allObject: []
-  radius: 0
-  dec: "\u7B2C\u4E00\u5173\u7684\u6D4B\u8BD5\u573A\u666F"
-  roadside:
-    dis: 0.1
-    minCount: 10
-    maxCount: 15
-    SceneObjectConfigs:
-    - odds: 60
-      minY: -10
-      maxY: -3
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  roadside_1:
-    dis: 0.1
-    minCount: 15
-    maxCount: 20
-    SceneObjectConfigs:
-    - odds: 60
-      minY: 0
-      maxY: 2
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  button:
-    dis: 0.1
-    minCount: 4
-    maxCount: 8
-    SceneObjectConfigs:
-    - odds: 60
-      minY: -13
-      maxY: -10
-      prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
-  skyObejct: {fileID: 8635193522516608795}
+  skyObejct: {fileID: 4787834087060179975}
   shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
---- !u!1001 &881047069771566859
+  fogColor: {r: 0.26950002, g: 0.3349501, b: 0.55, a: 1}
+  fogStartDistance: 10
+  fogEndDistance: 50
+  allObject:
+  - {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  - {fileID: 3905164629616407330, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  - {fileID: 3703108956536512397, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  radius: 30
+--- !u!1001 &1744782095462081170
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 5603251483434550935}
+    m_TransformParent: {fileID: 5927203370302625784}
     m_Modifications:
-    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1000
-      objectReference: {fileID: 0}
-    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+    - target: {fileID: 1471893119496921437, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
       objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.17513
       objectReference: {fileID: 0}
-    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.17513
       objectReference: {fileID: 0}
-    - target: {fileID: 4762318038508566971, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: worldSize.x
-      value: 1000
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.17513
       objectReference: {fileID: 0}
-    - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_Mesh
-      value: 
-      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
-    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.x
-      value: 400.00003
+      value: 1.4596
       objectReference: {fileID: 0}
-    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.y
-      value: 400.00003
+      value: 0.7298
       objectReference: {fileID: 0}
-    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.z
-      value: 400.00003
-      objectReference: {fileID: 0}
-    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+      value: 1.4596
       objectReference: {fileID: 0}
-    - target: {fileID: 5646907003157828046, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -50.33
       objectReference: {fileID: 0}
-    - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+    - target: {fileID: 4154994230707482304, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
       objectReference: {fileID: 0}
-    - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
+    - target: {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
       objectReference: {fileID: 0}
-    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_Name
-      value: cj01 (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 3109410496266473067}
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
---- !u!4 &3874186678662227420 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-  m_PrefabInstance: {fileID: 881047069771566859}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &8635193522516608795 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-  m_PrefabInstance: {fileID: 881047069771566859}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &3219054633467570560
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 3874186678662227420}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.99754554
+      value: cj02 (1)
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -7.6
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.0009873678
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.0009873678
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.7071061
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.7071061
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -180.16
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: c9fb8078a489c764e9c5286bb9821001, type: 2}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Name
-      value: yuanjing_huan (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
---- !u!4 &3109410496266473067 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+--- !u!1 &4787834087060179975 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+  m_PrefabInstance: {fileID: 1744782095462081170}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8368877462968469787 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-  m_PrefabInstance: {fileID: 3219054633467570560}
+  m_CorrespondingSourceObject: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+  m_PrefabInstance: {fileID: 1744782095462081170}
   m_PrefabAsset: {fileID: 0}

Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -46,6 +46,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9970cf7521114b5ebfee32908aec5603, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  skyObejct: {fileID: 1381729068282112590}
+  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
+  fogColor: {r: 0.1794, g: 0.43469998, b: 0.69, a: 1}
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
   - {fileID: 2484470836380151271, guid: 9360da4f31d5e9944b9df8e981c56425, type: 3}
@@ -58,23 +63,6 @@ MonoBehaviour:
   - {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
   radius: 45
   dec: 
-  roadside:
-    dis: 0.1
-    minCount: 0
-    maxCount: 0
-    SceneObjectConfigs: []
-  roadside_1:
-    dis: 0.1
-    minCount: 0
-    maxCount: 0
-    SceneObjectConfigs: []
-  button:
-    dis: 0.1
-    minCount: 0
-    maxCount: 0
-    SceneObjectConfigs: []
-  skyObejct: {fileID: 1381729068282112590}
-  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
 --- !u!1001 &3986193909677313104
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/Config/EventConditionConfig.json

@@ -131,7 +131,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1015
+        1003
       ],
       "finishCount": 3,
       "RelatedEvents": [
@@ -577,9 +577,6 @@
         1003
       ],
       "finishCount": 1,
-      "RelatedEvents": [
-        30003
-      ],
       "SkiptoIds": [
         1,
         2,

Assets/Res/Config/EventLinkConfig.json

@@ -2369,10 +2369,14 @@
       "ConditionId": [
         36
       ],
-      "optionType": 0,
-      "ResultType": 3,
+      "optionType": 2,
+      "optionPara1": [
+        1003
+      ],
+      "ResultType": 2,
       "ResultOptions": [
-        10011
+        1001007,
+        101
       ]
     },
     {
@@ -2740,8 +2744,8 @@
       "EventID": 10013,
       "optionType": 1,
       "optionPara1": [
-        1001206,
-        1001206
+        1001306,
+        1001306
       ],
       "optionPara2": [
         5190,

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -2487,6 +2487,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: MenuBgRoot
+    gameObject: {fileID: 249986433923533433}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5245840134221701572
 GameObject:
@@ -3033,6 +3038,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 249986433923533433}
   - {fileID: 7366721648260446241}
   - {fileID: 7683181027623438140}
   - {fileID: 125996766480416986}
@@ -3059,7 +3065,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5932829315190635120}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -3229,6 +3235,51 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6078518409971090724
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 249986433923533433}
+  - component: {fileID: 6708407763534034227}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: MenuBgRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &249986433923533433
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6078518409971090724}
+  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: 909808399738442487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6708407763534034227
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6078518409971090724}
+  m_CullTransparentMesh: 1
 --- !u!1 &6600899041924302467
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BackgroundCom.prefab

@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2062904427700153750
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3329540650507807299}
+  - component: {fileID: 4871295605075880536}
+  - component: {fileID: 3820114578780643535}
+  - component: {fileID: 2848760606960095958}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: BackgroundCom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3329540650507807299
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2062904427700153750}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4871295605075880536
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2062904427700153750}
+  m_CullTransparentMesh: 1
+--- !u!114 &3820114578780643535
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2062904427700153750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!114 &2848760606960095958
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2062904427700153750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: RawImage
+    gameObject: {fileID: 3820114578780643535}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

Assets/Res/UI/BackgroundCom.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DH8Y4Hz8AHnLcw7sMjzj9is4OBbQABAealL5GQrpRHh68DVLrXIc+hAWRNtU
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/BackgroundPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DSgavCqpVXNrQfY3C2bBbs6JqLrl27rdHuzLgkKjlCfVwp+ySdXF+vVJi1KM
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/BackgroundPanel/BackgroundPanel.prefab

@@ -0,0 +1,274 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6511359846853301411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6511359846853301410}
+  - component: {fileID: 6511359846853301409}
+  - component: {fileID: 7651375321177202314}
+  m_Layer: 5
+  m_Name: BackgroundPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6511359846853301410
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359846853301411}
+  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: 6511359847547714941}
+  - {fileID: 6511359847641744680}
+  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: 1624, y: 750}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6511359846853301409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359846853301411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_BG
+    gameObject: {fileID: 662245988697847974}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: RawImage
+    gameObject: {fileID: 4425456811162685081}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!225 &7651375321177202314
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359846853301411}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!1 &6511359847547714942
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6511359847547714941}
+  - component: {fileID: 6511359847547714931}
+  - component: {fileID: 662245988697847974}
+  - component: {fileID: 4425456811162685081}
+  m_Layer: 5
+  m_Name: BG00
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6511359847547714941
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847547714942}
+  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: 6511359846853301410}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6511359847547714931
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847547714942}
+  m_CullTransparentMesh: 1
+--- !u!114 &662245988697847974
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847547714942}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 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: 1
+  m_TargetGraphic: {fileID: 4425456811162685081}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4425456811162685081
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847547714942}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6509434, g: 0.6509434, b: 0.6509434, 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_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!1 &6511359847641744681
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6511359847641744680}
+  - component: {fileID: 6511359847641744686}
+  - component: {fileID: 6511359847641744687}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6511359847641744680
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847641744681}
+  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: 6511359846853301410}
+  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: -24.48}
+  m_SizeDelta: {x: 869.16, y: 162.97}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6511359847641744686
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847641744681}
+  m_CullTransparentMesh: 1
+--- !u!114 &6511359847641744687
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6511359847641744681}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 71
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 71
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  languageId: 0
+  m_Text: "\u80CC\u666F"

Assets/Res/UI/BackgroundPanel/BackgroundPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XSscsH/4Wy7UQXEa9hFIECS+iTDGmppwXHsWVfDCP/MR/cY89Hn8NGVBdqmy
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -114,7 +114,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  maxDuration: 0.3
+  maxDuration: 0
   isUpdate: 0
   currTime: 0.30024773
   GrpupInfos:
@@ -127,7 +127,7 @@ MonoBehaviour:
     - {fileID: 3194501373201481477}
     TweenAssetInfo: {fileID: 11400000, guid: 3b43306cabdd06a48a5e1cba65050d09, type: 2}
     TargetFoldout: 1
-    maxDuration: 0.3
+    maxDuration: 0
     isUpdate: 1
     currTime: 0
   MinMaxGradient:
@@ -1656,7 +1656,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7720912462477243599
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

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

Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

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

Assets/Res/UI/ItemDetailsPanel/ItemDetailsWidget.prefab

@@ -281,7 +281,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_jianbian_tiao2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

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

Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

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

Assets/Res/UI/RewardsPanel/RewardsPanel.prefab

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

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -479,7 +479,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: 73.2665
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1862,7 +1862,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
-  imageH: 0
+  imageH: 82.141
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3210,7 +3210,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.57155573, g: 0.7169812, b: 0.6582932, a: 0.8156863}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3219,7 +3219,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -3227,7 +3227,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_close_03
+  _icon_name: dec_ty_x
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -3235,7 +3235,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 79270f649120427f1177de011e54987e
-  imageH: 0
+  imageH: 38.6113
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3739,6 +3739,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2849870254427059589}
+  - {fileID: 4201003859133084461}
   - {fileID: 1774812024264171205}
   - {fileID: 4341027774775577007}
   m_Father: {fileID: 953277807175961835}
@@ -3923,6 +3924,7 @@ RectTransform:
   m_Children:
   - {fileID: 8031870718418499362}
   - {fileID: 39178269465296759}
+  - {fileID: 238731523395405108}
   m_Father: {fileID: 8153636129082282834}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3971,6 +3973,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: InfoPos
+    gameObject: {fileID: 238731523395405108}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_YingXiang
+    gameObject: {fileID: 4201003859133084461}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5280469173278725104
 GameObject:
@@ -4649,6 +4661,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6762821833675836759
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4201003859133084461}
+  - component: {fileID: 904188502258490837}
+  - component: {fileID: 3043042469264254001}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Icon_YingXiang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4201003859133084461
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6762821833675836759}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8031870718418499362}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.0000305, y: 1.3999023}
+  m_SizeDelta: {x: 97.0548, y: 97.0547}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &904188502258490837
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6762821833675836759}
+  m_CullTransparentMesh: 1
+--- !u!114 &3043042469264254001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6762821833675836759}
+  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: 1, g: 0.07874654, b: 0.0047169924, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_yuanhuan_quse
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  imageH: 82.141
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6835285763623382150
 GameObject:
   m_ObjectHideFlags: 0
@@ -5198,6 +5299,51 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8366536429607992435
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 238731523395405108}
+  - component: {fileID: 7772942714632693403}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: InfoPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &238731523395405108
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8366536429607992435}
+  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: 953277807175961835}
+  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: -59.8}
+  m_SizeDelta: {x: 12.963, y: 12.963}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7772942714632693403
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8366536429607992435}
+  m_CullTransparentMesh: 1
 --- !u!1 &8374476484755925391
 GameObject:
   m_ObjectHideFlags: 0
@@ -5805,7 +5951,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4047916813180227560
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/Task/TaskInfoPanel.prefab

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

Assets/Resources/MoHu.shader

@@ -0,0 +1,141 @@
+Shader "Unlit/MoHu"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags
+        {
+            "RenderType"="Opaque"
+        }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+
+                return o;
+            }
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv);
+                fixed4 col2 = tex2D(_MainTex, i.uv + fixed2(-1, 0) * _MainTex_TexelSize.xy);
+                fixed4 col3 = tex2D(_MainTex, i.uv + fixed2(1, 0) * _MainTex_TexelSize.xy);
+                return (col + col2 + col3) / 3;
+            }
+            ENDCG
+        }
+        
+         Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+
+                return o;
+            }
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv);
+                fixed4 col2 = tex2D(_MainTex, i.uv + fixed2(0, 1) * _MainTex_TexelSize.xy);
+                fixed4 col3 = tex2D(_MainTex, i.uv + fixed2(0, -1) * _MainTex_TexelSize.xy);
+                return (col + col2 + col3) / 3;
+            }
+            ENDCG
+        }
+         Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            float4 _MainTex_TexelSize;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+
+                return o;
+            }
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv)*float4(0.5,0.5,0.5,1);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}

Assets/Resources/MoHu.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: CSwasCP4V3pcSfI9vQhVR9POwRs6Hc+mO4GvUXy3HIQKQnyMfIdFX1iXjfdL
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1839,6 +1839,71 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
+--- !u!1001 &221259014
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Name
+      value: cj02
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8114345728890542210, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
 --- !u!213 &238775745
 Sprite:
   m_ObjectHideFlags: 0
@@ -2714,6 +2779,67 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+--- !u!1001 &336480152
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.6000004
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 77.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 13.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 137.343
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
 --- !u!1001 &356856622
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3537,6 +3663,67 @@ Sprite:
     - {x: 0.445, y: 0.69}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &461337753
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_Name
+      value: Mountain01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 31.125736
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 77.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -6.5556927
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9295182
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.36877635
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -43.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
 --- !u!1001 &461893080
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5209,6 +5396,67 @@ Sprite:
     - {x: 0.64, y: 0.64}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &722841957
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle02 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
 --- !u!224 &732466266 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4480049515833029494, guid: 66b73c8573489f64690b14e403d1b518, type: 3}
@@ -7082,90 +7330,216 @@ Transform:
   - {fileID: 1927815586}
   m_Father: {fileID: 8535240}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!213 &1235851097
-Sprite:
+--- !u!1001 &1197336699
+PrefabInstance:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: icon_skill_12(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 83
-    height: 83
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    dd7f08ac22eb2d747b0fb1d62bedc93b: 21300000
-  m_AtlasTags:
-  - skillIcon
-  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
-  m_RD:
+  serializedVersion: 2
+  m_Modification:
     serializedVersion: 3
-    texture: {fileID: 2800000, guid: dd7f08ac22eb2d747b0fb1d62bedc93b, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 54
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 15
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 0600050009000800090005000400080005000e000d000c0007000c000d000b000c0007000a000b00070006000a00070009000a00060003000a000900080003000900040003000800070000000600050006000000040005000000030004000000010003000000020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 15
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.000000061817246
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.000000061817246
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+--- !u!1001 &1221725229
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2093453953714045176, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Name
+      value: cj03
+      objectReference: {fileID: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+--- !u!213 &1235851097
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: icon_skill_12(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 83
+    height: 83
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    dd7f08ac22eb2d747b0fb1d62bedc93b: 21300000
+  m_AtlasTags:
+  - skillIcon
+  m_SpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: dd7f08ac22eb2d747b0fb1d62bedc93b, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 54
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 15
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 0600050009000800090005000400080005000e000d000c0007000c000d000b000c0007000a000b00070006000a00070009000a00060003000a000900080003000900040003000800070000000600050006000000040005000000030004000000010003000000020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 15
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
         offset: 0
         format: 0
         dimension: 0
@@ -9013,6 +9387,67 @@ Sprite:
     - {x: -0.03, y: -0.65999997}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &1444228855
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle02 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
 --- !u!213 &1450419931
 Sprite:
   m_ObjectHideFlags: 0
@@ -9351,6 +9786,71 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
   m_PrefabInstance: {fileID: 4260062870105671322}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1502207846
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Name
+      value: cj01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
 --- !u!213 &1507424885
 Sprite:
   m_ObjectHideFlags: 0
@@ -9631,6 +10131,72 @@ Transform:
   m_Children: []
   m_Father: {fileID: 21371308}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1522735223
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2496412622083501486, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle02
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 3013239545119153088, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
 --- !u!1001 &1544803331
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13219,6 +13785,128 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1001 &5398007561899227885
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2632760491527924325, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle01
+      objectReference: {fileID: 0}
+    - target: {fileID: 2632760491527924325, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+--- !u!1001 &6425123862439900028
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4286731389157393447, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_Name
+      value: CombatRoot (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4286731389157393447, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 24.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 25.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
 --- !u!1001 &6588466611375917160
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13406,6 +14094,71 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+--- !u!1001 &7833750896296525313
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2093453953714045176, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Name
+      value: cj03 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e925951f87f5df24392c535f597b31aa, type: 3}
 --- !u!1001 &7971796013686853673
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13503,3 +14256,15 @@ SceneRoots:
   - {fileID: 59330909}
   - {fileID: 2481812744647472}
   - {fileID: 412876770}
+  - {fileID: 1522735223}
+  - {fileID: 221259014}
+  - {fileID: 1221725229}
+  - {fileID: 1197336699}
+  - {fileID: 461337753}
+  - {fileID: 336480152}
+  - {fileID: 1502207846}
+  - {fileID: 7833750896296525313}
+  - {fileID: 5398007561899227885}
+  - {fileID: 6425123862439900028}
+  - {fileID: 1444228855}
+  - {fileID: 722841957}

Assets/Scripts/Core/CameraEffect/StressReceiver.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 public class StressReceiver : MonoBehaviour
 {
+  
     public float trauma;
     private float _trauma;
     private Vector3 _lastPosition;

Assets/Scripts/Core/Pool/CObject/Entity.cs

@@ -430,6 +430,24 @@ namespace Fort23.Core
 
             return component as K;
         }
+        
+        
+        public Entity AddComponent< P1>(Type type1, P1 p1, bool isFromPool = false)
+        {
+            Type type = type1;
+            if (this._components != null && this._components.ContainsKey(type))
+            {
+                LogTool.Exception(new Exception($"entity already has component: {type.FullName}"));
+            }
+
+            Entity component = Create(type, isFromPool);
+            component.ID = this.ID;
+            component.ComponentParent = this;
+            EventSystem.Instance.Awake(component, new object[] {p1});
+            this.AddToComponent(type, component);
+
+            return component ;
+        }
 
         public K AddComponent<K, P1, P2>(P1 p1, P2 p2, bool isFromPool = false) where K : Entity, new()
         {

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -67,7 +67,7 @@ namespace Fort23.Mono
         /// 所有top层ui
         /// </summary>
         public List<UIPanel> NoFocusTopUIPanels = new List<UIPanel>();
-        
+
         /// <summary>
         /// 弹窗ui
         /// </summary>
@@ -140,6 +140,9 @@ namespace Fort23.Mono
         /// </summary>
         public UIPanel LastUIPanel;
 
+
+        private Type BackgroundPanelType;
+
         [CustomMethod(CustomMethodType.Awake)]
         public async void Awake(Transform parent)
         {
@@ -173,6 +176,8 @@ namespace Fort23.Mono
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
 
+            Assembly assembly = Assembly.Load("Fort23.Mono");
+            BackgroundPanelType = assembly.GetType(" Fort23.Mono.BackgroundPanel");
 
             // if (MaskWordData == null)
             // {
@@ -329,6 +334,157 @@ namespace Fort23.Mono
             _lastShowPanel.Clear();
         }
 
+        public async CTask<UIPanel> LoadAndOpenPanel(Type uipsnelType, Action<UIPanel> callback, UILayer layer = UILayer.Middle,
+            bool isFocus = true, object[] uiData = null, bool isShowBG = false, bool isFullUI = false,
+            bool isActiveAnima = true)
+        {
+            try
+            {
+                Type type;
+                current = EventSystem.current;
+
+                type = uipsnelType;
+                UIPanel uiPanel;
+                // 获取UI绑定属性
+                UIBindingAttribute uiBindingAttribute =
+                    type.GetCustomAttribute(typeof(UIBindingAttribute)) as UIBindingAttribute;
+                if (uiBindingAttribute == null)
+                {
+                    LogTool.Error($"类型{type.Name}没有添加UIBindingAttribute!");
+                    return null;
+                }
+
+
+                using (await CoroutineLockComponent.Instance.Wait(uiBindingAttribute.prefab))
+                {
+                    if (current != null)
+                    {
+                        // current.isClose = true;
+                    }
+
+
+                    // 不可以重复打开Panel，但是可以把上一个拿来使用。
+                    if (!Components.ContainsKey(type))
+                    {
+                        GameObject gameObjectPool = await FetchUI(uiBindingAttribute, GetLayer(layer));
+                        if (gameObjectPool == null)
+                            return null;
+                        uiPanel = AddComponent<GameObject>(type, gameObjectPool, false) as UIPanel;
+                        uiPanel.uiName = uiBindingAttribute.prefab;
+                        uiPanel.isFocus = isFocus;
+                        await uiPanel.SetUIGameObject(gameObjectPool);
+                        gameObjectPool.SetActive(false);
+                    }
+                    else
+                    {
+                        uiPanel = GetComponent(type) as UIPanel;
+                        if (uiPanel.DestroyTimerEntity != null)
+                        {
+                            TimerComponent.Instance.Remove(uiPanel.DestroyTimerEntity.ID);
+                            uiPanel.DestroyTimerEntity.Destroy();
+                        }
+
+                        destroyUI.Remove(uiBindingAttribute.prefab);
+                    }
+
+                    Assembly assembly = Assembly.Load("Fort23.Mono");
+                    Type combatPanel = assembly.GetType(" Fort23.Mono.CombatPanel");
+                    if (uiPanel.isAddStack && uiPanel.GetType() != combatPanel)
+                    {
+                        EventManager.Instance.Dispatch(CustomEventType.CancelEvent, null);
+                    }
+
+                    uiPanel.isFullUI = isFullUI;
+                    // 等待数据准备好才初始化UI
+                    if (await uiPanel.AsyncInit(uiData))
+                    {
+                        if (uiPanel.isAddStack)
+                        {
+                            if (uiPanel.IsBreadcrumbBarPanel) //打开界面之前判断是否已经在堆栈当中 如果是就移除此界面往后的堆栈 保持他时在堆栈的最上方
+                            {
+                                if (TopUIPanels.Contains(uiPanel))
+                                {
+                                    int index = TopUIPanels.IndexOf(uiPanel);
+                                    int count = TopUIPanels.Count - index;
+
+                                    for (int i = index + 1; i < TopUIPanels.Count; i++)
+                                    {
+                                        if (TopUIPanels[i].isShow)
+                                        {
+                                            HideUIUIPanel(TopUIPanels[i]);
+                                        }
+                                    }
+
+
+                                    TopUIPanels.RemoveRange(index, count);
+                                }
+                            }
+
+                            AddTopStack(uiPanel);
+                        }
+
+
+                        if (layer == UILayer.Top && !NoFocusTopUIPanels.Contains(uiPanel))
+                            NoFocusTopUIPanels.Add(uiPanel);
+                        uiPanel.isActiveAnima = isActiveAnima;
+                        await uiPanel.Open();
+                        AudioManager.Instance.PlayAudio("openui.wav");
+                        // if (currOpenPanel.add)
+                        // {
+                        //     currOpenPanel = uiPanel;
+                        // }
+
+                        if (current != null)
+                        {
+                            // current.isClose = false;
+                        }
+
+
+                        await TimerComponent.Instance.WaitAsync(1); //等待一帧 让渲染完成后在执行完成逻辑
+                        callback?.Invoke(uiPanel);
+
+
+                        RefreshFull();
+
+
+                        if (isShowBG)
+                        {
+                            uiPanel.IsShowCustomBGPanel = true;
+                            if (!AllShowBGUIs.Contains(uiPanel))
+                                AllShowBGUIs.Add(uiPanel);
+                            await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                        }
+
+                        return uiPanel;
+                    }
+                    else
+                    {
+                        if (current != null)
+                        {
+                            // current.isClose = false;
+                        }
+
+                        // 界面数据没准备好，因此本次操作将被销毁
+                        LogTool.Log($"数据准备失败，请检查{type.Name}的Init方法中的逻辑");
+                        // ShowTips($"数据准备失败，请检查{buildType.Name}的Init方法中的逻辑");
+                        uiPanel.Close();
+                        return null;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                if (current != null)
+                {
+                    // current.isClose = false;
+                }
+
+                LogTool.Error(uipsnelType.ToString() + "  " + e.Message);
+                LogTool.Exception(e);
+                return null;
+            }
+        }
+
         /// <summary>
         /// 用窗口打开某个界面(不可重复的预设，适用于一切带有关闭按钮的窗口UI) 
         /// </summary>
@@ -358,11 +514,8 @@ namespace Fort23.Mono
                 if (uiBindingAttribute == null)
                 {
                     LogTool.Error($"类型{type.Name}没有添加UIBindingAttribute!");
-                    // ShowTips($"类型{buildType.Name}没有添加UIBindingAttribute!");
                     return null;
                 }
-
-                // TDManager.Instance.PartCount(uiBindingAttribute.prefab);
                 // if (isFocus)
                 // {
                 //     if (currOpenPanel != null)
@@ -411,11 +564,12 @@ namespace Fort23.Mono
 
                         destroyUI.Remove(uiBindingAttribute.prefab);
                     }
+
                     Assembly assembly = Assembly.Load("Fort23.Mono");
                     Type combatPanel = assembly.GetType(" Fort23.Mono.CombatPanel");
                     if (uiPanel.isAddStack && uiPanel.GetType() != combatPanel)
                     {
-                        EventManager.Instance.Dispatch(CustomEventType.CancelEvent,null);
+                        EventManager.Instance.Dispatch(CustomEventType.CancelEvent, null);
                     }
 
                     uiPanel.isFullUI = isFullUI;
@@ -473,10 +627,11 @@ namespace Fort23.Mono
 
                         if (isShowBG)
                         {
+                            // await TimerComponent.Instance.WaitFrameAsync();
                             uiPanel.IsShowCustomBGPanel = true;
                             if (!AllShowBGUIs.Contains(uiPanel))
                                 AllShowBGUIs.Add(uiPanel);
-                            // await GetBackgroundPanel(uiPanel);
+                            await GetBackgroundPanel(uiPanel, GetLayer(layer));
                         }
 
                         return uiPanel;
@@ -874,7 +1029,7 @@ namespace Fort23.Mono
 
             if (uiPanel.IsShowCustomBGPanel) //如果是开了背景的界面关闭的时候将背景一起关闭
             {
-                // HideUIUIPanel(GetComponent<BackgroundPanel>(), UIDestroyType.NotDestroy);
+                HideUIUIPanel(GetComponent(BackgroundPanelType) as UIPanel, UIDestroyType.NotDestroy);
             }
             // CloseTopUI();
             // OpenTopUI();
@@ -1153,6 +1308,54 @@ namespace Fort23.Mono
             return number.ToString();
         }
 
+
+        /// <summary>
+        /// 获取背景
+        /// </summary>
+        /// <returns></returns>
+        public async CTask<UIPanel> GetBackgroundPanel(UIPanel uiPanel, Transform parent)
+        {
+            UIPanel popupPanel;
+            if (GetComponent(BackgroundPanelType) == null)
+            {
+                popupPanel = await LoadAndOpenPanel(BackgroundPanelType, null, UILayer.Top, false, isFullUI: true);
+            }
+            else
+            {
+                popupPanel = Instance.GetComponent(BackgroundPanelType) as UIPanel;
+            }
+            popupPanel.transform.SetParent(parent, false);
+            popupPanel.transform.SetAsFirstSibling();
+            int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
+            // popupPanel.transform.SetParent(parent, false);
+          
+            popupPanel.transform.SetSiblingIndex(index01-1 );
+            await popupPanel.Open();
+
+            return popupPanel;
+        }
+
+        /// <summary>
+        /// 设置背景在需要显示背景的ui下面
+        /// </summary>
+        public async void SetBackgroundPanel(UIPanel uiBase)
+        {
+            if (AllShowBGUIs.Contains(uiBase))
+            {
+                AllShowBGUIs.Remove(uiBase);
+            }
+
+            for (int i = AllShowBGUIs.Count - 1; i >= 0; i--)
+            {
+                if (AllShowBGUIs[i].IsShowCustomBGPanel) //从后往前如果需要展示bg 就展示 否则将bg放到最上方需要展示的ui后面
+                {
+                    UIPanel popupPanel = await GetBackgroundPanel(AllShowBGUIs[i], AllShowBGUIs[i].transform.parent);
+
+                    break;
+                }
+            }
+        }
+
         /// <summary>
         /// 每日是否提醒标记
         /// </summary>

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -235,8 +235,8 @@ namespace Fort23.Mono
             Hide();
             IsClose = true;
             GObjectPoolInterface?.transform.SetSiblingIndex(0); //关闭界面的时候将他放在底部
-            // if (IsShowCustomBGPanel)
-            //     UIManager.Instance.SetBackgroundPanel(this);
+            if (IsShowCustomBGPanel)
+                UIManager.Instance.SetBackgroundPanel(this);
 
 
             if (this == UIManager.Instance.currOpenPanel)

Assets/Scripts/Core/Utility/CapyCamera.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CapyCamera : MonoBehaviour
+{
+    public Camera targetCamera;
+    public Camera myCamera;
+  
+    // Update is called once per frame
+    void Update()
+    {
+        myCamera.fieldOfView= targetCamera.fieldOfView;
+    }
+}

Assets/Scripts/Core/Utility/CapyCamera.cs.meta

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

Assets/Scripts/Feature.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XCtLvHz+Vn0BS/g+lcos6ML4s/9GcJb9a2ENzW+1D6Us2pMV19DLXVWmYtZs
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Feature/Feature.asmdef

@@ -0,0 +1,21 @@
+{
+    "name": "Feature",
+    "rootNamespace": "",
+    "references": [
+        "GUID:df380645f10b7bc4b97d4f5eb6303d95",
+        "GUID:86bc95e6fdb13ff43aa04316542905ae",
+        "GUID:ab67fb10353d84448ac887a7367cbda8",
+        "GUID:15fc0a57446b3144c949da3e2b9737a9",
+        "GUID:343deaaf83e0cee4ca978e7df0b80d21",
+        "GUID:2bafac87e7f4b9b418d9448d219b01ab"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/Scripts/Feature/Feature.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CXsX5i37AXgvd/8zsOzUorpGLlpZB63IHw7BXMSqyGXfqK0iBMKZ01kiZq93
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -36,9 +36,9 @@ namespace GameLogic.Combat.CombatTool
         // private float _shengShiAddTime;
         private bool _isUpdateShengShi;
 
-        private SceneMonoConfig SceneMonoConfig;
+        private SceneMonoConfigBasic SceneMonoConfig;
 
-        private RandomAllMap RandomAllMap;
+        // private RandomAllMap RandomAllMap;
 
         private float shengShiRan;
         // private List
@@ -49,11 +49,11 @@ namespace GameLogic.Combat.CombatTool
             moveRoot = gameObject.transform;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
-            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle02.prefab",
+            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle01.prefab",
                 delegate(AssetHandle assetHandle)
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
-                    SceneMonoConfig = gameObject.GetComponent<SceneMonoConfig>();
+                    SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
                     SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
                 });
             cTaskAwaitBuffer.AddTask(task_a);
@@ -66,10 +66,10 @@ namespace GameLogic.Combat.CombatTool
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             currBesselPath = InitBesselPath(lasetPos);
-            SceneMonoConfig.Init(Camera.main.transform.parent);
-            RandomAllMap = new RandomAllMap();
-            RandomAllMap.Init(moveRoot, SceneMonoConfig);
-            RandomAllMap.Update();
+            SceneMonoConfig.Init(Camera.main.transform.parent,moveRoot);
+            // RandomAllMap = new RandomAllMap();
+            // RandomAllMap.Init(moveRoot, SceneMonoConfig);
+            // RandomAllMap.Update();
         }
 
 
@@ -121,92 +121,92 @@ namespace GameLogic.Combat.CombatTool
             // InitButton(besselPath);
         }
 
-        private async CTask InitRoadside(CombatSencePath besselPath)
-        {
-            SceneConfig sceneConfig = SceneMonoConfig.roadside;
-            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
-            for (int i = 0; i < count; i++)
-            {
-                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
-                if (sceneObjectConfig == null)
-                {
-                    continue;
-                }
-
-                float md = Random.Range(0.05f, 1f);
-                Vector3 p = besselPath.GetValue(md);
-                Vector3 p2 = besselPath.GetValue(md - 0.01f);
-                Vector3 dir = (p - p2);
-                Vector3 cross = Vector3.Cross(dir, Vector3.up);
-                cross = cross.normalized;
-                int odds = Random.Range(0, 100);
-                p += cross * Random.Range(12, 25) * (odds < 50 ? 1 : -1);
-                SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
-                GameObject g = gameObjectPool.pool.own;
-                besselPath.allPool.Add(gameObjectPool);
-                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
-                g.transform.position = new Vector3(p.x, y, p.z);
-                g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
-            }
-        }
-
-        private async CTask InitRoadside_1(CombatSencePath besselPath)
-        {
-            SceneConfig sceneConfig = SceneMonoConfig.roadside_1;
-            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
-            for (int i = 0; i < count; i++)
-            {
-                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
-                if (sceneObjectConfig == null)
-                {
-                    continue;
-                }
-
-                float md = Random.Range(0.05f, 1f);
-                Vector3 p = besselPath.GetValue(md);
-                Vector3 p2 = besselPath.GetValue(md - 0.01f);
-                Vector3 dir = (p - p2);
-                Vector3 cross = Vector3.Cross(dir, Vector3.up);
-                cross = cross.normalized;
-                int odds = Random.Range(0, 100);
-                p += cross * Random.Range(40, 60) * (odds < 50 ? 1 : -1);
-                SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
-                GameObject g = gameObjectPool.pool.own;
-                besselPath.allPool.Add(gameObjectPool);
-                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
-                g.transform.position = new Vector3(p.x, y, p.z);
-                g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
-            }
-        }
-
-        private async CTask InitButton(CombatSencePath besselPath)
-        {
-            SceneConfig sceneConfig = SceneMonoConfig.button;
-            int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
-            for (int i = 0; i < count; i++)
-            {
-                SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
-                if (sceneObjectConfig == null)
-                {
-                    continue;
-                }
-
-                float md = Random.Range(0.05f, 1f);
-                Vector3 p = besselPath.GetValue(md);
-                Vector3 p2 = besselPath.GetValue(md - 0.01f);
-                Vector3 dir = (p - p2);
-                Vector3 cross = Vector3.Cross(dir, Vector3.up);
-                cross = cross.normalized;
-                // int odds = Random.Range(0, 100);
-                p += cross * Random.Range(-20, 20);
-                SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
-                GameObject g = gameObjectPool.pool.own;
-                besselPath.allPool.Add(gameObjectPool);
-                float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
-                g.transform.position = new Vector3(p.x, y, p.z);
-                g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
-            }
-        }
+        // private async CTask InitRoadside(CombatSencePath besselPath)
+        // {
+        //     SceneConfig sceneConfig = SceneMonoConfig.roadside;
+        //     int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
+        //     for (int i = 0; i < count; i++)
+        //     {
+        //         SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+        //         if (sceneObjectConfig == null)
+        //         {
+        //             continue;
+        //         }
+        //
+        //         float md = Random.Range(0.05f, 1f);
+        //         Vector3 p = besselPath.GetValue(md);
+        //         Vector3 p2 = besselPath.GetValue(md - 0.01f);
+        //         Vector3 dir = (p - p2);
+        //         Vector3 cross = Vector3.Cross(dir, Vector3.up);
+        //         cross = cross.normalized;
+        //         int odds = Random.Range(0, 100);
+        //         p += cross * Random.Range(12, 25) * (odds < 50 ? 1 : -1);
+        //         SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
+        //         GameObject g = gameObjectPool.pool.own;
+        //         besselPath.allPool.Add(gameObjectPool);
+        //         float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+        //         g.transform.position = new Vector3(p.x, y, p.z);
+        //         g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
+        //     }
+        // }
+
+        // private async CTask InitRoadside_1(CombatSencePath besselPath)
+        // {
+        //     SceneConfig sceneConfig = SceneMonoConfig.roadside_1;
+        //     int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
+        //     for (int i = 0; i < count; i++)
+        //     {
+        //         SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+        //         if (sceneObjectConfig == null)
+        //         {
+        //             continue;
+        //         }
+        //
+        //         float md = Random.Range(0.05f, 1f);
+        //         Vector3 p = besselPath.GetValue(md);
+        //         Vector3 p2 = besselPath.GetValue(md - 0.01f);
+        //         Vector3 dir = (p - p2);
+        //         Vector3 cross = Vector3.Cross(dir, Vector3.up);
+        //         cross = cross.normalized;
+        //         int odds = Random.Range(0, 100);
+        //         p += cross * Random.Range(40, 60) * (odds < 50 ? 1 : -1);
+        //         SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
+        //         GameObject g = gameObjectPool.pool.own;
+        //         besselPath.allPool.Add(gameObjectPool);
+        //         float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+        //         g.transform.position = new Vector3(p.x, y, p.z);
+        //         g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
+        //     }
+        // }
+
+        // private async CTask InitButton(CombatSencePath besselPath)
+        // {
+        //     SceneConfig sceneConfig = SceneMonoConfig.button;
+        //     int count = Random.Range(sceneConfig.minCount, sceneConfig.maxCount);
+        //     for (int i = 0; i < count; i++)
+        //     {
+        //         SceneObjectConfig sceneObjectConfig = sceneConfig.GetSceneObjectConfig();
+        //         if (sceneObjectConfig == null)
+        //         {
+        //             continue;
+        //         }
+        //
+        //         float md = Random.Range(0.05f, 1f);
+        //         Vector3 p = besselPath.GetValue(md);
+        //         Vector3 p2 = besselPath.GetValue(md - 0.01f);
+        //         Vector3 dir = (p - p2);
+        //         Vector3 cross = Vector3.Cross(dir, Vector3.up);
+        //         cross = cross.normalized;
+        //         // int odds = Random.Range(0, 100);
+        //         p += cross * Random.Range(-20, 20);
+        //         SceneDecoration gameObjectPool = await GetSceneDecoration(sceneObjectConfig);
+        //         GameObject g = gameObjectPool.pool.own;
+        //         besselPath.allPool.Add(gameObjectPool);
+        //         float y = Random.Range(sceneObjectConfig.minY, sceneObjectConfig.maxY);
+        //         g.transform.position = new Vector3(p.x, y, p.z);
+        //         g.transform.eulerAngles = new Vector3(-90, 0, Random.Range(0, 360));
+        //     }
+        // }
 
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
@@ -309,7 +309,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
-            SceneMonoConfig?.Update();
+            SceneMonoConfig?.UpdateScene();
             if (currBesselPath != null)
             {
                 currBesselPath.Update(t);
@@ -320,10 +320,7 @@ namespace GameLogic.Combat.CombatTool
                 NextBesselPath.Update(t);
             }
 
-            if (RandomAllMap != null)
-            {
-                RandomAllMap.Update();
-            }
+            
 
             if (_isUpdateShengShi)
             {

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -0,0 +1,161 @@
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEngine;
+using Utility;
+
+namespace GameLogic.Combat.CombatTool.SceneTool
+{
+    public class SceneCJ2MonoConfig : SceneMonoConfigBasic
+    {
+        public Color fogColor;
+        public float fogStartDistance;
+        public float fogEndDistance;
+        public GameObject[] allObject;
+        public float radius;
+        private Map<int, GameObjectPool> _allGameObjectPools = new Map<int, GameObjectPool>();
+        private Map<int, GameObjectPool> _downAllGameObjectPools = new Map<int, GameObjectPool>();
+
+        protected override void ProInit()
+        {
+            RenderSettings.fogColor= fogColor;
+            RenderSettings.fogStartDistance = fogStartDistance;
+            RenderSettings.fogEndDistance = fogEndDistance;
+        }
+
+        protected override void ProUpdate()
+        {
+        
+
+            Vector3 pos = moveRoot.position;
+            List<int> removeKey = new List<int>();
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
+            {
+                if (_allGameObjectPools.Value == null)
+                {
+                    continue;
+                }
+
+                Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
+                if (Vector3.Distance(pos, objetcPos) > 600)
+                {
+                    removeKey.Add(_allGameObjectPools.Key);
+                    GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
+                }
+            }
+
+            for (int i = 0; i < removeKey.Count; i++)
+            {
+                _allGameObjectPools.Remove(removeKey[i]);
+            }
+
+            removeKey.Clear();
+
+            for (_downAllGameObjectPools.Begin(); _downAllGameObjectPools.Next();)
+            {
+                if (_downAllGameObjectPools.Value == null)
+                {
+                    continue;
+                }
+
+                Vector3 objetcPos = _downAllGameObjectPools.Value.own.transform.position;
+                if (Vector3.Distance(pos, objetcPos) > 600)
+                {
+                    removeKey.Add(_downAllGameObjectPools.Key);
+                    GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
+                }
+            }
+
+            for (int i = 0; i < removeKey.Count; i++)
+            {
+                _downAllGameObjectPools.Remove(removeKey[i]);
+            }
+
+            // float radius = radius;
+            int x = (int)(pos.x / radius);
+            int z = (int)(pos.z / radius);
+            float xStartInit = x;
+            float zStartInit = z;
+            for (int i = -4; i <= 20; i++)
+            {
+                for (int j = -4; j <= 20; j++)
+                {
+                    float currX = (xStartInit + i) * radius;
+                    float currZ = (zStartInit + j) * radius;
+                    int key = (int)(currX * 1000 + currZ);
+                    InitUp(key, currX, currZ);
+                    InitDown(key, currX, currZ, i, j);
+                }
+            }
+        }
+
+        private void InitUp(int key, float currX, float currZ)
+        {
+            if (_allGameObjectPools.ContainsKey(key))
+            {
+                return;
+            }
+
+            GameObjectPool gameObjectPool = GetObejct(80);
+            if (gameObjectPool != null)
+            {
+                float y = Random.Range(45.0f, 65.0f);
+                float x = Random.Range(-3.0f, 3.0f);
+                float z = Random.Range(-2.0f, 2.0f);
+                gameObjectPool.own.transform.position = new Vector3(currX + x, y, currZ + z);
+                float ry = Random.Range(0, 360);
+                Vector3 eulerAngles = gameObjectPool.own.transform.eulerAngles;
+                gameObjectPool.own.transform.eulerAngles = new Vector3(eulerAngles.x, ry, eulerAngles.z);
+            }
+
+            _allGameObjectPools.Add(key, gameObjectPool);
+        }
+
+        private void InitDown(int key, float currX, float currZ, int xintdex, int yindex)
+        {
+            if (_downAllGameObjectPools.ContainsKey(key))
+            {
+                return;
+            }
+
+            int odds = 50;
+          
+            GameObjectPool gameObjectPool = GetObejct(odds);
+            if (gameObjectPool != null)
+            {
+                float y = Random.Range(-1.0f, 5.0f);
+                if(Mathf.Abs(Mathf.Abs(xintdex)-1)<=1)
+                {
+                     y = Random.Range(-1.0f, 1.0f);
+                }
+               
+                float x = Random.Range(-3.0f, 3.0f);
+                float z = Random.Range(-2.0f, 2.0f);
+                gameObjectPool.own.transform.position = new Vector3(currX + x, y, currZ + z);
+                float ry = Random.Range(0, 360);
+
+                Vector3 eulerAngles = gameObjectPool.own.transform.eulerAngles;
+                gameObjectPool.own.transform.eulerAngles = new Vector3(eulerAngles.x, ry, eulerAngles.z);
+            }
+
+            _downAllGameObjectPools.Add(key, gameObjectPool);
+        }
+
+        private GameObjectPool GetObejct(int currOdds)
+        {
+            int odds = Random.Range(0, 100);
+            if (odds < currOdds)
+            {
+                return null;
+            }
+
+            int index = Random.Range(0, allObject.Length);
+            GameObject gameObject = allObject[index];
+            // GameObject go = GameObject.Instantiate(gameObject);
+            GameObjectPool gameObjectPool =
+                GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
+            return gameObjectPool;
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 43f1d0747d2d4b1ab0a3a298f9db7f35
+timeCreated: 1755068477

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -1,33 +1,93 @@
+using System.Collections.Generic;
+using Fort23.UTool;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
 using UnityEngine;
+using Utility;
 
 namespace GameLogic.Combat.CombatTool.SceneTool
 {
-    public class SceneMonoConfig : MonoBehaviour
+    public class SceneMonoConfig : SceneMonoConfigBasic
     {
+        public Color fogColor;
+        public float fogStartDistance;
+        public float fogEndDistance;
         public GameObject[] allObject;
         public float radius;
         public string dec;
-        public SceneConfig roadside;
-        public SceneConfig roadside_1;
-        public SceneConfig button;
 
-        public GameObject skyObejct;
+        // private Transform root;
 
-        public Material shengShiMaterial;
-        private Transform root;
+        private SceneMonoConfig sceneMonoConfig;
 
-        public void Init(Transform root)
+        private Map<int, GameObjectPool> _allGameObjectPools = new Map<int, GameObjectPool>();
+
+        protected override void ProInit()
         {
-            this.root = root;
-            roadside.Init();
-            roadside_1.Init();
-            button.Init();
+            RenderSettings.fogColor= fogColor;
+            RenderSettings.fogStartDistance = fogStartDistance;
+            RenderSettings.fogEndDistance = fogEndDistance;
+            this.sceneMonoConfig = this;
+        }
+
+        protected override void ProUpdate()
+        {
+            Vector3 pos = moveRoot.position;
+            List<int> removeKey = new List<int>();
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
+            {
+                Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
+                if (Vector3.Distance(pos, objetcPos) > 300)
+                {
+                    removeKey.Add(_allGameObjectPools.Key);
+                    GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
+                }
+            }
+
+            for (int i = 0; i < removeKey.Count; i++)
+            {
+                _allGameObjectPools.Remove(removeKey[i]);
+            }
+
+
+            float radius = sceneMonoConfig.radius;
+            int x = (int)(pos.x / radius);
+            int z = (int)(pos.z / radius);
+            float xStartInit = x;
+            float zStartInit = z;
+            for (int i = -3; i <= 3; i++)
+            {
+                for (int j = -3; j <= 4; j++)
+                {
+                    // if (i == 0 && j == 0)
+                    // {
+                    //     continue;
+                    // }
+
+                    float currX = (xStartInit + i) * radius;
+                    float currZ = (zStartInit + j) * radius;
+                    int key = (int)(currX * 1000 + currZ);
+                    if (_allGameObjectPools.ContainsKey(key))
+                    {
+                        continue;
+                    }
+
+                    GameObjectPool gameObjectPool = GetObejct();
+                    float y = Random.Range(-2, 0);
+                    gameObjectPool.own.transform.position = new Vector3(currX, y, currZ);
+                    _allGameObjectPools.Add(key, gameObjectPool);
+                }
+            }
         }
 
-        public void Update()
+        private GameObjectPool GetObejct()
         {
-            skyObejct.transform.position = new Vector3(root.position.x, 0, root.position.z);
+            int index = Random.Range(0, sceneMonoConfig.allObject.Length);
+            GameObject gameObject = sceneMonoConfig.allObject[index];
+            // GameObject go = GameObject.Instantiate(gameObject);
+            GameObjectPool gameObjectPool =
+                GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
+            return gameObjectPool;
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs

@@ -0,0 +1,35 @@
+using Fort23.UTool;
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatTool.SceneTool
+{
+    public class SceneMonoConfigBasic: MonoBehaviour
+    {
+        public GameObject skyObejct;
+
+        public Material shengShiMaterial;
+        protected Transform root;
+        protected Transform moveRoot;
+        public void Init(Transform root,Transform moveRoot)
+        {
+            this.root = root;
+            this.moveRoot = moveRoot;
+            ProInit();
+        }
+
+        protected virtual void ProInit()
+        {
+            
+        }
+
+        public void UpdateScene()
+        {
+            skyObejct.transform.position = new Vector3(root.position.x, 0, root.position.z);
+            ProUpdate();
+        }
+        protected virtual void ProUpdate()
+        {
+            
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5342693c698b4ee5a1dba9d34a13b73e
+timeCreated: 1755067965

Assets/Scripts/GameUI/Feature.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XnsZ4SqsUSklN8r+9h455quMP53ARTUnKpixUX9qCutlAay5rr3WDFG4QCG6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/Feature/InterceptGameFaeture.cs

@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using Fort23.Mono.Test;
+
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.Serialization;
+
+public class InterceptGameFaeture : ScriptableRendererFeature
+{
+   // public InterceptGamePass interceptGamePass;
+
+
+    // private RenderTargetHandle m_CameraColorAttachment;
+
+
+
+    // 屏幕拷贝Pass
+    private InterceptGamePass m_CopyTransparentColorPass;
+
+    public override void Create()
+    {
+        // 初始化构建屏幕拷贝Pass
+        m_CopyTransparentColorPass = new InterceptGamePass(RenderPassEvent.AfterRenderingTransparents);
+
+        // 映射到显存中的RT
+        // m_CameraColorAttachment.Init("_CameraColorTexture");
+
+    }
+
+    public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData)
+    {
+        // Debug.Log("AddRenderPasses");
+        if (renderingData.cameraData.cameraType == CameraType.Game)
+        {
+            // Debug.Log("AddRenderPasses——Game");
+            m_CopyTransparentColorPass.Setup(renderer);
+            renderer.EnqueuePass(m_CopyTransparentColorPass);
+        }
+    }
+}

Assets/Scripts/GameUI/Feature/InterceptGameFaeture.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WXsWtCn4W39X5SKiV/Ae/s27G/6AsapXnzjOaQF+c+XZysdioiANbs8w0PPK
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/Feature/InterceptGamePass.cs

@@ -0,0 +1,98 @@
+
+using UnityEngine;
+using UnityEngine.Experimental.Rendering;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.Serialization;
+
+namespace Fort23.Mono.Test
+{
+    [System.Serializable]
+    public class InterceptGamePass : ScriptableRenderPass
+    {
+        private static bool isIntercept;
+
+        // private RenderTextureDescriptor RenderTextureDescriptor;
+        private static RenderTexture RenderTexture;
+
+
+        private const string m_ProfilerTag = "Intercept";
+
+        
+        public RenderTargetHandle m_Destination;
+
+        private static System.Action _finish;
+
+        private static int count;
+        private RenderTextureDescriptor cameraTextureDescriptor;
+        private static System.Action<ScriptableRenderContext, RenderingData, RenderTexture, RenderTargetIdentifier, RenderTextureDescriptor> OnExecuteCallBack;
+
+        private ScriptableRenderer renderer;
+        public static void SetRenderTexture(RenderTexture renderTexture, System.Action finish,
+            System.Action<ScriptableRenderContext, RenderingData, RenderTexture, RenderTargetIdentifier, RenderTextureDescriptor> executeCallBack = null)
+        {
+            // Debug.Log("开始准备背景界面");
+            // finish?.Invoke();
+            // return;
+            RenderTexture = renderTexture;
+            _finish+= finish;
+            isIntercept = true;
+            OnExecuteCallBack = executeCallBack;
+            count = 1;
+        }
+
+        public InterceptGamePass(RenderPassEvent evt)
+        {
+            renderPassEvent = evt;
+        }
+
+        public void Setup(ScriptableRenderer renderer)
+        {
+            this.renderer = renderer;
+        }
+
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
+        {
+            if (isIntercept)
+            {
+                // Debug.Log("执行背景背景界面");
+                count--;
+                // 执行拷贝命令
+                CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag);
+                // var descriptor = RenderTextureDescriptor;
+                // descriptor.depthBufferBits = 0;
+                //
+                // RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(RenderTexture);
+                // m_Destination.Init(renderTargetIdentifier);
+                
+                cmd.Blit(renderer.cameraColorTargetHandle, RenderTexture);
+
+               
+                context.ExecuteCommandBuffer(cmd);
+                CommandBufferPool.Release(cmd);
+                OnExecuteCallBack?.Invoke(context, renderingData, RenderTexture, renderer.cameraColorTargetHandle, cameraTextureDescriptor);
+            }
+        }
+
+        public override void OnFinishCameraStackRendering(CommandBuffer cmd)
+        {
+            // if (m_Destination != RenderTargetHandle.CameraTarget)
+            // {
+            //     // m_Destination = RenderTargetHandle.CameraTarget;
+            // }
+
+            if (count <= 0&&isIntercept)
+            {
+                // Debug.Log("完成背景界面");
+                isIntercept = false;
+                _finish?.Invoke();
+                _finish = null;
+            }
+        }
+
+        public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
+        {
+            this.cameraTextureDescriptor = cameraTextureDescriptor;
+        }
+    }
+}

Assets/Scripts/GameUI/Feature/InterceptGamePass.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DH5JtH+vVHla1z7GE5BEefTu+/q3JAAZpXS5W6ruHmXe/V9dFLxm1o0KCg1s
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/Fort23.Mono.asmdef

@@ -14,7 +14,11 @@
         "GUID:5efd170ecd8084500bed5692932fe14e",
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
         "GUID:c03a7518d60db354c9d04ea9d1517aa1",
-        "GUID:8097be56b8f8a81458fa9b1971038cec"
+        "GUID:8097be56b8f8a81458fa9b1971038cec",
+        "GUID:15fc0a57446b3144c949da3e2b9737a9",
+        "GUID:ab67fb10353d84448ac887a7367cbda8",
+        "GUID:86bc95e6fdb13ff43aa04316542905ae",
+        "GUID:df380645f10b7bc4b97d4f5eb6303d95"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

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

@@ -20,6 +20,8 @@ namespace Fort23.Mono
             isAddStack = false;
         }
 
+        private BackgroundCom _backgroundCom;
+
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.DivineSensePointChange, DivineSensePointChange);
@@ -50,28 +52,34 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 // currentOpenUIPanel = null;
             });
-            Btn_Menu.onClick.AddListener(() =>
+            Btn_Menu.onClick.AddListener(async () =>
             {
+                _backgroundCom = await UIManager.Instance.CreateGComponent<BackgroundCom>(null, root: MenuBgRoot);
+
                 MenuRoot.SetActive(true);
             });
-            Btn_Back1.onClick.AddListener(() =>
-            {
-                MenuRoot.SetActive(false);
-            });
-            
+            Btn_Back1.onClick.AddListener(() => { CloseMenu(); });
+
             Btn_DaoYou.onClick.AddListener(() =>
             {
                 DaoYouPanel.OpenPanel();
-                MenuRoot.SetActive(false);
+                CloseMenu();
             });
 
             Btn_Tower.onClick.AddListener(() =>
             {
                 TowerPanel.OpenPanel(1);
-                MenuRoot.SetActive(false);
+                CloseMenu();
             });
         }
 
+        private void CloseMenu()
+        {
+            UIManager.Instance.DormancyGComponent(_backgroundCom);
+            _backgroundCom = null;
+            MenuRoot.SetActive(false);
+        }
+
         public async void Btn_Shop_Click()
         {
             if (currentOpenUIPanel is ShopPanel)

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

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

Assets/Scripts/GameUI/UI/BackgroundCom.cs

@@ -0,0 +1,172 @@
+using Fort23.Core;
+using Fort23.Mono.Test;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+using UnityEngine.UI;
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "BackgroundCom")]
+    public partial class BackgroundCom : UIComponent
+    {
+        protected Material Material = new Material(Shader.Find("Unlit/MoHu"));
+        private void Init()
+        {
+            
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+        
+        
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            ManualAsyncTask ct = ManualAsyncTask.Create();
+            if (GObjectPoolInterface != null)
+            {
+                GObjectPoolInterface.SetActive(false);
+            }
+            // var rect = panelObj.AddComponent<RectTransform>();
+          
+            UIManager.Instance.RefreshFull();
+            // Shader.SetGlobalTexture(CameraTransparentColorTexture, renderTexture);
+            InterceptGamePass.SetRenderTexture(renderTexture, delegate { ct.SetResult(); }, executeCallBack: Execute);
+            await ct.Wait();
+            RawImage.texture = renderTexture;
+            
+            RawImage.SetNativeSize();
+            TimerComponent.Instance.AddTimer(500, delegate
+            {
+                UIManager.Instance.RefreshFull();
+              
+          
+            });
+            await base.AsyncInit(uiData);
+            return true;
+        }
+
+        
+
+
+        private RenderTexture renderTexture
+        {
+            get
+            {
+                if (_renderTexture == null)
+                {
+                    _renderTexture = new RenderTexture(Screen.width, Screen.height, 0, RenderTextureFormat.Default);
+                }
+
+                return _renderTexture;
+            }
+        }
+
+        private RenderTexture _renderTexture;
+
+        public override void Show()
+        {
+            base.Show();
+            transform.anchorMin = Vector2.zero;
+            transform.anchorMax = Vector2.one;
+            CanvasScaler scaler=  transform.GetComponentInParent<CanvasScaler>();
+            RectTransform scalerTran=   scaler.GetComponent<RectTransform>();
+            transform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, scalerTran.sizeDelta.x);
+            transform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, scalerTran.sizeDelta.y);
+        }
+
+        protected void Execute(ScriptableRenderContext context, RenderingData renderingData, RenderTexture renderTargetHandle, RenderTargetIdentifier source, RenderTextureDescriptor cameraTextureDescriptor)
+        {
+            if (Material == null)
+            {
+                Material = new Material(Shader.Find("Unlit/MoHu"));
+            }
+            // return;
+            LogTool.Log("回调背景图加载");
+            CommandBuffer cmd = CommandBufferPool.Get("background");
+            int w = cameraTextureDescriptor.width;
+            int h = cameraTextureDescriptor.height;
+            int randerIndex = -255;
+            RenderTargetIdentifier lasetIdentifier = default;
+            int lasetranderIndex = 10000;
+
+            for (int i = 0; i < 4; i++)
+            {
+                w /= 2;
+                h /= 2;
+                if (w <= 1 || h <= 1)
+                {
+                    break;
+                }
+            
+                int index =  Shader.PropertyToID("back_tu"+i);
+                // isTu1 = !isTu1;
+                cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear, RenderTextureFormat.ARGB32);
+                RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+                if (lasetranderIndex != 10000)
+                {
+                    cmd.Blit(lasetIdentifier, renderTargetIdentifier, Material, 0);
+                    cmd.ReleaseTemporaryRT(lasetranderIndex);
+                }
+                else
+                {
+                    cmd.Blit(source, renderTargetIdentifier, Material, 0);
+                }
+            
+                lasetIdentifier = renderTargetIdentifier;
+                lasetranderIndex = index;
+                // break;
+            }
+            
+            for (int i = 0; i < 4; i++)
+            {
+                w *= 2;
+                h *= 2;
+                if (w > cameraTextureDescriptor.width || h > cameraTextureDescriptor.height)
+                {
+                    break;
+                }
+            
+                int index =  Shader.PropertyToID("back_fd"+i);
+                cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear, RenderTextureFormat.ARGB32);
+                RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+                if (lasetranderIndex != 10000)
+                {
+                    cmd.Blit(lasetIdentifier, renderTargetIdentifier, Material, 1);
+                    cmd.ReleaseTemporaryRT(lasetranderIndex);
+                }
+            
+                lasetIdentifier = renderTargetIdentifier;
+                lasetranderIndex = index;
+                // break;
+            }
+
+
+            // int index = Shader.PropertyToID("back_tu");
+            // isTu1 = !isTu1;
+            // cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear,
+            //     RenderTextureFormat.ARGB32);
+            // RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+            // cmd.Blit(source, renderTargetIdentifier,Material,0);
+            cmd.Blit(lasetIdentifier, renderTargetHandle,Material,2);
+            cmd.ReleaseTemporaryRT(lasetranderIndex);
+            context.ExecuteCommandBuffer(cmd);
+            CommandBufferPool.Release(cmd);
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/BackgroundCom.cs.meta

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

Assets/Scripts/GameUI/UI/BackgroundComData.cs

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

Assets/Scripts/GameUI/UI/BackgroundComData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Wy9N4HukW3PQMNu/c/7OUYVBjeCauR3yIZL8ll+fIGt0VXYjg9n86YHBIhhl
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/BackgroundPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CyhOvXj4W3MSqdixehYdSNDVjTyp7OaMklZ5TLr1rfBkCAL8xOc6GSeCStFj
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanel.cs

@@ -0,0 +1,244 @@
+using Fort23.Core;
+using Fort23.Mono.Test;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "BackgroundPanel")]
+    public partial class BackgroundPanel : UIPanel
+    {
+        // public RawImage backImage;
+        public UnityAction callback;
+
+        protected Material Material;
+
+        /// <summary>
+        /// 是否激活背景开关
+        /// </summary>
+        public bool EnableBGBtn
+        {
+            get { return _enableBGBtn; }
+            set { _enableBGBtn = value; }
+        }
+
+        private bool _enableBGBtn = true;
+
+        public void Init()
+        {
+            isAddStack = false;
+            IsShowAppBar = false;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        private RenderTexture renderTexture
+        {
+            get
+            {
+                if (_renderTexture == null)
+                {
+                    _renderTexture = new RenderTexture(Screen.width, Screen.height, 0, RenderTextureFormat.Default);
+                }
+
+                return _renderTexture;
+            }
+        }
+
+        private RenderTexture _renderTexture;
+
+        public override CTask Show()
+        {
+            if (GObjectPoolInterface == null)
+            {
+                return null;
+            }
+
+            CTask cTask = CTask.Create();
+            _isShow = true;
+            GObjectPoolInterface.SetActive(true);
+            if (timerEntity != null)
+            {
+                TimerComponent.Instance.Remove(timerEntity);
+            }
+
+            if (openTimerEntity != null)
+            {
+                TimerComponent.Instance.Remove(openTimerEntity);
+            }
+
+
+            ShowAnimator();
+            cTask.SetResult();
+
+            return cTask;
+        }
+
+        protected override async CTask ProOpen()
+        {
+            ManualAsyncTask ct = ManualAsyncTask.Create();
+            // if (GObjectPoolInterface != null)
+            // {
+            //     GObjectPoolInterface.SetActive(false);
+            // }
+
+            IsClose = true;
+            isFullUI = true;
+            UIManager.Instance.RefreshFull();
+            IsClose = false;
+            // Shader.SetGlobalTexture(CameraTransparentColorTexture, renderTexture);
+            InterceptGamePass.SetRenderTexture(renderTexture, delegate { ct.SetResult(); }, executeCallBack: Execute);
+            await ct.Wait();
+            LogTool.Log("完成背景图加载");
+            if (RawImage.texture != renderTexture)
+            {
+                RawImage.texture = renderTexture;
+            }
+
+            if (GObjectPoolInterface != null)
+            {
+                GObjectPoolInterface.SetActive(true);
+            }
+
+            UIManager.Instance.RefreshFull();
+            // TimerComponent.Instance.AddTimer(500, delegate { UIManager.Instance.RefreshFull(); });
+        }
+
+        protected void Execute(ScriptableRenderContext context, RenderingData renderingData,
+            RenderTexture renderTargetHandle, RenderTargetIdentifier source,
+            RenderTextureDescriptor cameraTextureDescriptor)
+        {
+            if (Material == null)
+            {
+                Material = new Material(Shader.Find("Unlit/MoHu"));
+            }
+
+            // return;
+            // LogTool.Log("回调背景图加载");
+            CommandBuffer cmd = CommandBufferPool.Get("background");
+            int w = cameraTextureDescriptor.width;
+            int h = cameraTextureDescriptor.height;
+            int randerIndex = -255;
+            RenderTargetIdentifier lasetIdentifier = default;
+            int lasetranderIndex = 10000;
+
+            for (int i = 0; i < 4; i++)
+            {
+                w /= 2;
+                h /= 2;
+                if (w <= 1 || h <= 1)
+                {
+                    break;
+                }
+
+                int index = Shader.PropertyToID("back_tu" + i);
+                // isTu1 = !isTu1;
+                cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear, RenderTextureFormat.ARGB32);
+                RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+                if (lasetranderIndex != 10000)
+                {
+                    cmd.Blit(lasetIdentifier, renderTargetIdentifier, Material, 0);
+                    cmd.ReleaseTemporaryRT(lasetranderIndex);
+                }
+                else
+                {
+                    cmd.Blit(source, renderTargetIdentifier, Material, 0);
+                }
+
+                lasetIdentifier = renderTargetIdentifier;
+                lasetranderIndex = index;
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                w *= 2;
+                h *= 2;
+                if (w > cameraTextureDescriptor.width || h > cameraTextureDescriptor.height)
+                {
+                    break;
+                }
+
+                int index = Shader.PropertyToID("back_fd" + i);
+                cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear, RenderTextureFormat.ARGB32);
+                RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+                if (lasetranderIndex != 10000)
+                {
+                    cmd.Blit(lasetIdentifier, renderTargetIdentifier, Material, 1);
+                    cmd.ReleaseTemporaryRT(lasetranderIndex);
+                }
+
+                lasetIdentifier = renderTargetIdentifier;
+                lasetranderIndex = index;
+            }
+
+
+            // int index = Shader.PropertyToID("back_tu");
+            // isTu1 = !isTu1;
+            // cmd.GetTemporaryRT(index, w, h, 0, FilterMode.Bilinear,
+            //     RenderTextureFormat.ARGB32);
+            // RenderTargetIdentifier renderTargetIdentifier = new RenderTargetIdentifier(index);
+            // cmd.Blit(source, renderTargetIdentifier,Material,0);
+            cmd.Blit(lasetIdentifier, renderTargetHandle, Material, 2);
+            cmd.ReleaseTemporaryRT(lasetranderIndex);
+            context.ExecuteCommandBuffer(cmd);
+            CommandBufferPool.Release(cmd);
+        }
+
+
+        /// <summary>
+        /// 关闭当前有背景的面板
+        /// </summary>
+        public void CloseTopPanel()
+        {
+            if (!EnableBGBtn)
+            {
+                return;
+            }
+
+            if (UIManager.Instance.AllShowBGUIs.Count > 0 && UIManager.Instance.AllShowBGUIs[^1] != null)
+            {
+                UIPanel uiPanel = UIManager.Instance.AllShowBGUIs[^1];
+                if (!uiPanel.IsHindBackground())
+                {
+                    return;
+                }
+            }
+
+            UnityAction action = callback;
+            callback = null;
+            if (action != null)
+                action?.Invoke();
+            Close();
+            if (UIManager.Instance.AllShowBGUIs.Count > 0 && UIManager.Instance.AllShowBGUIs[^1] != null)
+            {
+                UIPanel uiPanel = UIManager.Instance.AllShowBGUIs[^1];
+                uiPanel.BackgroundCallBack();
+                UIManager.Instance.HideUIUIPanel(uiPanel);
+            }
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_BG.onClick.AddListener(CloseTopPanel);
+        }
+
+        public void CustomInit()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void Close()
+        {
+            EnableBGBtn = true;
+            base.Close();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanel.cs.meta

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

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanelData.cs

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

Assets/Scripts/GameUI/UI/BackgroundPanel/BackgroundPanelData.cs.meta

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

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -77,19 +77,19 @@ namespace Fort23.Mono
 
         public static async void OpenBoxPanel()
         {
-            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Middle);
+            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Middle,isShowBG:true);
             boxPanel.OpenPanel();
         }
 
         private void Init()
         {
             isAddStack = true;
-            // IsShowAppBar = false;
+            IsShowAppBar = false;
         }
 
         public override CTask GetFocus()
         {
-            AppBarPanel.ClosePanel();
+            // AppBarPanel.ClosePanel();
             return base.GetFocus();
         }
 

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

@@ -47,7 +47,7 @@ namespace Fort23.Mono
             base.AddButtonEvent();
         }
 
-        public void SelectState(bool isSelect)
+        public void SelectState(bool isSelect) 
         {
             _isSelect = isSelect;
             myBg.color = _isSelect ? Color.green : Color.white;

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

@@ -19,13 +19,13 @@ namespace Fort23.Mono
 	      return _icon;
 	     }
 	   }
-	  private Image _myBg;
-	  public Image myBg
+	  private MyImage _myBg;
+	  public MyImage myBg
 	   {
 	   get{
 	      if (_myBg == null)
 	       {
-	         _myBg  = GetUIUnit<Image>("myBg"); 
+	         _myBg  = GetUIUnit<MyImage>("myBg"); 
 	       }
 	      return _myBg;
 	     }
@@ -52,6 +52,28 @@ namespace Fort23.Mono
 	      return _Text_Tips;
 	     }
 	   }
+	  private RectTransform _InfoPos;
+	  public RectTransform InfoPos
+	   {
+	   get{
+	      if (_InfoPos == null)
+	       {
+	         _InfoPos  = GetUIUnit<RectTransform>("InfoPos"); 
+	       }
+	      return _InfoPos;
+	     }
+	   }
+	  private RectTransform _Icon_YingXiang;
+	  public RectTransform Icon_YingXiang
+	   {
+	   get{
+	      if (_Icon_YingXiang == null)
+	       {
+	         _Icon_YingXiang  = GetUIUnit<RectTransform>("Icon_YingXiang"); 
+	       }
+	      return _Icon_YingXiang;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -33,7 +33,7 @@ namespace Fort23.Mono
         /// </summary>
         private int infoType = 1;
 
-        SkillWidget currentSelectedSkill;
+        SkillInfo currentSelectedSkill;
 
         public static async CTask<SkillSelectPanel> OpenSkillSelectPanel()
         {
@@ -83,6 +83,8 @@ namespace Fort23.Mono
             currenRoadSkilId = PlayerManager.Instance.myHero.TaoismSkillId;
             UpdateSkillWidget();
             UpdateRoad();
+
+            CloseSelect();
             return base.AsyncInit(uiData);
         }
 
@@ -160,13 +162,14 @@ namespace Fort23.Mono
 
                     if (!IsPassiveGongFaChange(skills[i].skillConfig))
                         continue;
-                    allKongSkill[indexList[i]].SetSKill(skills[i]);
-                    allUseSkill[indexList[i]] = skills[i];
+                    allKongSkill[indexList[i][0]].SetSKill(skills[i]);
+                    allUseSkill[indexList[i][0]] = skills[i];
                 }
 
                 isAlter = true;
 
                 UpdateSkillWidget();
+                BaoChun();
             });
 
             Btn_ChangeOk.onClick.AddListener(() =>
@@ -188,7 +191,7 @@ namespace Fort23.Mono
             {
                 if (currentSelectedSkill != null)
                 {
-                    GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(currentSelectedSkill.skillConfigId);
+                    GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(currentSelectedSkill);
                     await gongFaUpgradePanel.UIClosed();
                     Sort(type1, type2);
                 }
@@ -327,13 +330,14 @@ namespace Fort23.Mono
                 UpdateSkillWidget();
                 CloseSelect();
             });
-            
+
             Sv.onValueChanged.AddListener((s) =>
             {
                 if (currentSelectedSkill == null)
                 {
                     return;
                 }
+
                 Btn_Info.transform.SetAsLastSibling();
             });
         }
@@ -352,6 +356,21 @@ namespace Fort23.Mono
             // 
         }
 
+        private void BaoChun()
+        {
+            // ChangeInfoType(1);
+            // if (isAlter)
+            {
+                PlayerManager.Instance.GongFaControl.SaveUseSkill(allUseSkill);
+
+                PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(currenRoadSkilId);
+                PlayerManager.Instance.myHero.heroData.TaoismSkillId = currenRoadSkilId;
+                AccountFileInfo.Instance.SavePlayerData();
+            }
+
+            isAlter = false;
+        }
+
         private void ChangeInfoType(int type)
         {
             if (type == 1)
@@ -374,7 +393,14 @@ namespace Fort23.Mono
 
         List<SkillInfo> showSkillInfo = new List<SkillInfo>();
 
-        List<int> indexList = new List<int>() { 0, 6, 8, 4, 2 };
+        List<List<int>> indexList = new List<List<int>>()
+        {
+            new List<int>() { 0, 1, 9 },
+            new List<int>() { 6, 7, 5 },
+            new List<int>() { 8, 9, 7 },
+            new List<int>() { 4, 5, 3 },
+            new List<int>() { 2, 3, 1 },
+        };
 
         private void Sort(int type1, int type2)
         {
@@ -503,15 +529,25 @@ namespace Fort23.Mono
 
         private SkillKongWidget dianjiSkillKongWidget;
 
-        private void OnClickSkillKongWidget(ItemWidgetBasic obj)
+        private async void OnClickSkillKongWidget(ItemWidgetBasic obj)
         {
+            SkillKongWidget skillKongWidget = obj as SkillKongWidget;
             if (infoType == 1)
+            {
+                if (skillKongWidget.SkillInfo == null)
+                    return;
+
+                GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(skillKongWidget.SkillInfo);
+                await gongFaUpgradePanel.UIClosed();
+                Sort(type1, type2);
                 return;
+            }
+
             Btn_Info.transform.SetParent(transform);
             Btn_Info.gameObject.SetActive(false);
-            currentSelectedSkill = null;
+            currentSelectedSkill = skillKongWidget.SkillInfo;
 
-            SkillKongWidget skillKongWidget = obj as SkillKongWidget;
+            // SkillKongWidget skillKongWidget = obj as SkillKongWidget;
 
             if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null && selectSkillConfig == null)
             {
@@ -548,30 +584,64 @@ namespace Fort23.Mono
                 skillKongWidget.SetSKill(selectSkillConfig);
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 CloseSelect();
+                BaoChun();
             }
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 1)
+                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 1)
+                // {
+                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                //         CloseSelect();
+                //         return;
+                //     }
+                // }
+                //
+                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 2)
+                // {
+                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                //         CloseSelect();
+                //         return;
+                //     }
+                // }
+                if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
                 {
-                    if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
-                    {
-                        TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                        CloseSelect();
-                        return;
-                    }
+                    TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                    CloseSelect();
+                    return;
                 }
 
-                if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 2)
+                if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
                 {
-                    if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
-                    {
-                        TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
-                        CloseSelect();
-                        return;
-                    }
+                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                    CloseSelect();
+                    return;
                 }
 
+                // if (selectSkillConfig.skillConfig.SkillType == 1)
+                // {
+                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                //         CloseSelect();
+                //         return;
+                //     }
+                // }
+                //
+                // if (selectSkillConfig.skillConfig.SkillType == 2)
+                // {
+                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig))
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                //         CloseSelect();
+                //         return;
+                //     }
+                // }
+
 
                 isAlter = true;
                 allUseSkill[skillKongWidget.SkillInfo.index] = null;
@@ -579,6 +649,7 @@ namespace Fort23.Mono
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 skillKongWidget.SetSKill(selectSkillConfig);
                 CloseSelect();
+                BaoChun();
             }
             else
             {
@@ -595,7 +666,10 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
-                    SelectSkill(skillKongWidget.SkillInfo, false);
+                    Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
+                    Btn_Info.gameObject.SetActive(true);
+                    SelectSkill(skillKongWidget.SkillInfo, false, false);
+                    // BaoChun();
                 }
                 else
                 {
@@ -615,6 +689,7 @@ namespace Fort23.Mono
                     skillKongWidget.SetSKill(selectSkillConfig);
                     allUseSkill[skillKongWidget.index] = selectSkillConfig;
                     CloseSelect();
+                    BaoChun();
                 }
             }
 
@@ -622,24 +697,106 @@ namespace Fort23.Mono
         }
 
 
-        public void SelectSkill(SkillInfo skillConfig, bool max)
+        public void SelectSkill(SkillInfo skillConfig, bool max, bool isClick)
         {
-            selectSkillConfig = skillConfig;
-            _isSelectSkill = true;
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
             }
 
+
             if (!max)
             {
-                for (int i = 0; i < allKongSkill.Count; i++)
+                if (isClick)
+                {
+                    int index = 0;
+
+                    //金
+                    if (skillConfig.skillConfig.attribute == 1)
+                    {
+                        index = 0;
+                    }
+
+                    //木
+                    if (skillConfig.skillConfig.attribute == 2)
+                    {
+                        index = 1;
+                    }
+
+                    //水
+                    if (skillConfig.skillConfig.attribute == 4)
+                    {
+                        index = 2;
+                    }
+
+                    //火
+                    if (skillConfig.skillConfig.attribute == 8)
+                    {
+                        index = 3;
+                    }
+
+                    //土
+                    if (skillConfig.skillConfig.attribute == 16)
+                    {
+                        index = 4;
+                    }
+
+                    bool isSuccess = false;
+
+                    //先上对应位置
+                    foreach (var i in indexList[index])
+                    {
+                        if (allKongSkill[i].SkillInfo == null)
+                        {
+                            allKongSkill[i].SetSKill(skillConfig);
+                            allUseSkill[i] = skillConfig;
+                            isSuccess = true;
+                            break;
+                        }
+                    }
+
+                    //对应位置已经上了 ，就随便找给位置上
+                    if (!isSuccess)
+                    {
+                        for (var i = 0; i < allKongSkill.Count; i++)
+                        {
+                            if (allKongSkill[i].SkillInfo == null)
+                            {
+                                allKongSkill[i].SetSKill(skillConfig);
+                                allUseSkill[i] = skillConfig;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (isSuccess)
+                    {
+                        BaoChun();
+                        ChangeFuZhuYingXiang();
+                        UpdateSkillWidget();
+                    }
+                    else
+                    {
+                        for (int i = 0; i < allKongSkill.Count; i++)
+                        {
+                            allKongSkill[i].SelectState(true);
+                        }
+                    }
+                }
+                else
                 {
-                    allKongSkill[i].SelectState(true);
+                    selectSkillConfig = skillConfig;
+                    _isSelectSkill = true;
+                    for (int i = 0; i < allKongSkill.Count; i++)
+                    {
+                        allKongSkill[i].SelectState(true);
+                    }
                 }
             }
             else
             {
+                selectSkillConfig = skillConfig;
+                _isSelectSkill = true;
                 for (int i = 0; i < allKongSkill.Count; i++)
                 {
                     if (allKongSkill[i].SkillInfo != null)
@@ -650,6 +807,8 @@ namespace Fort23.Mono
             }
         }
 
+        List<int> yingxiang = new List<int>();
+
         private void CloseSelect()
         {
             _isSelectSkill = false;
@@ -661,12 +820,68 @@ namespace Fort23.Mono
             Btn_Info.gameObject.SetActive(false);
             currentSelectedSkill = null;
 
+
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
             }
+
+            ChangeFuZhuYingXiang();
         }
 
+        private void ChangeFuZhuYingXiang()
+        {
+            yingxiang.Clear();
+            for (int i = 0; i < allKongSkill.Count; i++)
+            {
+                allKongSkill[i].Icon_YingXiang.gameObject.SetActive(false);
+
+                if (allKongSkill[i].SkillInfo != null && allKongSkill[i].SkillInfo.skillConfig.SkillType == 2 && allKongSkill[i].SkillInfo.skillConfig.PromoteLanPara_1 != null)
+                {
+                    foreach (var f in allKongSkill[i].SkillInfo.skillConfig.PromoteLanPara_1)
+                    {
+                        if (f != 0)
+                        {
+                            var nubs = GetNumbers(i, f);
+                            foreach (var nub in nubs)
+                            {
+                                if (!yingxiang.Contains(nub))
+                                {
+                                    yingxiang.Add(nub);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach (var i in yingxiang)
+            {
+                allKongSkill[i].Icon_YingXiang.gameObject.SetActive(true);
+            }
+        }
+
+        public List<int> GetNumbers(int start, float offset)
+        {
+            List<int> indexs = new List<int>();
+
+
+            for (int i = 0; i < Math.Abs(offset); i++)
+            {
+                if (offset >= 0)
+                {
+                    indexs.Add(SafeMod(start + i + 1));
+                }
+                else
+                {
+                    indexs.Add(SafeMod(start - i - 1));
+                }
+            }
+
+            // 确保结果在0-9范围内（循环数组）
+            int SafeMod(int n) => (n % 10 + 10) % 10;
+            return indexs;
+        }
 
         public override void Hide()
         {
@@ -730,7 +945,7 @@ namespace Fort23.Mono
                 Btn_Info.transform.SetParent(ContentRoot);
                 Btn_Info.transform.position = skillWidget.InfoPos.position;
                 Btn_Info.gameObject.SetActive(true);
-                currentSelectedSkill = skillWidget;
+                currentSelectedSkill = skillWidget.skillConfigId;
                 if (allUseSkill.Contains(skillWidget.skillConfigId))
                 {
                     return;
@@ -741,11 +956,11 @@ namespace Fort23.Mono
 
                 if (!IsMainGongFaChange(skillWidget.skillConfigId.skillConfig) || !IsPassiveGongFaChange(skillWidget.skillConfigId.skillConfig))
                 {
-                    SelectSkill(skillWidget.skillConfigId, true);
+                    SelectSkill(skillWidget.skillConfigId, true, true);
                 }
                 else
                 {
-                    SelectSkill(skillWidget.skillConfigId, false);
+                    SelectSkill(skillWidget.skillConfigId, false, true);
                 }
             }
         }

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

@@ -218,7 +218,7 @@ namespace Fort23.Mono
         public async static CTask<bool> OpenPanel(int levebattleId)
         {
             CTask<bool> result = CTask<bool>.Create();
-            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result });
+            BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result },isShowBG:true);
             // bossInfoPanel.CustomInit(levebattleId, result);
             return await result;
         }

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

@@ -75,7 +75,7 @@ namespace Fort23.Mono
         public static async CTask<bool> OpenPanel(AccountFileInfo.EventLinkData eventLinkData)
         {
             CTask<bool> callBack = CTask<bool>.Create();
-            await UIManager.Instance.LoadAndOpenPanel<EventTipsPanel>(null, UILayer.Top, uiData: new object[] { eventLinkData, callBack });
+            await UIManager.Instance.LoadAndOpenPanel<EventTipsPanel>(null, UILayer.Top, uiData: new object[] { eventLinkData, callBack },isShowBG:true);
             return await callBack;
         }
 

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

@@ -69,7 +69,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(ItemInfo itemInfo)
         {
-            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null,UILayer.Top, uiData: new object[] { itemInfo });
+            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null,UILayer.Top, uiData: new object[] { itemInfo },isShowBG:true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -84,7 +84,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiInfoPanel>(null, UILayer.Top,isShowBG:true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -99,7 +99,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top);
+            await UIManager.Instance.LoadAndOpenPanel<QiankundaiPanel>(null, UILayer.Top,isShowBG:true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -78,14 +78,14 @@ namespace Fort23.Mono
 
         public async static CTask<RewardsPanel> OpenPanel(Dictionary<string, ItemInfo> rewardsDic, Action onClose = null)
         {
-            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null, layer: UILayer.Top);
+            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null, layer: UILayer.Top,isShowBG:true);
             rewardsPanel.InitRewardsPanel(rewardsDic, onClose);
             return rewardsPanel;
         }
 
         public async static CTask<RewardsPanel> OpenPanel(List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0)
         {
-            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null, layer: UILayer.Top);
+            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null, layer: UILayer.Top,isShowBG:true);
             rewardsPanel.InitRewardsPanel(rewardsDic, onClose);
             if (titleId != 0)
                 rewardsPanel.SetTitle(LanguageManager.Instance.Text(titleId));

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -116,7 +116,7 @@ namespace Fort23.Mono
 
         public async static CTask<TaskInfoPanel> OpenPanel(AccountFileInfo.EventList eventList, int type)
         {
-            TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null, UILayer.Top);
+            TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null, UILayer.Top,isShowBG:true);
             taskInfoPanel.CustomInit(eventList, type);
             return taskInfoPanel;
         }

Assets/Settings/rpAsset_Renderer.asset

@@ -52,7 +52,8 @@ MonoBehaviour:
   - {fileID: 8096991511476621891}
   - {fileID: -1306005803540324591}
   - {fileID: -3260757889090043925}
-  m_RendererFeatureMap: 43d2ea46e14a5e70115f6125a422e0edeb3f3ce2f975bfd2
+  - {fileID: 5558826321195499833}
+  m_RendererFeatureMap: 43d2ea46e14a5e70115f6125a422e0edeb3f3ce2f975bfd23901f35216eb244d
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
@@ -92,6 +93,19 @@ MonoBehaviour:
   m_CopyDepthMode: 1
   m_AccurateGbufferNormals: 0
   m_IntermediateTextureMode: 1
+--- !u!114 &5558826321195499833
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1913e8483d33ab43bf9d65b9f38c99b, type: 3}
+  m_Name: InterceptGameFaeture
+  m_EditorClassIdentifier: 
+  m_Active: 1
 --- !u!114 &8096991511476621891
 MonoBehaviour:
   m_ObjectHideFlags: 0