调法宝

Assets/Art/ArtHero/FaBao/fb_feicuihulu.prefab

@@ -1518,6 +1518,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_fb_fchl_sk1
       objectReference: {fileID: 0}
+    - target: {fileID: 8256926949887815600, guid: 606c22d91be554f4bbd7217954e40c6e, type: 3}
+      propertyPath: looping
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/HeroTimeLine/fb_3101Timeline.playable

@@ -1887,8 +1887,8 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 2
-  LocationType: 6
-  targetSpecialDotName: hitpos
+  LocationType: 1
+  targetSpecialDotName: 
   isUseRandom: 0
   xoff:
     x: 0

Assets/Art/HeroTimeLine/fb_feicuihuluTimeline.playable

@@ -234,6 +234,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -245,6 +255,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-8034426028797582310
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -509,6 +521,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 1
@@ -520,6 +542,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-7085830990955574545
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -789,6 +813,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -800,6 +834,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5612225699036068517
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2065,7 +2101,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -2101,6 +2137,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2112,6 +2158,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &4343726249989337701
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2138,6 +2186,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 1
@@ -2149,6 +2207,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &4448712841006758773
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2371,6 +2431,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2382,6 +2452,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &5429137194201106246
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2538,6 +2610,16 @@ MonoBehaviour:
   targetType: 2
   LocationType: 5
   targetSpecialDotName: hitpos
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2549,6 +2631,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &5946645958756819507
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2709,6 +2793,16 @@ MonoBehaviour:
   targetType: 1
   LocationType: 0
   targetSpecialDotName: 
+  isUseRandom: 0
+  xoff:
+    x: 0
+    y: 0
+  yoff:
+    x: 0
+    y: 0
+  zoff:
+    x: 0
+    y: 0
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -2720,6 +2814,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &7472383952580944320
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/FXPrefabs/fx gw laoshu zd.prefab

@@ -50,7 +50,7 @@ ParticleSystem:
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
   looping: 1
-  prewarm: 1
+  prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 1
@@ -4848,6 +4848,7 @@ GameObject:
   - component: {fileID: 4549703131287283796}
   - component: {fileID: 3160199261674094191}
   - component: {fileID: 782681925891191511}
+  - component: {fileID: 1334813863390521901}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx gw laoshu zd
@@ -9765,8 +9766,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0.05
-  multipleTargetDelayTime: 0.05
+  delayTime: 0
+  multipleTargetDelayTime: 0.1
   hitFxName: fx gw laoshu zd hit
   hitAudioName: 
   extraMoveSpeed: 0
@@ -9779,7 +9780,7 @@ MonoBehaviour:
   speed: 25
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 1
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0
@@ -9815,6 +9816,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!114 &1334813863390521901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2645004484261668492}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfa417b106904e3fa8b8fdd30dfb0e38, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  delayTime: 0.5
 --- !u!1 &5123393947038394162
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/VFX/FXPrefabs/fx gw laoshu zd2.prefab

@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 1715080383429979467}
   - component: {fileID: 2577776868371586833}
   - component: {fileID: 807974181331508196}
+  - component: {fileID: 8124084742442216092}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx gw laoshu zd2
@@ -4932,7 +4933,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
   delayTime: 0.05
-  multipleTargetDelayTime: 0.05
+  multipleTargetDelayTime: 0.1
   hitFxName: fx gw laoshu zd hit
   hitAudioName: 
   extraMoveSpeed: 0
@@ -4942,10 +4943,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 25
+  speed: 20
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 1
+  parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0
@@ -4981,6 +4982,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!114 &8124084742442216092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1167458265066089995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfa417b106904e3fa8b8fdd30dfb0e38, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  delayTime: 0.5
 --- !u!1 &2519124762303103111
 GameObject:
   m_ObjectHideFlags: 0
@@ -15054,7 +15068,7 @@ ParticleSystem:
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
   looping: 1
-  prewarm: 1
+  prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 1

Assets/Art/VFX/FXPrefabs/fx_fb_3101_sk1_hit.prefab

@@ -14821,7 +14821,7 @@ Transform:
   m_GameObject: {fileID: 2757034005509049786}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0.56, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 1
   m_Children:

