nikola/DropToTheRoots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fıxed scenes

Browse Source
This commit is contained in:
cemt1363
2026-06-06 14:34:01 +02:00
parent cc0ae01f60
commit bb4d318ff9
1 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Assets/Scenes/MainScene.unity
-62
View File
@@ -466,7 +466,6 @@ MonoBehaviour:
RotationDamping: {x: 0, y: 0, z: 0} RotationDamping: {x: 0, y: 0, z: 0}
QuaternionDamping: 1 QuaternionDamping: 1
FollowOffset: {x: 0, y: 0, z: -10} FollowOffset: {x: 0, y: 0, z: -10}
<<<<<<< Updated upstream
--- !u!1001 &945103274 --- !u!1001 &945103274
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -524,8 +523,6 @@ PrefabInstance:
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3}
=======
>>>>>>> Stashed changes
--- !u!4 &1124127124 stripped --- !u!4 &1124127124 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3}
@@ -945,11 +942,7 @@ Transform:
- {fileID: 1710653547} - {fileID: 1710653547}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< Updated upstream
--- !u!1001 &4353227734250816225 --- !u!1001 &4353227734250816225
=======
--- !u!1001 &7081990975111999383
>>>>>>> Stashed changes
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
@@ -957,7 +950,6 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
<<<<<<< Updated upstream
- target: {fileID: 7890225293042883908, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - target: {fileID: 7890225293042883908, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: LeaveObstacle value: LeaveObstacle
@@ -1002,61 +994,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
=======
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalPosition.x
value: -0.7504
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalPosition.y
value: 6.498
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5606886376021723540, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
propertyPath: m_Name
value: Hole2
objectReference: {fileID: 0}
>>>>>>> Stashed changes
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
<<<<<<< Updated upstream
m_SourcePrefab: {fileID: 100100000, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3}
=======
m_SourcePrefab: {fileID: 100100000, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3}
>>>>>>> Stashed changes
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1066,9 +1008,5 @@ SceneRoots:
- {fileID: 2072448676} - {fileID: 2072448676}
- {fileID: 1445156949} - {fileID: 1445156949}
- {fileID: 750131492} - {fileID: 750131492}
<<<<<<< Updated upstream
- {fileID: 945103274} - {fileID: 945103274}
- {fileID: 4353227734250816225} - {fileID: 4353227734250816225}
=======
- {fileID: 7081990975111999383}
>>>>>>> Stashed changes