PBA3H25ABU/ClearTheZone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

Browse Source 
# Conflicts:
#	Assets/Prefabs/AR.prefab
#	Assets/Prefabs/Pistole.prefab
This commit is contained in:
GodGodGod20081
2026-06-26 13:42:03 +02:00
parent e68e753523 f9295a93aa
commit 65e6ffed94
12 changed files with 869 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/AR.prefab
+5 -1
View File
@@ -647,7 +647,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5850548977863442861}
serializedVersion: 2
<<<<<<< HEAD
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
=======
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2828, y: 3.615999, z: 1.2828}
m_ConstrainProportionsScale: 0
@@ -657,7 +661,7 @@ Transform:
- {fileID: 9091445594414695264}
- {fileID: 7448449092846401218}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8402877828330663370
MeshFilter:
m_ObjectHideFlags: 0
Assets/Prefabs/Pistole.prefab
+4
View File
@@ -27,7 +27,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3150477364047279588}
serializedVersion: 2
<<<<<<< HEAD
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
=======
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> f9295a93aa1ad4e11e0c2aca217f299e8ab071be
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.62523, y: 0.62523, z: 2.5534475}
m_ConstrainProportionsScale: 0
Assets/Prefabs/Wand_Cube.prefab
+1 -1
View File
@@ -29,7 +29,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 9, y: 12.886, z: 9}
m_LocalScale: {x: 3.08502, y: 12.886, z: 9}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}