root/BITFALL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CortexCore
2023-12-15 20:03:44 +08:00
parent 1f5b779aa1
commit 2fe611c0d5
66 changed files with 10794 additions and 8815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Artists/Configs/Animator/GunController.controller
View File

@@ -10,7 +10,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: SqrMagnitude
m_EventTreshold: 0.16
m_EventTreshold: 0.08
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8660854411730663567}
m_Solo: 0
@@ -799,7 +799,7 @@ AnimatorStateTransition:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: SqrMagnitude
m_EventTreshold: 0.16
m_EventTreshold: 0.08
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5953952884183743852}
m_Solo: 0
@@ -1867,7 +1867,7 @@ AnimatorState:
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0

10
Assets/Artists/Prefabs/EntityProxy.prefab
View File

@@ -206,7 +206,7 @@ MonoBehaviour:
type: {class: BulletServiceSingleton, ns: BITFALL, asm: BITFALL.Bullet.Runtime}
data:
- rid: 1055089355266719758
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &3116384759055216959
GameObject:
@@ -275,7 +275,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 1055089355266719756
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &3282564729361582311
GameObject:
@@ -424,7 +424,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583703969988608
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &4066453597750257159
GameObject:
@@ -1024,7 +1024,7 @@ MonoBehaviour:
type: {class: BulletServiceSingleton, ns: BITFALL, asm: BITFALL.Bullet.Runtime}
data:
- rid: 1055089355266719760
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &5568622665405429642
GameObject:
@@ -1104,7 +1104,7 @@ MonoBehaviour:
type: {class: BulletServiceSingleton, ns: BITFALL, asm: BITFALL.Bullet.Runtime}
data:
- rid: 1055089355266719759
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &7407409373653409842
GameObject:

121
Assets/Artists/Prefabs/Player.prefab
View File

@@ -734,7 +734,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 1055089217745715201
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &2809084911145372184
GameObject:
@@ -1678,7 +1678,7 @@ MonoBehaviour:
version: 2
RefIds:
- rid: 806583545631342608
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &3865076157975442983
MonoBehaviour:
@@ -3237,7 +3237,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583703969988652
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!1 &5633551467716821190
GameObject:
@@ -5007,13 +5007,8 @@ PrefabInstance:
- target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
propertyPath: renderers.Array.size
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
propertyPath: renderers.Array.data[2]
value:
objectReference: {fileID: 1691712603686457520}
- target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
propertyPath: m_LocalPosition.x
@@ -5201,23 +5196,13 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
insertIndex: -1
addedObject: {fileID: 518203656061299679}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
insertIndex: -1
addedObject: {fileID: 4059732203151340930}
m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3}
--- !u!4 &461740354935876669 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
type: 3}
m_PrefabInstance: {fileID: 984723819954259080}
m_PrefabAsset: {fileID: 0}
--- !u!137 &2348331999583567347 stripped
SkinnedMeshRenderer:
m_CorrespondingSourceObject: {fileID: 3259623828982151547, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa,
@@ -5359,92 +5344,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1040364863550748081}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1451497798110618150
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 461740354935876669}
m_Modifications:
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1755865475335770947, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_Name
value: Apple_01
objectReference: {fileID: 0}
- target: {fileID: 1755865475335770947, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2120823588654661318, guid: 6db7680dca4eb2748a7339cb3bc13d14, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6db7680dca4eb2748a7339cb3bc13d14, type: 3}
--- !u!4 &518203656061299679 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
m_PrefabInstance: {fileID: 1451497798110618150}
m_PrefabAsset: {fileID: 0}
--- !u!23 &1691712603686457520 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 242888891679208086, guid: 6db7680dca4eb2748a7339cb3bc13d14,
type: 3}
m_PrefabInstance: {fileID: 1451497798110618150}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1455826409223114458
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6076,7 +5975,7 @@ MonoBehaviour:
data:
meleeController: {fileID: 2426015728857496741}
- rid: 806583484692037644
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
- rid: 806583545631342604
type: {class: Blocking, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip}
@@ -7277,7 +7176,7 @@ MonoBehaviour:
data:
useController: {fileID: 316352626332989457}
- rid: 806583484692037659
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &2486523390929547415
MonoBehaviour:
@@ -9997,7 +9896,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583611772633088
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &8391365113968233690
MonoBehaviour:
@@ -10369,7 +10268,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583526086934616
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &2801954557211680929
MonoBehaviour:
@@ -12297,7 +12196,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583526086934616
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &3339523282537532634
MonoBehaviour:

