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

Assets/Art/Environment/cj01.prefab

@@ -29,8 +29,8 @@ Transform:
   m_GameObject: {fileID: 343516389969251701}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -4, z: 0}
-  m_LocalScale: {x: 500, y: 30, z: 500}
+  m_LocalPosition: {x: 0, y: 6, z: 0}
+  m_LocalScale: {x: 1000, y: 30, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4177647096219069143}
@@ -106,13 +106,13 @@ MonoBehaviour:
   _fogDepth: 15
   secFogMin: 0
   secFogMax: 1
-  worldSize: {x: 500, y: 30, z: 500}
+  worldSize: {x: 1000, y: 30, z: 500}
   fogFalloffType: 0
   fogFalloffCurve: 1
   sortingLayer: Default
   sortingOrder: 0
   renderingLayerMask: 4294967295
-  fogColor: {r: 0.4862745, g: 0.69496423, b: 0.7372549, a: 1}
+  fogColor: {r: 0.28465086, g: 0.6745281, b: 0.6745281, a: 1}
   blendType: 0
   fogMeshType: 0
   customMesh: {fileID: 0}
@@ -122,6 +122,93 @@ MonoBehaviour:
   lightScatteringFactor: 0.35
   lightReflectivity: 0.5
   lightTransmission: 0.5
+--- !u!1 &747153756437657183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4147007831133005773}
+  - component: {fileID: 8518126851075638762}
+  - component: {fileID: 2757358145148161493}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuanjing_huan (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4147007831133005773
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 747153756437657183}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.0009873678, y: -0.7071061, z: -0.7071061, w: -0.0009873678}
+  m_LocalPosition: {x: 0, y: -5.8999996, z: 0}
+  m_LocalScale: {x: 0.99754554, y: 0.99754554, z: 0.99754554}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4177647096219069143}
+  m_LocalEulerAnglesHint: {x: -90, y: -180.16, z: 0}
+--- !u!33 &8518126851075638762
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 747153756437657183}
+  m_Mesh: {fileID: -951608786083511892, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
+--- !u!23 &2757358145148161493
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 747153756437657183}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c9fb8078a489c764e9c5286bb9821001, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &2538985419114079488
 GameObject:
   m_ObjectHideFlags: 0
@@ -150,7 +237,7 @@ Transform:
   m_GameObject: {fileID: 2538985419114079488}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 1.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -324,7 +411,7 @@ Transform:
   m_GameObject: {fileID: 5101112991752729148}
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 6, z: 0}
+  m_LocalPosition: {x: 0, y: 10, z: 0}
   m_LocalScale: {x: 400.00003, y: 400.00003, z: 400.00003}
   m_ConstrainProportionsScale: 1
   m_Children: []
@@ -411,7 +498,7 @@ Transform:
   m_GameObject: {fileID: 6121734615867636914}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 1.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -496,7 +583,7 @@ Transform:
   m_GameObject: {fileID: 8929588464290711568}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 255.34705}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -505,5 +592,6 @@ Transform:
   - {fileID: 1398171176346647818}
   - {fileID: 6899256924629427720}
   - {fileID: 4784936043935605366}
+  - {fileID: 4147007831133005773}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Art/Environment/yuanjing/yuanjing_shan.mat

@@ -166,7 +166,7 @@ Material:
     - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainTexChannel: {r: 0, g: 0, b: 0, a: 1}
-    - _Main_Color: {r: 0.55660367, g: 1, b: 0.9232272, a: 1}
+    - _Main_Color: {r: 0.29476666, g: 0.9056602, b: 0.79813266, a: 1}
     - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
     - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

Assets/Art/HeroTimeLine/gf_1101_timeline.playable

@@ -51,8 +51,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 48096893300798330}
-    m_Duration: 0.8
+    m_Asset: {fileID: -3122444872618145490}
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -4482353584805677838}
     m_EaseInDuration: 0