Assets/Art/VFX/FXPrefabs/fx_fb_boss01_sk1_hit.prefab

@@ -28,7 +28,7 @@ Transform:
   m_GameObject: {fileID: 821042189767594873}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0.46, z: 0}
+  m_LocalPosition: {x: 0, y: -0.24, z: 0}
   m_LocalScale: {x: 0.6597, y: 0.6597, z: 0.6597}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -288,7 +288,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 5.89
+      scalar: 8.5
       minScalar: 1
       maxCurve:
         serializedVersion: 2
@@ -4868,7 +4868,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -4929,7 +4929,7 @@ Transform:
   m_GameObject: {fileID: 1343276478724698450}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0.38, z: 0}
+  m_LocalPosition: {x: 0, y: -0.13, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5189,7 +5189,7 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 2.35
+      scalar: 3.27
       minScalar: 7
       maxCurve:
         serializedVersion: 2
@@ -14725,7 +14725,7 @@ Transform:
   m_GameObject: {fileID: 2454718813890665105}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0.3800001, z: 0}
+  m_LocalPosition: {x: 0, y: -0.21, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -14921,7 +14921,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.2559321, g: 0.046257503, b: 0.3632074, a: 0.827451}
+      maxColor: {r: 0.2559321, g: 0.046257503, b: 0.3632074, a: 0.8}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14985,8 +14985,8 @@ ParticleSystem:
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 2.38
-      minScalar: 1.43
+      scalar: 4
+      minScalar: 2
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -15449,7 +15449,7 @@ ParticleSystem:
     sphericalDirectionAmount: 0
     randomPositionAmount: 0
     radius:
-      value: 0.27
+      value: 0.4
       mode: 0
       spread: 0
       speed:
@@ -19565,7 +19565,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19626,8 +19626,8 @@ Transform:
   m_GameObject: {fileID: 2546174953762904645}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0.42, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: -0.27, z: 0}
+  m_LocalScale: {x: 1.1547, y: 1.1547, z: 1.1547}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7880107671453862435}
@@ -20264,7 +20264,7 @@ ParticleSystem:
     serializedVersion: 6
     enabled: 1
     type: 4
-    angle: 35
+    angle: 45
     length: 5
     boxThickness: {x: 0, y: 0, z: 0}
     radiusThickness: 0
@@ -20579,7 +20579,7 @@ ParticleSystem:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 8
+        scalar: 12
         minScalar: 30
         maxCurve:
           serializedVersion: 2
@@ -24599,8 +24599,8 @@ Transform:
   m_GameObject: {fileID: 3060708646524156310}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.08, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0, y: 0.25, z: 0}
+  m_LocalScale: {x: 1.1458, y: 1.1458, z: 1.1458}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7880107671453862435}
@@ -25965,7 +25965,7 @@ ParticleSystem:
         ctime7: 0
         atime0: 0
         atime1: 5879
-        atime2: 43754
+        atime2: 46260
         atime3: 65535
         atime4: 0
         atime5: 0
@@ -29439,7 +29439,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -29500,7 +29500,7 @@ Transform:
   m_GameObject: {fileID: 4553177508458703218}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: -0.6, z: 0}
+  m_LocalPosition: {x: 0, y: -0.28, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -30138,7 +30138,7 @@ ParticleSystem:
     serializedVersion: 6
     enabled: 1
     type: 4
-    angle: 70
+    angle: 46
     length: 5
     boxThickness: {x: 0, y: 0, z: 0}
     radiusThickness: 0
@@ -32161,7 +32161,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.3
+    dampen: 0.19
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -34331,7 +34331,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -37062,7 +37062,7 @@ ParticleSystem:
     inWorldSpace: 0
     multiplyDragByParticleSize: 1
     multiplyDragByParticleVelocity: 1
-    dampen: 0.4
+    dampen: 0.35
     drag:
       serializedVersion: 2
       minMaxState: 0
@@ -39292,7 +39292,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5073400884905303504}
   serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.86, y: 0.23999977, z: -1.19}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

Assets/Art/VFX/FXPrefabs/fx_fb_fchl_sk1.prefab

