Merge branch 'main' of https://github.com/turtle-masters/p7-prototype

turtle-masters · Nov 9, 2021 · d6ed76e · d6ed76e
2 parents ab65ad9 + 523aca2
commit d6ed76e
Show file tree

Hide file tree

Showing 10 changed files with 960 additions and 446 deletions.
diff --git a/Assets/Custom Models/dummygun.fbx b/Assets/Custom Models/dummygun.fbx
diff --git a/Assets/Custom Models/dummygun.fbx.meta b/Assets/Custom Models/dummygun.fbx.meta
diff --git a/Assets/Prefab/Gun.prefab b/Assets/Prefab/Gun.prefab
@@ -296,6 +296,7 @@ Transform:
   - {fileID: 7963505200687702370}
   - {fileID: 1508066576}
   - {fileID: 5324220373992381533}
+  - {fileID: 2102618322605031844}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
@@ -385,6 +386,8 @@ MonoBehaviour:
   input:
     actionPath: 
     needsReinit: 0
+  signifiersound: {fileID: 8300000, guid: ede8592093849e94d9162e7c12bfe83f, type: 3}
+  dummyGun: {fileID: 1613925383938874142}
 --- !u!33 &4718441376752617286
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -489,6 +492,89 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1001 &1919863043272255055
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7963505201696564050}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 21.2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 21.2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 21.2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.219
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.51
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.49999982
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5000002
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.50000006
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_Name
+      value: dummygun
+      objectReference: {fileID: 0}
+    - target: {fileID: 5755155060101573453, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 959a53df283fa6547b15b631c2fa5284, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+--- !u!1 &1613925383938874142 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+  m_PrefabInstance: {fileID: 1919863043272255055}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2102618322605031844 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b08b7ebd9e5080a44b9adda9f3826eb2, type: 3}
+  m_PrefabInstance: {fileID: 1919863043272255055}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5650283902607817654
 PrefabInstance:
   m_ObjectHideFlags: 0