@@ -116,7 +116,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack2
+    m_DisplayName: attack3_1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -164,6 +164,30 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-3122444872618145490
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &-2619250345888704379
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -188,8 +212,8 @@ MonoBehaviour:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 3710049619119919713}
-    m_Duration: 0.8
+    m_Asset: {fileID: 3397919037254164628}
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2619250345888704379}
     m_EaseInDuration: 0
@@ -253,7 +277,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: attack2
+    m_DisplayName: attack3_1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -334,6 +358,8 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-827030417008028583
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -356,7 +382,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.43333333333333335
+    m_Start: 0.9
     m_ClipIn: 0
     m_Asset: {fileID: -1891357024015680945}
     m_Duration: 1
@@ -448,30 +474,6 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &48096893300798330
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset(Clone)
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
 --- !u!114 &315511387929670580
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -497,7 +499,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 5982826750523852091}
-    m_Duration: 0.8
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: 315511387929670580}
     m_EaseInDuration: 0
@@ -602,7 +604,9 @@ MonoBehaviour:
   isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
---- !u!114 &3710049619119919713
+  isRoat: 0
+  roatIndex: 0
+--- !u!114 &3397919037254164628
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -614,7 +618,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
   m_Name: TimeLinePlayEntityAnimtionAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
+  m_Clip: {fileID: 1827226128182048838, guid: 6014afcc65ff52a4e846fd0c1483c9b6, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -651,7 +655,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 5904406818350819231}
-    m_Duration: 0.8
+    m_Duration: 1.6
     m_TimeScale: 1
     m_ParentTrack: {fileID: 5651971833199858375}
     m_EaseInDuration: 0
@@ -788,7 +792,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.43333333333333335
+    m_Start: 0.9
     m_ClipIn: 0
     m_Asset: {fileID: 3170206750459385421}
     m_Duration: 1

Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat

@@ -65,5 +65,5 @@ Material:
     - _ViewOffset: 0
     - _ruiHua: 160
     m_Colors:
-    - _Color: {r: 0.5537556, g: 0.8353568, b: 0.8632074, a: 1}
+    - _Color: {r: 0.44633308, g: 0.7917246, b: 0.8018867, a: 1}
   m_BuildTextureStacks: []

Assets/Art/Sky/Clouds/Cloud1.mat

