PBA3H25ABU/ClearTheZone
0
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
This commit is contained in:
NBTEMP\bib
2026-08-20 10:43:33 +02:00
parent 4a23cacf12 8cd4da3aad
commit 2e3688fa38
8 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/AR.prefab
+2 -2
View File
@@ -730,11 +730,11 @@ CapsuleCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
Assets/Prefabs/Bullet.prefab
+2 -2
View File
@@ -108,8 +108,8 @@ CapsuleCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_IsTrigger: 0
m_ProvidesContacts: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.50000006
Assets/Prefabs/Enemy.prefab
+4
View File
@@ -12,6 +12,10 @@ PrefabInstance:
propertyPath: m_Name
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_TagString
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 5751720733265742199, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalScale.z
value: 1.0405
Assets/Prefabs/PlayerRobot.prefab
+98 -4
View File
@@ -518,6 +518,12 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7736108665850884707}
- component: {fileID: -8680097485463909193}
- component: {fileID: 3850558004095404047}
- component: {fileID: 8277517180475632604}
- component: {fileID: -20445031427847984}
- component: {fileID: -4384355860610073638}
- component: {fileID: 6550645820472610807}
m_Layer: 0
m_Name: PlayerRobot
m_TagString: Player
@@ -542,6 +548,98 @@ Transform:
- {fileID: 5321993126539030583}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-8680097485463909193
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a187176846a552d4e8321e8645b42c94, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Health
maxHP: 100
curHP: 100
--- !u!114 &3850558004095404047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Shoot
bulletPrefab: {fileID: 0}
spawnPointAR: {fileID: 0}
spawnPointPistol: {fileID: 0}
AR: 1
Pistole: 1
--- !u!114 &8277517180475632604
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 57a6119ff88b0eb45940808859180edd, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::EquipmentManager
AR: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
Pistole: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
Verband: {fileID: 0}
Knife: {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3}
ARisOn: 1
PistoleIsOn: 0
VerbandIsOn: 0
KnifeIsOn: 0
--- !u!114 &-20445031427847984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 33345f0f372370e4d903e361cc6ec87c, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PausenManager
pauseMenuUI: {fileID: 0}
--- !u!114 &-4384355860610073638
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e857b6f5c4484c449d9e726f2fc5d36, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PlayerController
speed: 20
--- !u!114 &6550645820472610807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804703078109025515}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a3d6d3eb3a1b7845801a59185c759a3, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::WeaponReload
maxAmmo: 30
currentAmmo: 0
reloadTime: 1.5
--- !u!1 &1833995220940253086
GameObject:
m_ObjectHideFlags: 0
@@ -1848,10 +1946,6 @@ MonoBehaviour:
BottomClamp: -30
CameraAngleOverride: 0
LockCameraPosition: 0
Items:
- {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
- {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
- {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3}
--- !u!114 &1764945173950795790
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/Prefabs/Wand_Cube.prefab
+2 -2
View File
@@ -110,5 +110,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
m_Size: {x: 1.1021358, y: 1.0146888, z: 1.0440335}
m_Center: {x: -0.020207252, y: 0.007344739, z: -0.00059641735}
Assets/Scenes/Story1.unity
+4
View File
@@ -809,6 +809,10 @@ PrefabInstance:
propertyPath: m_Name
value: Enemy
objectReference: {fileID: 0}
- target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3}
propertyPath: m_TagString
value: Enemy
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/Scripts/Bullet.cs
+1 -1
View File
@@ -27,9 +27,9 @@ public class ARBullet : MonoBehaviour
if (enemy != null)
{
enemy.TakeDamage(damage);
Destroy(gameObject);
}
Destroy(gameObject);
}
else if(collision.gameObject.tag == "Wall")
{
ProjectSettings/TagManager.asset
+1
View File
@@ -6,6 +6,7 @@ TagManager:
tags:
- CinemachineTarget
- Wall
- Enemy
layers:
- Default
- TransparentFX