LT 6 days ago
parent
commit
88490a3162

+ 112 - 104
Assets/Art/cs3.scene

@@ -18168,14 +18168,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 304
-      y: 864
+      x: 297
+      y: 883
       width: 99
       width: 99
       height: 70
       height: 70
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 304, y: 864}
+    atlasRectOffset: {x: 297, y: 883}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 353.5, z: 100, w: 899}
+    uvTransform: {x: 100, y: 346.5, z: 100, w: 918}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.105, y: -0.12}
   - - {x: 0.105, y: -0.12}
@@ -24071,14 +24071,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.52, y: 0.17999999}
   - - {x: 0.52, y: 0.17999999}
@@ -43754,14 +43754,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.19, y: 0.44}
   - - {x: 0.19, y: 0.44}
@@ -98775,13 +98775,13 @@ Sprite:
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
       x: 0
       x: 0
-      y: 692
+      y: 772
       width: 291
       width: 291
       height: 50
       height: 50
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 692}
+    atlasRectOffset: {x: 0, y: 772}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 145.5, z: 100, w: 717}
+    uvTransform: {x: 100, y: 145.5, z: 100, w: 797}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape: []
   m_PhysicsShape: []
   m_Bones: []
   m_Bones: []
@@ -113452,6 +113452,10 @@ PrefabInstance:
     serializedVersion: 3
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_TransformParent: {fileID: 0}
     m_Modifications:
     m_Modifications:
+    - target: {fileID: 343516389969251701, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
     - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       propertyPath: m_LocalPosition.x
       value: 0
       value: 0
@@ -113492,6 +113496,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 5101112991752729148, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
     - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_Mesh
       propertyPath: m_Mesh
       value: 
       value: 
@@ -113502,7 +113510,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
     - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_IsActive
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
@@ -121267,14 +121275,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 403
-      y: 562
+      x: 341
+      y: 419
       width: 57
       width: 57
       height: 37
       height: 37
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 403, y: 562}
+    atlasRectOffset: {x: 341, y: 419}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 431.5, z: 100, w: 580.5}
+    uvTransform: {x: 100, y: 369.5, z: 100, w: 437.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.285, y: 0.185}
   - - {x: -0.285, y: 0.185}
@@ -133257,14 +133265,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 0
-      y: 960
+      x: 536
+      y: 0
       width: 136
       width: 136
       height: 12
       height: 12
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 960}
+    atlasRectOffset: {x: 536, y: 0}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 68, z: 100, w: 966}
+    uvTransform: {x: 100, y: 604, z: 100, w: 6}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.66999996, y: 0.06}
   - - {x: -0.66999996, y: 0.06}
@@ -139122,14 +139130,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 304
-      y: 864
+      x: 297
+      y: 883
       width: 99
       width: 99
       height: 70
       height: 70
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 304, y: 864}
+    atlasRectOffset: {x: 297, y: 883}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 353.5, z: 100, w: 899}
+    uvTransform: {x: 100, y: 346.5, z: 100, w: 918}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.105, y: -0.12}
   - - {x: 0.105, y: -0.12}
@@ -158191,14 +158199,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.52, y: 0.17999999}
   - - {x: 0.52, y: 0.17999999}
@@ -189108,14 +189116,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 304
-      y: 864
+      x: 297
+      y: 883
       width: 99
       width: 99
       height: 70
       height: 70
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 304, y: 864}
+    atlasRectOffset: {x: 297, y: 883}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 353.5, z: 100, w: 899}
+    uvTransform: {x: 100, y: 346.5, z: 100, w: 918}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.105, y: -0.12}
   - - {x: 0.105, y: -0.12}
@@ -194294,7 +194302,7 @@ Camera:
   m_ShutterSpeed: 0.005
   m_ShutterSpeed: 0.005
   m_Aperture: 16
   m_Aperture: 16
   m_FocusDistance: 10
   m_FocusDistance: 10
-  m_FocalLength: 50
+  m_FocalLength: 20.78461
   m_BladeCount: 5
   m_BladeCount: 5
   m_Curvature: {x: 2, y: 11}
   m_Curvature: {x: 2, y: 11}
   m_BarrelClipping: 0.25
   m_BarrelClipping: 0.25
@@ -194309,7 +194317,7 @@ Camera:
     height: 1
     height: 1
   near clip plane: 0.3
   near clip plane: 0.3
   far clip plane: 400
   far clip plane: 400