2
Assets/Artists/Prefabs/Rig/GunController Variant.prefab
View File

@@ -454,7 +454,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583325261299712
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
- rid: 806583384995266560
type: {class: Holster, ns: BITFALL.Guns.States, asm: BITFALL.Equip}

2
Assets/Artists/Prefabs/Rig/PlacingController Variant.prefab
View File

@@ -114,7 +114,7 @@ MonoBehaviour:
version: 2
RefIds:
- rid: 1055089825765916695
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &4077778554487099840 stripped
MonoBehaviour:

2
Assets/Artists/Prefabs/Rig/Player Weapon Rig/Weapon_M4A1 Variant.prefab
View File

@@ -783,7 +783,7 @@ MonoBehaviour:
- rid: -2
type: {class: , ns: , asm: }
- rid: 806583325261299712
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
- rid: 806583384995266560
type: {class: Holster, ns: BITFALL.Guns.States, asm: BITFALL.Equip}

2
Assets/Artists/Prefabs/Rig/Universal Use Controller Variant.prefab
View File

@@ -416,7 +416,7 @@ MonoBehaviour:
version: 2
RefIds:
- rid: 806583545631342593
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
- rid: 806583545631342595
type: {class: Draw, ns: BITFALL.Entities.Equipment.Universal.States, asm: BITFALL.Equip}

91
Assets/Artists/Prefabs/Zombie.prefab
View File

