fixing character position in the scene

ChristyanS · Apr 17, 2021 · b724df3 · b724df3
1 parent e46027f
commit b724df3
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 36 deletions.
diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity
@@ -2024,7 +2024,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 172115105}
-  m_LocalRotation: {x: 0.018189492, y: -0.000000029802322, z: -0, w: 0.99983466}
+  m_LocalRotation: {x: 0.01818949, y: 0.00000008940697, z: 9.313226e-10, w: 0.9998346}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -3234,7 +3234,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!65 &240975405
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -3675,7 +3675,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 297761509}
-  m_LocalRotation: {x: -0.0000000019790602, y: -0.000000029802319, z: -0.0000000018626449, w: 1}
+  m_LocalRotation: {x: -9.3132246e-10, y: 0.000000119209275, z: 0.0000000037252899, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -4452,7 +4452,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!65 &363413349
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -5412,7 +5412,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &433541979
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -5527,7 +5527,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!1001 &441726656
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5661,7 +5661,7 @@ Mesh:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: pb_Mesh19856
+  m_Name: pb_Mesh121410
   serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
@@ -6560,7 +6560,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &513389756
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -7616,15 +7616,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8232960721724314602, guid: 9eb7c063454703c48849095702ba9192, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -12.581
+      value: 7.26
       objectReference: {fileID: 0}
     - target: {fileID: 8232960721724314602, guid: 9eb7c063454703c48849095702ba9192, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 5.377
+      value: 0.004
       objectReference: {fileID: 0}
     - target: {fileID: 8232960721724314602, guid: 9eb7c063454703c48849095702ba9192, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 11.781
+      value: -10.64
       objectReference: {fileID: 0}
     - target: {fileID: 8232960721724314602, guid: 9eb7c063454703c48849095702ba9192, type: 3}
       propertyPath: m_LocalRotation.w
@@ -7878,7 +7878,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &594701939
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -11828,7 +11828,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &640368793
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -11942,7 +11942,7 @@ Mesh:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: pb_Mesh20628
+  m_Name: pb_Mesh122258
   serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
@@ -14913,7 +14913,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &824744689
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -23696,6 +23696,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1064777117}
   - component: {fileID: 1064777116}
+  - component: {fileID: 1064777118}
   m_Layer: 0
   m_Name: Managers
   m_TagString: Untagged
@@ -23733,6 +23734,19 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1064777118
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1064777115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 611a68f572ab4d989162aecde79d8a45, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  volume: 0.226
 --- !u!1001 &1065965225
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -27047,7 +27061,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1095760606}
-  m_LocalRotation: {x: -0.018141452, y: -0.000000029802322, z: -0.0000000037252903, w: 0.9998355}
+  m_LocalRotation: {x: -0.018141452, y: 0.00000008940697, z: 0.0000000055879354, w: 0.99983543}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -30453,6 +30467,7 @@ GameObject:
   - component: {fileID: 1288295578}
   - component: {fileID: 1288295577}
   - component: {fileID: 1288295576}
+  - component: {fileID: 1288295581}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -30555,6 +30570,102 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!82 &1288295581
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1288295575}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 025a4d103ab05294b96a7e91d3667389, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 0.074
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1001 &1291513652
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -32455,7 +32566,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &1413141954
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -34223,7 +34334,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!1001 &1556599192
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -34357,7 +34468,7 @@ Mesh:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: pb_Mesh19260
+  m_Name: pb_Mesh120772
   serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
@@ -36802,11 +36913,6 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: a43875f8343914c49b50c62cd4bc8e8c, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f5d9bac095d0c864ba153f8dd606dc3c, type: 3}
---- !u!1 &1705126421 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8721935930558990672, guid: 9eb7c063454703c48849095702ba9192, type: 3}
-  m_PrefabInstance: {fileID: 579347535}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1708521800
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -41256,7 +41362,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!64 &1884335350
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -43068,7 +43174,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!1 &1999230279
 GameObject:
   m_ObjectHideFlags: 0
@@ -49444,8 +49550,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2096103894}
-  m_LocalRotation: {x: 0.00475802, y: 0.96502197, z: 0.017556163, w: -0.26153746}
-  m_LocalPosition: {x: -21.341927, y: 33.007927, z: -18.636833}
+  m_LocalRotation: {x: -0.010751786, y: -0.8064656, z: -0.014671621, w: 0.59100115}
+  m_LocalPosition: {x: -0.3834772, y: 27.634928, z: -41.14088}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 172115106}
@@ -50571,7 +50677,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4ea7effda4945f2448a396347ae1db76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Player: {fileID: 1705126421}
+  Player: {fileID: 0}
 --- !u!54 &919132148245415490
 Rigidbody:
   m_ObjectHideFlags: 0

diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -263,11 +263,6 @@
                 "key": "meshImporter.smoothingAngle",
                 "value": "{\"m_Value\":1.0}"
             },
-            {
-                "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
-                "key": "BevelEdges.size",
-                "value": "{\"m_Value\":0.20000000298023225}"
-            },
             {
                 "type": "UnityEditor.ProBuilder.Actions.MirrorObjects+MirrorSettings, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "MirrorObjects.mirrorAxes",

diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,10 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
+      value: 22424703114646680e0b0227036c72151802563f22213229
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c72151802563f22213229
+      value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
       flags: 0
     RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c6f021903173e3538237e38271427fb