Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone
# Conflicts: # Assets/Prefabs/AR.prefab # Assets/Prefabs/Pistole.prefab
This commit is contained in:
GodGodGod20081
+98
-114
@@ -131,6 +131,8 @@ GameObject:
|
||||
- component: {fileID: 330585545}
|
||||
- component: {fileID: 330585544}
|
||||
- component: {fileID: 330585547}
|
||||
- component: {fileID: 330585548}
|
||||
- component: {fileID: 330585549}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
m_TagString: MainCamera
|
||||
@@ -256,6 +258,46 @@ MonoBehaviour:
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!114 &330585548
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 330585543}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5e857b6f5c4484c449d9e726f2fc5d36, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::PlayerController
|
||||
speed: 5
|
||||
--- !u!54 &330585549
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 330585543}
|
||||
serializedVersion: 5
|
||||
m_Mass: 1
|
||||
m_LinearDamping: 0
|
||||
m_AngularDamping: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &410087039
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -440,6 +482,11 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7d6e2533bcfdaed4bbe3b0d811451466, type: 3}
|
||||
--- !u!4 &825507998 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3761782979458803265, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
|
||||
m_PrefabInstance: {fileID: 6183749844758426995}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &832575517
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -489,79 +536,10 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1112380836
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 4140538247651255256}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1345163984726252992, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Munition (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.5355531
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.35106266
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.06261455
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.013612632
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.4932232
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.08104772
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.71056306
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.70363355
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 95.061005
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
--- !u!4 &1112380837 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8106650884638092069, guid: 90b20e4e64e852f4b8a3afd3e2e1c84b, type: 3}
|
||||
m_PrefabInstance: {fileID: 1112380836}
|
||||
--- !u!1 &934917315 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
|
||||
m_PrefabInstance: {fileID: 6183749844758426995}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1741774807
|
||||
GameObject:
|
||||
@@ -573,6 +551,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 1741774809}
|
||||
- component: {fileID: 1741774808}
|
||||
- component: {fileID: 1741774810}
|
||||
- component: {fileID: 1741774811}
|
||||
m_Layer: 0
|
||||
m_Name: Code
|
||||
m_TagString: Untagged
|
||||
@@ -592,7 +572,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 079eca2fab980b94ea6d88afb4570141, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Map_Generator
|
||||
tex: {fileID: 2800000, guid: 72ed3652e97b6d944991b49268c4603d, type: 3}
|
||||
tex: {fileID: 2800000, guid: c9b66bd59750bb947af3cc089a4d2969, type: 3}
|
||||
width: 0
|
||||
heigt: 0
|
||||
pixelFarbe: []
|
||||
@@ -612,6 +592,48 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1741774810
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1741774807}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Shoot
|
||||
bulletPrefab: {fileID: 1055045214131575312}
|
||||
spawnPointAR: {fileID: 4140538247651255258}
|
||||
spawnPointPistol: {fileID: 825507998}
|
||||
AR: 1
|
||||
Pistole: 1
|
||||
--- !u!114 &1741774811
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1741774807}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 57a6119ff88b0eb45940808859180edd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::EquipmentManager
|
||||
AR: {fileID: 1910231657}
|
||||
Pistole: {fileID: 934917315}
|
||||
Verband: {fileID: 0}
|
||||
Knife: {fileID: 0}
|
||||
ARisOn: 1
|
||||
PistoleIsOn: 0
|
||||
VerbandIsOn: 0
|
||||
KnifeIsOn: 0
|
||||
--- !u!1 &1910231657 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
m_PrefabInstance: {fileID: 4140538247651255255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &748466228950979670
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -796,54 +818,16 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: AR
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -2.133
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.01
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1112380837}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4140538247651255259}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
--- !u!4 &4140538247651255256 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3358950876010158595, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
m_PrefabInstance: {fileID: 4140538247651255255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4140538247651255257 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
m_PrefabInstance: {fileID: 4140538247651255255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4140538247651255258 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
|
||||
m_PrefabInstance: {fileID: 4140538247651255255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &4140538247651255259
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4140538247651255257}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Shoot
|
||||
bulletPrefab: {fileID: 1055045214131575312}
|
||||
spawnPoint: {fileID: 4140538247651255258}
|
||||
--- !u!1001 &6183749844758426995
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user