@@ -10,7 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 5964803017347144284}
- component: {fileID: 2126668844316887849}
- component: {fileID: 8579368653672686413}
- component: {fileID: 673930142905110667}
- component: {fileID: 1765543596226114749}
- component: {fileID: 4827747552512862242}
@@ -71,29 +70,6 @@ MonoBehaviour:
references:
version: 2
RefIds: []
--- !u!136 &8579368653672686413
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1610736432900663163}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.32
m_Height: 1.6
m_Direction: 1
m_Center: {x: 0, y: 0.8, z: 0}
--- !u!95 &673930142905110667
Animator:
serializedVersion: 5
@@ -226,7 +202,7 @@ MonoBehaviour:
_zoomFactor: 1
_firstActivation: 2
_enableAction: 1
_disableAction: 2
_disableAction: 0
_lockBoundGraphPrefabOverrides: 1
_preInitializeSubGraphs: 0
_updateMode: 0
@@ -318,7 +294,7 @@ MonoBehaviour:
version: 2
RefIds:
- rid: 806583325261299714
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
type: {class: MeleeServiceSingleton, ns: BITFALL.Combat, asm: BITFALL.Melee.Runtime}
data:
--- !u!114 &403058373197954028
MonoBehaviour:
@@ -429,8 +405,8 @@ MonoBehaviour:
_getDamage:
rid: 806583346156273669
aliveCollider:
allow: 1
value: {fileID: 8579368653672686413}
allow: 0
value: {fileID: 0}
allowAnimatorParameter: 0
physicsBasedAnimation:
allow: 0
@@ -639,12 +615,12 @@ PrefabInstance:
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.000000029802322
value: 0
objectReference: {fileID: 0}
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.00000033102052
value: -0.0000001986123
objectReference: {fileID: 0}
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -659,7 +635,7 @@ PrefabInstance:
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000004634289
value: 0.00000033102063
objectReference: {fileID: 0}
- target: {fileID: 913909496426237269, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -679,7 +655,7 @@ PrefabInstance:
- target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.000000007450581
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -839,27 +815,27 @@ PrefabInstance:
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.000000029802322
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000046342882
value: -0.00000013240823
objectReference: {fileID: 0}
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.70710677
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710677
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.000000066204116
value: -0.00000013240823
objectReference: {fileID: 0}
- target: {fileID: 5997892003019056750, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -884,27 +860,27 @@ PrefabInstance:
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.000000029802322
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000039722462
value: -0.0000001986123
objectReference: {fileID: 0}
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.70710665
value: 0.70710665
objectReference: {fileID: 0}
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710695
value: -0.70710695
objectReference: {fileID: 0}
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000003972248
value: -0.00000033102063
objectReference: {fileID: 0}
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -914,27 +890,27 @@ PrefabInstance:
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.000000029802322
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.00000013240823
value: 0.00000013240823
objectReference: {fileID: 0}
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.00000013240823
value: -0.00000013240822
objectReference: {fileID: 0}
- target: {fileID: 7520077443289668456, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -954,12 +930,12 @@ PrefabInstance:
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.000000007450581
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
value: 8.7659685e-15
objectReference: {fileID: 0}
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -974,7 +950,7 @@ PrefabInstance:
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0.00000009362675
objectReference: {fileID: 0}
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -989,7 +965,7 @@ PrefabInstance:
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.000000007450581
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -999,12 +975,12 @@ PrefabInstance:
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.x
value: -1
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000009362675
value: -0.00000009362675
objectReference: {fileID: 0}
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -1024,7 +1000,7 @@ PrefabInstance:
- target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.000000007450581
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -1059,7 +1035,7 @@ PrefabInstance:
- target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.000000007450581
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e,
type: 3}
@@ -1165,11 +1141,6 @@ PrefabInstance:
propertyPath: fov
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8772707305530588351, guid: 2ad4d682518910847b19ed8106c0071a,
type: 3}
propertyPath: ignoreColliders.Array.data[0]
value:
objectReference: {fileID: 8579368653672686413}
- target: {fileID: 9015502658869033244, guid: 2ad4d682518910847b19ed8106c0071a,
type: 3}
propertyPath: ignoreTags.allow

10808
Assets/Artists/Scenes/Game/gm-bigcity-2.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Artists/Scripts/Entities/Movement/NavAgentMovement.cs
View File

@@ -91,12 +91,12 @@ namespace BITKit
{
}
public void Movement(Vector3 relativeVector)
public void OnMovement(Vector3 relativeVector)
{
}
public void Movement(InputAction.CallbackContext context)
public void OnMovement(InputAction.CallbackContext context)
{
throw new NotImplementedException();
}

8
Assets/Artists/Scripts/Equip/BITGun.cs
View File

@@ -369,7 +369,13 @@ namespace BITFALL.Guns
animator.animator.SetBool((int)BITHash.Player.Cancel,
recoilSpring.value.GetLength()>0.1f);
animator.animator.SetFloat((int)BITHash.Player.Aim,_equipService.Zoom.Value);
animator.animator.SetFloat(BITConstant.Player.SqrMagnitude,_movement.LocomotionBasedVelocity.sqrMagnitude);
animator.animator.SetFloat(BITConstant.Player.SqrMagnitude,
math.clamp(
_movement.LocomotionBasedVelocity.sqrMagnitude
,0,1
)
);
recoilSpring.Update(deltaTime,default);

2
Assets/Artists/Scripts/MeleeService/MeleeService.cs
View File

@@ -12,7 +12,7 @@ using Unity.Collections;
using UnityEngine;
using UnityEngine.VFX;
namespace BITFALL.Melee
namespace BITFALL.Combat
{
[Serializable]
public class MeleeServiceSingleton : IMeleeService

45
Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs
View File

@@ -13,6 +13,7 @@ using BITKit.Entities.Movement;
using BITKit.Entities.Physics;
using BITKit.Entities.Player;
using BITKit.PlayerCamera;
using Cysharp.Threading.Tasks;
using Lightbug.CharacterControllerPro.Core;
using Unity.Mathematics;
using UnityEngine;
@@ -151,11 +152,11 @@ namespace BITFALL.Entities.Player.Movement
TransitionState<Walk>();
_inputActionGroup.RegisterCallback(movementAction, Movement);
_inputActionGroup.RegisterCallback(viewAction, View);
_inputActionGroup.RegisterCallback(jumpAction, Jump);
_inputActionGroup.RegisterCallback(crouchAction, Crouch);
_inputActionGroup.RegisterCallback(runAction, Run);
_inputActionGroup.RegisterCallback(movementAction, OnMovement);
_inputActionGroup.RegisterCallback(viewAction, OnView);
_inputActionGroup.RegisterCallback(jumpAction, OnJump);
_inputActionGroup.RegisterCallback(crouchAction, OnCrouch);
_inputActionGroup.RegisterCallback(runAction, OnRun);
}
private void OnSetPhysics(bool obj)
{
@@ -167,8 +168,9 @@ namespace BITFALL.Entities.Player.Movement
private void OnSetAlive(bool obj)
{
allowMovement.SetElements(this,obj);
allowRun.SetElements(this,obj);
allowMovement.SetElements(123,obj);
allowRun.SetElements(123,obj);
if (obj)
{
if (!isDead) return;
@@ -186,11 +188,11 @@ namespace BITFALL.Entities.Player.Movement
{
throw new NotImplementedException();
}
public void Movement(Vector3 relativeVector)
public void OnMovement(Vector3 relativeVector)
{
MovementInput = relativeVector;
}
public void Movement(InputAction.CallbackContext context)
public void OnMovement(InputAction.CallbackContext context)
{
MovementInput = context.ReadValue<Vector2>();
MovementInput = new Vector3(MovementInput.x,0,MovementInput.y);
@@ -205,8 +207,8 @@ namespace BITFALL.Entities.Player.Movement
ExpectSprint.Reset();
}
}
public void ExecuteCommand<T>(T command=default)
public void ExecuteCommand<T>(T command=default)
{
foreach (var x in StateDictionary.Values)
{
@@ -233,7 +235,7 @@ namespace BITFALL.Entities.Player.Movement
gravityDamping.Release(addGravityDampingCommand.Damping);
break;
case PlayerPauseRunCommand pauseRunCommand:
pauseRun.SetElements(this,pauseRunCommand.Pause);
pauseRun.SetElements(123,pauseRunCommand.Pause);
break;
case PlayerFocusCommand focusCommand:
allowFocus.SetElements(focusCommand.Sender,focusCommand.Focus);
@@ -253,7 +255,7 @@ namespace BITFALL.Entities.Player.Movement
}
public event Action<object> OnCommand;
public void View(InputAction.CallbackContext context)
public void OnView(InputAction.CallbackContext context)
{
if (BITAppForUnity.AllowCursor) return;
var playerConfig = PlayerConfig.Singleton;
@@ -293,12 +295,9 @@ namespace BITFALL.Entities.Player.Movement
-raw.x
);
}
public void Jump(InputAction.CallbackContext context)
public void OnJump(InputAction.CallbackContext context)
{
if (_knockdown.IsKnockdown) return;
var y = actor.ColliderComponent.Size.y;
RequestClimb = context switch
@@ -306,10 +305,9 @@ namespace BITFALL.Entities.Player.Movement
{ interaction: PressInteraction, performed: true } => true,
{ interaction: PressInteraction, canceled: true } => false,
_ => RequestClimb
};
};
if (ExpectJump.shouldBe) return;
if (context is not {interaction:PressInteraction , performed:true}) return;
switch (CurrentState)
{
@@ -373,7 +371,7 @@ namespace BITFALL.Entities.Player.Movement
}
ExpectCrouch.Reset();
}
public void Run(InputAction.CallbackContext context)
public void OnRun(InputAction.CallbackContext context)
{
if (allowRun.Allow is false) return;
if (_knockdown.IsKnockdown) return;
@@ -419,7 +417,7 @@ namespace BITFALL.Entities.Player.Movement
}
public void Crouch(InputAction.CallbackContext context)
public void OnCrouch(InputAction.CallbackContext context)
{
if (_knockdown.IsKnockdown) return;
@@ -524,12 +522,9 @@ namespace BITFALL.Entities.Player.Movement
}
if (allowMovement.Allow is false) return;
var additiveTransform = locationAdditive.transform;
var rotation = Quaternion.Euler(LookInput);
if (LimitViewAngle is not 0)
{
float angleDifference = Quaternion.Angle(rotation, FpvRotation);

19
Assets/Artists/Scripts/UX/UXHud.cs
View File

@@ -72,6 +72,8 @@ namespace BITFALL.UX
[UXBindPath("bloody-container")]
private VisualElement bloodyContainer;
private VisualElement[] swayElements;
private float _currentHealthLerp;
protected CancellationTokenSource bloodyScreenCancellationTokenSource;
@@ -91,6 +93,8 @@ namespace BITFALL.UX
bloodyContainer.SetOpacity(0);
injuryContainer.SetOpacity(0);
swayElements = document.rootVisualElement.Query(className: "swap").ToList().ToArray();
}
private void OnInspect(InputAction.CallbackContext obj)
@@ -268,7 +272,6 @@ namespace BITFALL.UX
}
{
var currentPos = document.rootVisualElement.transform.position;
var movementVelocity = _entityMovement.LocomotionBasedVelocity * 16;
var velocity =
-_entityMovement.AngularVelocity * 10
@@ -278,8 +281,16 @@ namespace BITFALL.UX
x = velocity.y,
y = velocity.x,
};
newPos = Vector3.Lerp(currentPos, newPos, Time.deltaTime * 10);
document.rootVisualElement.transform.position = newPos;
foreach (var x in swayElements)
{
var currentPos = x.transform.position;
newPos = Vector3.Lerp(currentPos, newPos, Time.deltaTime * 10);
x.transform.position = newPos;
}
}
}
@@ -305,7 +316,7 @@ namespace BITFALL.UX
healthBar.Set(Mathf.Clamp(hp,0,100) * 0.01f);
injuryContainer.SetOpacity(
hp<50 ? 1 : 0
hp< 60 ? Mathf.InverseLerp(40,60,hp) : 0
);
}
}