-  field of view: 60
+  field of view: 60.000004
   orthographic: 0
   orthographic: 0
   orthographic size: 5
   orthographic size: 5
   m_Depth: -1
   m_Depth: -1
@@ -205656,14 +205664,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 403
-      y: 562
+      x: 341
+      y: 419
       width: 57
       width: 57
       height: 37
       height: 37
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 403, y: 562}
+    atlasRectOffset: {x: 341, y: 419}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 431.5, z: 100, w: 580.5}
+    uvTransform: {x: 100, y: 369.5, z: 100, w: 437.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.285, y: 0.185}
   - - {x: -0.285, y: 0.185}
@@ -215041,14 +215049,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.52, y: 0.17999999}
   - - {x: 0.52, y: 0.17999999}
@@ -339400,14 +339408,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 388
-      y: 0
+      x: 422
+      y: 91
       width: 51
       width: 51
       height: 118
       height: 118
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 388, y: 0}
+    atlasRectOffset: {x: 422, y: 91}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 413.5, z: 100, w: 59}
+    uvTransform: {x: 100, y: 447.5, z: 100, w: 150}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.205, y: -0.06}
   - - {x: 0.205, y: -0.06}
@@ -350643,14 +350651,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 176
-      y: 463
+      x: 341
+      y: 308
       width: 108
       width: 108
       height: 107
       height: 107
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 176, y: 463}
+    atlasRectOffset: {x: 341, y: 308}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 230, z: 100, w: 516.5}
+    uvTransform: {x: 100, y: 395, z: 100, w: 361.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.53999996, y: 0.13499999}
   - - {x: 0.53999996, y: 0.13499999}
@@ -368609,14 +368617,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.52, y: 0.17999999}
   - - {x: 0.52, y: 0.17999999}
@@ -393795,14 +393803,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 388
-      y: 0
+      x: 422
+      y: 91
       width: 51
       width: 51
       height: 118
       height: 118
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 388, y: 0}
+    atlasRectOffset: {x: 422, y: 91}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 413.5, z: 100, w: 59}
+    uvTransform: {x: 100, y: 447.5, z: 100, w: 150}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.205, y: -0.06}
   - - {x: 0.205, y: -0.06}
@@ -400992,13 +401000,13 @@ Sprite:
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
       x: 0
       x: 0
-      y: 692
+      y: 772
       width: 291
       width: 291
       height: 50
       height: 50
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 692}
+    atlasRectOffset: {x: 0, y: 772}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 145.5, z: 100, w: 717}
+    uvTransform: {x: 100, y: 145.5, z: 100, w: 797}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape: []
   m_PhysicsShape: []
   m_Bones: []
   m_Bones: []
@@ -412313,14 +412321,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 140
-      y: 960
+      x: 536
+      y: 16
       width: 136
       width: 136
       height: 12
       height: 12
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 140, y: 960}
+    atlasRectOffset: {x: 536, y: 16}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 208, z: 100, w: 966}
+    uvTransform: {x: 100, y: 604, z: 100, w: 22}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.66999996, y: 0.06}
   - - {x: -0.66999996, y: 0.06}
@@ -413221,14 +413229,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 341
-      y: 379
+      x: 422
+      y: 213
       width: 75
       width: 75
       height: 75
       height: 75
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 341, y: 379}
+    atlasRectOffset: {x: 422, y: 213}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 378.5, z: 100, w: 416.5}
+    uvTransform: {x: 100, y: 459.5, z: 100, w: 250.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.275, y: -0.225}
   - - {x: 0.275, y: -0.225}
@@ -437550,14 +437558,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 0
-      y: 746
+      x: 176
+      y: 651
       width: 106
       width: 106
       height: 106
       height: 106
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 746}
+    atlasRectOffset: {x: 176, y: 651}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 53, z: 100, w: 799}
+    uvTransform: {x: 100, y: 229, z: 100, w: 704}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.48, y: 0.28}
   - - {x: 0.48, y: 0.28}
@@ -446174,7 +446182,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1783644682
 --- !u!4 &1783644682
 Transform:
 Transform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -446813,14 +446821,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 403
-      y: 562
+      x: 341
+      y: 419
       width: 57
       width: 57
       height: 37
       height: 37
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 403, y: 562}
+    atlasRectOffset: {x: 341, y: 419}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 431.5, z: 100, w: 580.5}
+    uvTransform: {x: 100, y: 369.5, z: 100, w: 437.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.285, y: 0.185}
   - - {x: -0.285, y: 0.185}
