changed weapon

2022-04-12 14:05:55 +07:00
parent 25cd6df71b
commit 95f61ab7e2
7 changed files with 211 additions and 253 deletions
--- a/Assets/Scenes/dont
+++ b/Assets/Scenes/dont
@ -212,8 +212,97 @@ Transform:
  m_LocalScale: {x: 100, y: 1, z: 100}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &440413021
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 28.21
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 10.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 46.67
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: m_Name
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: settings.MovementSwayX
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: settings.MovementSwayY
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: settings.MovementSwaySmoothing
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 8510909888689775086, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+        type: 3}
+      propertyPath: settings.MovementSwayYInverted
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3}
 --- !u!1 &676942498
 GameObject:
  m_ObjectHideFlags: 0
@ -304,157 +393,5 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1991868003
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1991868006}
-  - component: {fileID: 1991868005}
-  - component: {fileID: 1991868004}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!81 &1991868004
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1991868003}
-  m_Enabled: 1
--- !u!20 &1991868005
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1991868003}
-  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_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  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: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
--- !u!4 &1991868006
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1991868003}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &8510909887784509496
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 32.94
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 10.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 46.67
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480103, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
-        type: 3}
-      propertyPath: m_Name
-      value: Player
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}