9
Assets/Artists/UX/HUD.uxml
View File

@@ -12,9 +12,6 @@
<ui:VisualElement name="injury-container" class="root">
<ui:VisualElement name="additive" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodyScreen.psd?fileID=2800000&amp;guid=2dd072ebafd2e84438f73c131198c399&amp;type=3#BloodyScreen&apos;); -unity-background-image-tint-color: rgb(114, 0, 0);" />
<ui:VisualElement name="additive" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodSplat.psd?fileID=2800000&amp;guid=cf1d6c5375931344d9eb49fd8eac024b&amp;type=3#BloodSplat&apos;); -unity-background-image-tint-color: rgb(255, 255, 255);" />
<ui:VisualElement name="additive" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodSplat.psd?fileID=2800000&amp;guid=cf1d6c5375931344d9eb49fd8eac024b&amp;type=3#BloodSplat&apos;); -unity-background-image-tint-color: rgb(255, 255, 255);" />
<ui:VisualElement name="additive" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodSplat.psd?fileID=2800000&amp;guid=cf1d6c5375931344d9eb49fd8eac024b&amp;type=3#BloodSplat&apos;); -unity-background-image-tint-color: rgb(255, 255, 255);" />
<ui:VisualElement name="additive" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodSplat.psd?fileID=2800000&amp;guid=cf1d6c5375931344d9eb49fd8eac024b&amp;type=3#BloodSplat&apos;); -unity-background-image-tint-color: rgb(255, 255, 255);" />
</ui:VisualElement>
<ui:VisualElement name="bloody-container" class="root" style="background-image: url(&apos;project://database/Assets/Standard%20Assets/DamageHUD/Content/Art/UI/BloodyScreen.psd?fileID=2800000&amp;guid=2dd072ebafd2e84438f73c131198c399&amp;type=3#BloodyScreen&apos;); -unity-background-image-tint-color: rgb(213, 6, 6); opacity: 0;" />
</ui:VisualElement>
@@ -32,7 +29,7 @@
<ui:VisualElement name="point-render" style="position: absolute; width: 32px; height: 32px; background-image: url(&apos;project://database/Assets/BITKit/Unity/Art/Icons/EditorIcons/winbtn_mac_close_a@2x.png?fileID=2800000&amp;guid=15fcf531feceef8438c9e35edbc55be3&amp;type=3#winbtn_mac_close_a@2x&apos;); top: 0; left: 0;" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="quest-container" style="top: 64px; right: 64px; position: absolute; display: none;">
<ui:VisualElement name="quest-container" class="swap" style="top: 64px; right: 64px; position: absolute; display: none;">
<ui:Instance template="BITQuestElement" name="BITQuestElement" class="completed" />
<ui:Instance template="BITQuestElement" name="BITQuestElement" />
</ui:VisualElement>
@@ -52,7 +49,7 @@
<ui:VisualElement name="crosshair-image" class="flex-center" style="width: 48px; height: 48px; background-image: url(&apos;project://database/Assets/Artists/Arts/Icons/Crosshair_No_Dot.png?fileID=2800000&amp;guid=507fe62dcf74ad84d966ea70a924771e&amp;type=3#Crosshair_No_Dot&apos;);" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="equips-container" style="position: absolute; right: 64px; bottom: 32px; align-items: flex-end;">
<ui:VisualElement name="equips-container" class="swap" style="position: absolute; right: 64px; bottom: 32px; align-items: flex-end;">
<ui:VisualElement name="equipSelector-container" style="align-items: flex-end;">
<ui:Instance template="ItemContainer_256x128px_flat" name="ItemContainer_256x128px_flat" class="active" />
<ui:Instance template="ItemContainer_256x128px_flat" name="ItemContainer_256x128px_flat" />
@@ -86,7 +83,7 @@
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="player-container" style="width: 404px; height: 194px; position: absolute; left: 80px; top: 844px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;">
<ui:VisualElement name="player-container" class="swap" style="width: 404px; height: 194px; position: absolute; left: 80px; top: 844px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;">
<ui:VisualElement name="VisualElement" style="height: 24px;" />
<ui:VisualElement style="flex-direction: row;">
<ui:VisualElement name="playerAvatar-image" style="width: 128px; height: 128px; background-image: url(&apos;project://database/Assets/Artists/Arts/Icons/Logo.jpg?fileID=2800000&amp;guid=3ded0edcf28c6794f95fb07d3c684769&amp;type=3#Logo&apos;);" />