@@ -447986,7 +447994,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1820556009
 --- !u!4 &1820556009
 Transform:
 Transform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -470480,14 +470488,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 388
-      y: 0
+      x: 422
+      y: 91
       width: 51
       width: 51
       height: 118
       height: 118
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 388, y: 0}
+    atlasRectOffset: {x: 422, y: 91}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 413.5, z: 100, w: 59}
+    uvTransform: {x: 100, y: 447.5, z: 100, w: 150}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.205, y: -0.06}
   - - {x: 0.205, y: -0.06}
@@ -501566,14 +501574,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 304
-      y: 864
+      x: 297
+      y: 883
       width: 99
       width: 99
       height: 70
       height: 70
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 304, y: 864}
+    atlasRectOffset: {x: 297, y: 883}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 353.5, z: 100, w: 899}
+    uvTransform: {x: 100, y: 346.5, z: 100, w: 918}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.105, y: -0.12}
   - - {x: 0.105, y: -0.12}
@@ -510212,14 +510220,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 304
-      y: 864
+      x: 297
+      y: 883
       width: 99
       width: 99
       height: 70
       height: 70
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 304, y: 864}
+    atlasRectOffset: {x: 297, y: 883}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 353.5, z: 100, w: 899}
+    uvTransform: {x: 100, y: 346.5, z: 100, w: 918}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.105, y: -0.12}
   - - {x: 0.105, y: -0.12}
@@ -549805,14 +549813,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 288
-      y: 463
+      x: 205
+      y: 871
       width: 88
       width: 88
       height: 88
       height: 88
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 288, y: 463}
+    atlasRectOffset: {x: 205, y: 871}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 332, z: 100, w: 507}
+    uvTransform: {x: 100, y: 249, z: 100, w: 915}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.52, y: 0.17999999}
   - - {x: 0.52, y: 0.17999999}
@@ -552217,14 +552225,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 403
-      y: 562
+      x: 341
+      y: 419
       width: 57
       width: 57
       height: 37
       height: 37
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 403, y: 562}
+    atlasRectOffset: {x: 341, y: 419}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 431.5, z: 100, w: 580.5}
+    uvTransform: {x: 100, y: 369.5, z: 100, w: 437.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.285, y: 0.185}
   - - {x: -0.285, y: 0.185}
@@ -646055,7 +646063,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &3077886887563689596
 --- !u!4 &3077886887563689596
 Transform:
 Transform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/xiuxian/cs/cj01.asset

@@ -33,10 +33,10 @@ MonoBehaviour:
     m_Value: 1
     m_Value: 1
   threshold:
   threshold:
     m_OverrideState: 1
     m_OverrideState: 1
-    m_Value: 4.05
+    m_Value: 1.2
   intensity:
   intensity:
     m_OverrideState: 1
     m_OverrideState: 1
-    m_Value: 5.93
+    m_Value: 4
   scatter:
   scatter:
     m_OverrideState: 1
     m_OverrideState: 1
     m_Value: 0.7
     m_Value: 0.7

+ 8 - 8
UserSettings/EditorUserSettings.asset

@@ -21,28 +21,28 @@ EditorUserSettings:
       value: 184c
       value: 184c
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-0:
     RecentlyUsedSceneGuid-0:
-      value: 5b5351570100080a095d5f7a40700a44424f1a2b782a7f327b7a4432e6e5606b
+      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-1:
     RecentlyUsedSceneGuid-1:
-      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
+      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-2:
     RecentlyUsedSceneGuid-2:
-      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-3:
     RecentlyUsedSceneGuid-3:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-4:
     RecentlyUsedSceneGuid-4:
-      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-5:
     RecentlyUsedSceneGuid-5:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-6:
     RecentlyUsedSceneGuid-6:
-      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
+      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-7:
     RecentlyUsedSceneGuid-7:
-      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
+      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
       flags: 0
     RecentlyUsedSceneGuid-8:
     RecentlyUsedSceneGuid-8:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

BIN
美术/art_use_ui/bg/bg_lh_chouniao.png


BIN
美术/art_use_ui/tongyong/dec_yuanquan2.png


BIN
美术/参考/功法界面 装配 辅助.png