Station_Obscurum/StationObscurum
8
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed strafing, added shooting effects, created a new testing level, enlarged enemies, updated bullet firing system

Browse Source
This commit is contained in:
sebastianhampel1
2023-05-29 00:16:05 -04:00
parent 461a297e12
commit 77ba05e7dc
159 changed files with 126161 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Assets/Scenes/Experimentation/EnemyExperimentation1.unity
View File

@ -123,6 +123,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: d966ed736bff4104189419e827abda8f, type: 2}
--- !u!1001 &142648493
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalPosition.x
value: -1.76
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 718690339124133421, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
propertyPath: m_Name
value: vfx_MuzzleFlash_v1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c154daaf377c39b4d89906ec77082bee, type: 3}
--- !u!1 &144918068
GameObject:
m_ObjectHideFlags: 0

8
Assets/Scenes/Experimentation/HorrorHallway.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3cc712b22b8f14642a12f486561fa7a3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15551
Assets/Scenes/Experimentation/HorrorHallway.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/Experimentation/HorrorHallway.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ed464f4267a68574f954fa9cf8d1b8fa
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Experimentation/HorrorHallway/NavMesh.asset Normal file
View File

Binary file not shown.

8
Assets/Scenes/Experimentation/HorrorHallway/NavMesh.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9e81b0c8329497f4184827fd3f517fa0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000
userData:
assetBundleName:
assetBundleVariant:

53
Assets/Scenes/Levels/Level0.unity
View File

@ -247,7 +247,6 @@ MonoBehaviour:
objectiveGui: {fileID: 1027543685}
marker: {fileID: 883832989}
player: {fileID: 147350239}
minDist: 3
sections:
- instruction1: Grab a Powercore
istruction2: Power the lights
@ -336,7 +335,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a6ee2a8c2974b854f8f08c34f8414193, type: 3}
m_Name:
m_EditorClassIdentifier:
initalPlaceIndex: 0
recepticleOne: {fileID: 1752857294}
progression: {fileID: 11595167}
enabledOn: 4
@ -353,7 +351,7 @@ MonoBehaviour:
gate: {fileID: 566952512}
exitCollider: {fileID: 37724319}
player: {fileID: 147350239}
marker2Ref: {fileID: 171399773}
marker2Ref: {fileID: 1700878295}
marker3Ref: {fileID: 171399773}
finalRoomOptimizer: {fileID: 1917806138}
--- !u!1 &16698893
@ -1902,6 +1900,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 171399772, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1700878290, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090859167306147240, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_IsActive
value: 0
@ -1922,6 +1928,10 @@ PrefabInstance:
propertyPath: freelook
value:
objectReference: {fileID: 2131006688}
- target: {fileID: 4887420364393220760, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: sideSpeed
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7054175667404048554, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: sounds.Array.size
value: 1
@ -2064,11 +2074,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7274624882445554639, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_LocalRotation.y
value: -0.000000034718123
value: -3.9161743e-10
objectReference: {fileID: 0}
- target: {fileID: 7274624882445554639, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000000049993236
value: 5.6392228e-11
objectReference: {fileID: 0}
- target: {fileID: 7274624882710027854, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_LocalPosition.x
@ -2120,11 +2130,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7274624883331524490, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_LocalRotation.y
value: -0.0000000344453
value: 0.0000000344453
objectReference: {fileID: 0}
- target: {fileID: 7274624883331524490, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000000015444355
value: -0.0000000015444355
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
@ -4550,6 +4560,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 314380064}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &329031583 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7054175669133704861, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
m_PrefabInstance: {fileID: 187120888}
m_PrefabAsset: {fileID: 0}
--- !u!1 &331279187
GameObject:
m_ObjectHideFlags: 0
@ -4694,6 +4709,19 @@ Camera:
m_CorrespondingSourceObject: {fileID: 7054175669133704833, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
m_PrefabInstance: {fileID: 187120888}
m_PrefabAsset: {fileID: 0}
--- !u!114 &335189410
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 329031583}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0634141320a06b4f94b506dbed94499, type: 3}
m_Name:
m_EditorClassIdentifier:
targetPosition: {x: 0, y: 0, z: 0}
--- !u!65 &345664313
BoxCollider:
m_ObjectHideFlags: 0
@ -17733,6 +17761,17 @@ Transform:
m_Father: {fileID: 1567088923}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1700878295 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1700878295, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
m_PrefabInstance: {fileID: 187120888}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90cdebe649c6da74c91cb78e89dda81d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1715452019
PrefabInstance:
m_ObjectHideFlags: 0

4
Assets/Scenes/StartScreen2.unity
View File

@ -14592,11 +14592,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1726408793}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a0bc8aa373bfbe44e91f0625324088be, type: 3}
m_Name:
m_EditorClassIdentifier:
aimMode: 2
targetingLight: {fileID: 105139639}
targetObjectPrefab: {fileID: 7083481049935262560, guid: 25e7708870a1a78479d6e4df73bec788, type: 3}
projectilePrefab: {fileID: 4575714109450776061, guid: 5e611af8f39b09a4f9b479a29f3460ff, type: 3}
@ -14604,6 +14605,7 @@ MonoBehaviour:
bulletSpawnPoint: {fileID: 1122710622}
firePower: 40
maxProjectileDuration: 5
maxTargetObjDistance: 15
--- !u!4 &1726408795
Transform:
m_ObjectHideFlags: 0