Merge branch 'move_char_in_main' into 'main'

moved character to starting position See merge request kernel-panic/revival!72
2021-04-25 19:20:00 +00:00 · 2021-04-25 19:20:00 +00:00 · 5a899f6877
parent 88b2b9aa10 f91b7918b3
commit 5a899f6877
1 changed files with 141 additions and 145 deletions
--- a/game/Assets/Scenes/Main.unity
+++ b/game/Assets/Scenes/Main.unity
@ -1796,151 +1796,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 3340651998927408397, guid: e182e6daf2f187b45a07e7c89e3f1b55, type: 3}
  m_PrefabInstance: {fileID: 489969879}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &491911248
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.034656826
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.0019042965
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.91706365
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.39722723
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.03933716
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.25224686
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.7196195
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.97121775
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.2292728
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.062848374
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.01483645
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_Name
-      value: PlayerObjects
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 92.171265
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 10.023724
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -245.18256
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.034656808
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.001904296
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.91706365
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.39722723
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.03933716
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.25224686
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.7196195
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.08924791
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.004903927
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.91394365
-      objectReference: {fileID: 0}
-    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.39587584
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
 --- !u!1 &493198196 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
@ -9538,6 +9393,147 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 0.0099956095, y: 0.04649781, z: 0.010708005}
  m_Center: {x: 0.0020173425, y: 0.023248905, z: -0.0053540035}
+--- !u!1001 &2069078696
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.034657836
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0019043772
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.9170634
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.3972279
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.039340973
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.25224686
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.719612
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9712092
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.22927156
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.062977746
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.014867039
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_Name
+      value: PlayerObjects
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -25.406586
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.291893
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 85.12987
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: _cheatBlink
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: _cheatBoost
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: _cheatFreeze
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.034657836
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0019043772
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.25224686
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.08938038
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.00491127
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.91393256
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.3958717
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
 --- !u!4 &2079078649 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3}