Merge remote-tracking branch 'origin/main' into beni

This commit is contained in:
MindfulMinun committed 2022-02-26 12:02:39 -06:00
commit 138d4e83fb
171 files changed
+17249 -1492

No files matched your search

+13 -13
View File
@@ -513,7 +513,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 160265411}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 40.4, y: 0, z: 0}
m_LocalPosition: {x: 40.497, y: 0.0089998245, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 357973077}
@@ -785,7 +785,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 210519944}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 40.39, y: 0.835, z: 0}
m_LocalPosition: {x: 40.493, y: 0.75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -1221,7 +1221,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 452123786}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -10.54, z: 0}
m_LocalPosition: {x: -0.014, y: -10.59, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -1600,7 +1600,7 @@ AudioSource:
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
@@ -2096,7 +2096,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 652039172}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.17, y: 0.835, z: 0}
m_LocalPosition: {x: 20.223, y: 0.7650002, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -2790,7 +2790,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824058977}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.835, z: 0}
m_LocalPosition: {x: -0.014, y: 0.7849998, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -3200,7 +3200,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1035837737}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.17, y: -10.54, z: 0}
m_LocalPosition: {x: 20.223, y: -10.61, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -3830,7 +3830,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312588069}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 12.21, z: 0}
m_LocalPosition: {x: -0.014, y: 12.16, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -4150,7 +4150,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1456595749}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 40.39, y: 12.21, z: 0}
m_LocalPosition: {x: 40.493, y: 12.125, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -4780,7 +4780,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1545970645}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 40.39, y: -10.54, z: 0}
m_LocalPosition: {x: 40.493, y: -10.625, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}
@@ -5694,7 +5694,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1769577724}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.2, y: 0, z: 0}
m_LocalPosition: {x: 20.218, y: -0.141, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 357973077}
@@ -5951,7 +5951,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1810438009}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f7bf3298a6b40104a881d9cd954affb4, type: 3}
m_Script: {fileID: 11500000, guid: 7f3324bdaa895394db1ed827a820ab8c, type: 3}
m_Name:
m_EditorClassIdentifier:
currentLevel: 0
@@ -6217,7 +6217,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1996982413}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.17, y: 12.21, z: 0}
m_LocalPosition: {x: 20.223, y: 12.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1798089635}