@@ -124,7 +124,7 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
-    - _TintColor: {r: 0.7406104, g: 0.8696661, b: 0.8820753, a: 1}
+    - _TintColor: {r: 0.62911606, g: 0.89558655, b: 0.9198112, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &5518186041415693050
 MonoBehaviour:

Assets/Art/Sky/Skybox_01.mat

@@ -86,6 +86,6 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _GroundColor: {r: 0.33579552, g: 0.7243991, b: 0.7264149, a: 1}
-    - _SkyTint: {r: 0.30693737, g: 0.61447835, b: 0.7311319, a: 1}
+    - _GroundColor: {r: 0.3626734, g: 0.7688678, b: 0.76177335, a: 1}
+    - _SkyTint: {r: 0.23028646, g: 0.70754707, b: 0.68348354, a: 1}
   m_BuildTextureStacks: []

Assets/Art/cs3.scene

@@ -88944,7 +88944,7 @@ Transform:
   m_GameObject: {fileID: 765246468}
   serializedVersion: 2
   m_LocalRotation: {x: 0.17195824, y: -0.13705875, z: 0.024167152, w: 0.9752237}
-  m_LocalPosition: {x: 3.3, y: 24.48, z: -8.34}
+  m_LocalPosition: {x: 3.3, y: 26, z: -8.34}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -395113,7 +395113,7 @@ MonoBehaviour:
     isActive: 0
     controlPoints: []
     allDis: 0
-  maxDis: 20
+  maxTime: 10
 --- !u!1 &7623067623462084203
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/TimeLineAssets/2008_timeline_TD.txt

@@ -1 +1 @@
-{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_boss01_sk1_jian\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos9\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}
+{"timeLineName":"2008_timeline","key":["TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.9333333,\"continuedTime\":0.9333333,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_2008\",\"randomSeed\":518,\"locationType\":0,\"targetSpecialDotName\":\"zdpos3\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"2008\",\"isActivity\":false,\"startTime\":0.4,\"endTime\":1.4,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"2008_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Scenes/testCombat.scene

@@ -2317,7 +2317,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -2585,6 +2585,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 65994213146227239, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4286731389157393447, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
       propertyPath: m_Name
       value: CombatRoot (2)
@@ -4815,6 +4819,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: fx_gf_1402
       objectReference: {fileID: 0}
+    - target: {fileID: 7797750196052067437, guid: 6f534ee82fac4dc4a9645fab3c90b70c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -6827,10 +6835,26 @@ PrefabInstance:
       propertyPath: m_Name
       value: Nanzhu (3)
       objectReference: {fileID: 0}
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3780976137779322548, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.data[2].key
+      value: 
+      objectReference: {fileID: -4482353584805677838, guid: d230057e7ee2e5a4888a743312f643a6, type: 2}
+    - target: {fileID: 5141869877783431263, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.data[3].key
+      value: 
+      objectReference: {fileID: 315511387929670580, guid: d230057e7ee2e5a4888a743312f643a6, type: 2}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.032
@@ -9504,11 +9528,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.105
+      value: -54
       objectReference: {fileID: 0}
     - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
       propertyPath: m_LocalPosition.y
@@ -12235,26 +12259,6 @@ Sprite:
     - {x: 0.415, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!1 &280866918903657627
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5496476638347437383}
-  - component: {fileID: 4565069964499937095}
-  - component: {fileID: 5001841207918067277}
-  - component: {fileID: 1312737278257156462}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: "\u5730\u9762"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1001 &347310670940501196
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12321,28 +12325,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 9037135992368401232, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
   m_PrefabInstance: {fileID: 4528544957638999448}
   m_PrefabAsset: {fileID: 0}
---- !u!64 &1312737278257156462
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866918903657627}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 0
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &2430196628191906972
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12904,14 +12886,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c0bbf88f117d28341976bf57a93358dc, type: 3}
---- !u!33 &4565069964499937095
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866918903657627}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &4885491695541437786
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12973,51 +12947,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
---- !u!23 &5001841207918067277
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866918903657627}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 1388b1b9d8e6e094f8200ed6165c226d, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!4 &5102730602139337721
 Transform:
   m_ObjectHideFlags: 0
@@ -13051,21 +12980,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5496476638347437383
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 280866918903657627}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.21, z: 0}
-  m_LocalScale: {x: 1000, y: 1, z: 1000}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &6588466611375917160
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13317,7 +13231,6 @@ SceneRoots:
   - {fileID: 501511835}
   - {fileID: 6588466611375917160}
   - {fileID: 461893080}
-  - {fileID: 5496476638347437383}
   - {fileID: 2101400848}
   - {fileID: 1663534286}
   - {fileID: 6794712585992138843}

Assets/xiuxian/cs/cj01.asset

@@ -77,7 +77,7 @@ MonoBehaviour:
   active: 1
   color:
     m_OverrideState: 1
-    m_Value: {r: 0.18922047, g: 0.30690756, b: 0.48247975, a: 1}
+    m_Value: {r: 0.1277144, g: 0.2988484, b: 0.3867923, a: 1}
   center:
     m_OverrideState: 1
     m_Value: {x: 0.5, y: 0.5}

UserSettings/EditorUserSettings.asset

@@ -39,13 +39,13 @@ EditorUserSettings:
       value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 070803025d005d095e085875407a084447161b282f7f72332b2c4832e1b46560
+      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0750575e51500c020b0b0a7047715a4417154f73747b73622c2d4930b4e5356b
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68