@@ -49,7 +49,7 @@ ParticleSystem:
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 0
+  looping: 1
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -4953,7 +4953,7 @@ ParticleSystem:
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 0
+  looping: 1
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -9787,7 +9787,7 @@ ParticleSystem:
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 0
+  looping: 1
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
@@ -14630,7 +14630,7 @@ ParticleSystem:
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   emitterVelocityMode: 1
-  looping: 0
+  looping: 1
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0

Assets/Scenes/testCombat.scene

@@ -2201,7 +2201,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 0
+      value: 10000
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10002
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]

UserSettings/Layouts/default-2022.dwlt

@@ -15,16 +15,68 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 36.57143
-    width: 2194.286
-    height: 1156.5715
+    y: 32.000004
+    width: 1920.0002
+    height: 1012.0001
   m_ShowMode: 4
-  m_Title: "\u5C42\u7EA7"
-  m_RootView: {fileID: 3}
+  m_Title: "\u68C0\u67E5\u5668"
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: TimelineWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 490.00003
+    width: 536
+    height: 472.00003
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 12}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 431.00003
+    y: 0
+    width: 536
+    height: 962.00006
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 42
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,16 +93,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 588
-    height: 1106.5714
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 14}
+    width: 431.00003
+    height: 962.00006
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,22 +115,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 4}
-  - {fileID: 5}
   - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2194.2856
-    height: 1156.5714
+    width: 1920.0001
+    height: 1012.00006
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -95,12 +147,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2194.2856
+    width: 1920.0001
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,23 +165,23 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 10}
-  - {fileID: 7}
-  - {fileID: 8}
+  - {fileID: 4}
+  - {fileID: 3}
   - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2194.2856
-    height: 1106.5714
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
+    width: 1920.0001
+    height: 962.00006
+  m_MinSize: {x: 500, y: 100}
+  m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
   controlID: 41
   draggingID: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -145,12 +197,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1136.5714
-    width: 2194.2856
+    y: 992.00006
+    width: 1920.0001
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -165,18 +217,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1105.1428
+    x: 967.00006
     y: 0
-    width: 344.5714
-    height: 1106.5714
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 11}
+    width: 364.00006
+    height: 962.00006
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -191,18 +243,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1449.7142
+    x: 1331.0001
     y: 0
-    width: 452.57153
-    height: 1106.5714
+    width: 274
+    height: 962.00006
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,18 +269,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1902.2858
+    x: 1605.0001
     y: 0
-    width: 291.99988
-    height: 1106.5714
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+    width: 315
+    height: 962.00006
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,18 +295,61 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 588
+    x: 0
     y: 0
-    width: 517.1428
-    height: 1106.5714
+    width: 536
+    height: 490.00003
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: "\u65F6\u95F4\u8F74"
+    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 431.00006
+    y: 552.00006
+    width: 534
+    height: 451.00003
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: -26358
+    m_SubElements: []
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -274,10 +369,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1105.143
-    y: 66.85715
-    width: 342.5714
-    height: 1085.5714
+    x: 967.0001
+    y: 62.000008
+    width: 362.00006
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -291,9 +386,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 0a44ffff
       m_LastClickedID: 0
-      m_ExpandedIDs: 2025feff3646feff3c46feff128bfeffd417ffff7efaffff86c90000aeda0000
+      m_ExpandedIDs: 0a6dffff8c91ffff9491ffff7893ffff4897fffff898ffff1099fffff6d7ffff7efaffffa0fb0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -309,7 +404,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -317,7 +412,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &12
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -337,10 +432,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1902.2858
-    y: 66.85715
-    width: 290.99988
-    height: 1085.5714
+    x: 1605.0002
+    y: 62.000008
+    width: 314
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -364,7 +459,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &13
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -384,10 +479,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1449.7144
-    y: 66.85715
-    width: 450.57153
-    height: 1085.5714
+    x: 1331.0001
+    y: 62.000008
+    width: 272
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -409,7 +504,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Environment/yuanjing
+    - Assets/Art/ArtHero/FaBao
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -417,32 +512,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Environment/yuanjing/Landscapes_Env
+  - Assets/Art/ArtHero/FaBao
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\XY002\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 78.42859}
-    m_SelectedIDs: 167d0100
-    m_LastClickedID: 97558
-    m_ExpandedIDs: 00000000327c0100347c0100367c0100387c01003a7c01003c7c01003e7c0100407c0100427c0100447c0100467c0100487c01004a7c01004c7c01004e7c0100507c0100527c0100547c0100567c01005a7c01005c7c01005e7c0100607c0100627c010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: a8850100
+    m_LastClickedID: 99752
+    m_ExpandedIDs: 0000000064f0000066f0000068f000006af000006cf000006ef0000070f0000072f0000074f0000076f0000078f000007af000007cf000007ef0000080f0000082f0000084f0000086f0000088f000008af000008cf000008ef0000090f0000092f000003cf1000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: yuanjing
-      m_OriginalName: yuanjing
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 97558
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 10}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -454,7 +549,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000327c0100347c0100367c0100387c01003a7c01003c7c01003e7c0100407c0100427c0100447c0100467c0100487c01004a7c01004c7c01004e7c0100507c0100527c0100547c0100567c0100587c01005a7c01005c7c01005e7c0100607c0100627c0100
+    m_ExpandedIDs: 0000000064f0000066f0000068f000006af000006cf000006ef0000070f0000072f0000074f0000076f0000078f000007af000007cf000007ef0000080f0000082f0000084f0000086f0000088f000008af000008cf000008ef0000090f0000092f00000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -485,20 +580,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: 00000000e8cb0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: LevelBattle01
-      m_OriginalName: LevelBattle01
+      m_Name: cs3
+      m_OriginalName: cs3
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 127176
+      m_UserData: 62016
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -509,8 +604,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 220.57153
---- !u!114 &14
+  m_DirectoriesAreaWidth: 163.5
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -531,9 +626,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 66.85715
-    width: 587
-    height: 1085.5714
+    y: 62.000008
+    width: 430.00003
+    height: 941.00006
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -565,10 +660,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -214.28572
-    m_HBaseRangeMax: 214.28572
-    m_VBaseRangeMin: -464.00003
-    m_VBaseRangeMax: 464.00003
+    m_HBaseRangeMin: -187.50002
+    m_HBaseRangeMax: 187.50002
+    m_VBaseRangeMin: -406.00006
+    m_VBaseRangeMax: 406.00006
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -586,29 +681,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 587
-      height: 1064.5714
+      width: 430.00003
+      height: 920.00006
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 293.5, y: 532.2857}
+    m_Translation: {x: 215.00002, y: 460.00003}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -293.5
-      y: -532.2857
-      width: 587
-      height: 1064.5714
+      x: -215.00002
+      y: -460.00003
+      width: 430.00003
+      height: 920.00006
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1027.25, y: 1899.75}
+  m_LastWindowPixelSize: {x: 860, y: 1882}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &15
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -628,10 +723,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 588
-    y: 66.85715
-    width: 515.1428
-    height: 1085.5714
+    x: 431.00006
+    y: 62.000008
+    width: 534
+    height: 469.00003
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -867,7 +962,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25.000002}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Particles
@@ -1016,9 +1111,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -5.75029, y: -9.819214, z: 53.68802}
+    m_Target: {x: 1.8691969, y: 22.489828, z: 9.938814}
     speed: 2
-    m_Value: {x: -5.75029, y: -9.819214, z: 53.68802}
+    m_Value: {x: 1.8691969, y: 22.489828, z: 9.938814}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1056,7 +1151,7 @@ MonoBehaviour:
       m_Fade:
         m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1064,13 +1159,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.26174253, y: -0.28525826, z: 0.0812248, w: -0.9184812}
+    m_Target: {x: -0.13527954, y: 0.77384883, z: -0.1766243, w: -0.5930865}
     speed: 2
-    m_Value: {x: -0.2616615, y: -0.28603306, z: 0.0814456, w: -0.91819656}
+    m_Value: {x: -0.13540584, y: 0.7733689, z: -0.17651482, w: -0.5936399}
   m_Size:
-    m_Target: 154.02806
+    m_Target: 7.4498453
     speed: 2
-    m_Value: 301.30875
+    m_Value: 7.129039
   m_Ortho:
     m_Target: 0
     speed: 2