diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 159df1b68..0f0934f3a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -128,6 +128,16 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: beaccfe60f8582e4895457499e18b12c + m_Address: Assets/Grenade + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2830d77b981a3a3489bda2a3c4fba460 + m_Address: Assets/Soda + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2} m_SchemaSet: diff --git a/Assets/Artists/Animtions/Character/Pixel@T Pose.fbx b/Assets/Artists/Animtions/Character/Pixel@T Pose.fbx new file mode 100644 index 000000000..83ecaea70 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Pixel@T Pose.fbx differ diff --git a/Assets/Artists/Animtions/Character/Zombie/Character@Standing React Death Backward.fbx b/Assets/Artists/Animtions/Character/Zombie/Character@Standing React Death Backward.fbx new file mode 100644 index 000000000..20835c396 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Zombie/Character@Standing React Death Backward.fbx differ diff --git a/Assets/Artists/Animtions/Character/Zombie/Character@Zombie Death.fbx b/Assets/Artists/Animtions/Character/Zombie/Character@Zombie Death.fbx new file mode 100644 index 000000000..b836bcc01 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Zombie/Character@Zombie Death.fbx differ diff --git a/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_L.fbx b/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_L.fbx new file mode 100644 index 000000000..34b44ffd9 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_L.fbx differ diff --git a/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_R.fbx b/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_R.fbx new file mode 100644 index 000000000..055926476 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Zombie/Zombie_Attack_R.fbx differ diff --git a/Assets/Artists/Animtions/Character/Zombie/Zombie_HitStun.fbx b/Assets/Artists/Animtions/Character/Zombie/Zombie_HitStun.fbx new file mode 100644 index 000000000..4e7b4d435 Binary files /dev/null and b/Assets/Artists/Animtions/Character/Zombie/Zombie_HitStun.fbx differ diff --git a/Assets/Artists/Arts/Icons/Items/ICON_Grenade.png b/Assets/Artists/Arts/Icons/Items/ICON_Grenade.png new file mode 100644 index 000000000..c2598252e Binary files /dev/null and b/Assets/Artists/Arts/Icons/Items/ICON_Grenade.png differ diff --git a/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller b/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller index f1e619bf3..0014dcc49 100644 --- a/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller +++ b/Assets/Artists/Configs/Animator/Core/EntityBasedNPC.controller @@ -1,27 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8944048238387094739 -AnimatorStateTransition: +--- !u!1107 &-9120357483318927721 +AnimatorStateMachine: + serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -2872314262290925133} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_Name: Attack + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5060886563922672075} + m_Position: {x: 250, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8088620814189296577} + m_Position: {x: 250, y: 140, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: + - {fileID: 276872393024185899} + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5060886563922672075} --- !u!1102 &-8318622992684206721 AnimatorState: serializedVersion: 6 @@ -34,7 +38,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -2257074110139407426} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: -4682183484338247278} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -49,6 +54,55 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-8088620814189296577 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_R + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6022094536806633483} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 65a4736dd630e3e4e9f7c6a572a54956, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7490854506384927082 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 6058815529303356158} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-6682989306357693698 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -71,6 +125,55 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-6022094536806633483 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 6058815529303356158} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5060886563922672075 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_L + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7490854506384927082} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2e02f8e429bd50041a0a22e527708abf, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-4873137299548358500 AnimatorStateMachine: serializedVersion: 6 @@ -96,6 +199,30 @@ AnimatorStateMachine: m_ExitPosition: {x: 700, y: 100, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -3174240966205496616} +--- !u!114 &-4682183484338247278 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342607 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342607 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Movement --- !u!1102 &-3624621611510814089 AnimatorState: serializedVersion: 6 @@ -108,7 +235,8 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 455483977735225797} - m_StateMachineBehaviours: [] + m_StateMachineBehaviours: + - {fileID: -150162369578498782} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -123,32 +251,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &-3577891082255179188 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Upper Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -2872314262290925133} - m_Position: {x: 30, y: 180, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3164795607557365492} - m_Position: {x: 290, y: 180, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: -196818614216295774} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2872314262290925133} --- !u!1102 &-3174240966205496616 AnimatorState: serializedVersion: 6 @@ -175,32 +277,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-2872314262290925133 -AnimatorState: - serializedVersion: 6 +--- !u!1101 &-2445016005032985477 +AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-2257074110139407426 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -226,31 +324,54 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-196818614216295774 -AnimatorStateTransition: +--- !u!114 &-1149441261307116378 +MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Melee - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3164795607557365492} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_EditorClassIdentifier: + stateName: + rid: 806583545631342605 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342605 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: HitStun +--- !u!114 &-150162369578498782 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342606 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342606 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Idle --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -265,19 +386,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Melee - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: SqrMagnitude m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -291,18 +406,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Upper Layer - m_StateMachine: {fileID: -3577891082255179188} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - serializedVersion: 5 m_Name: Additive Layer m_StateMachine: {fileID: -4873137299548358500} @@ -315,6 +418,40 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!114 &276872393024185899 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342611 + index: 0 + duration: 0 + variables: + - rid: 806583545631342609 + - rid: 806583545631342610 + references: + version: 2 + RefIds: + - rid: 806583545631342609 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Attack_L + - rid: 806583545631342610 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Attack_R + - rid: 806583545631342611 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Attack --- !u!1101 &455483977735225797 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -367,33 +504,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &3164795607557365492 -AnimatorState: - serializedVersion: 6 +--- !u!1101 &4579198035393053474 +AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Attack - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -8944048238387094739} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &6058815529303356158 AnimatorStateMachine: serializedVersion: 6 @@ -409,13 +541,49 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -8318622992684206721} m_Position: {x: 260, y: 180, z: 0} - m_ChildStateMachines: [] + - serializedVersion: 1 + m_State: {fileID: 8265139578357769089} + m_Position: {x: 530, y: 180, z: 0} + m_ChildStateMachines: + - serializedVersion: 1 + m_StateMachine: {fileID: -9120357483318927721} + m_Position: {x: 260, y: 100, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: [] - m_StateMachineTransitions: {} + m_StateMachineTransitions: + - first: {fileID: -9120357483318927721} + second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 50, y: 20, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 550, y: 110, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -3624621611510814089} +--- !u!1102 &8265139578357769089 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HitStun + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2445016005032985477} + m_StateMachineBehaviours: + - {fileID: -1149441261307116378} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: c9d4ca0a62700ee488e80586d79da367, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Artists/Configs/Animator/GunController.controller b/Assets/Artists/Configs/Animator/GunController.controller index ab5e5b290..f638d7ab6 100644 --- a/Assets/Artists/Configs/Animator/GunController.controller +++ b/Assets/Artists/Configs/Animator/GunController.controller @@ -451,9 +451,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 2 diff --git a/Assets/Artists/Configs/Animator/MeleeController.controller b/Assets/Artists/Configs/Animator/MeleeController.controller index 58bde4945..4c2a250d7 100644 --- a/Assets/Artists/Configs/Animator/MeleeController.controller +++ b/Assets/Artists/Configs/Animator/MeleeController.controller @@ -24,20 +24,20 @@ MonoBehaviour: type: {class: Reference, ns: BITKit, asm: BITKit} data: value: Draw ---- !u!1102 &-6953518709728688449 +--- !u!1102 &-8728957671963534527 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Attack + m_Name: Attack_End m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -2370923636210611255} + - {fileID: 4643574653100910473} m_StateMachineBehaviours: - - {fileID: -5225792750608852525} + - {fileID: 7125295406401311545} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -46,12 +46,117 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 2b45424ac8e214c4da0c4b01e0f12e26, type: 2} + m_Motion: {fileID: 7400000, guid: 741f207a9cd5e274e9857c8413b4612d, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &-8676084553781277148 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342601 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342601 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Idle.Air +--- !u!1102 &-8643111206852330463 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4881351855068954110} + - {fileID: 2554244241180360008} + m_StateMachineBehaviours: + - {fileID: -5192990550407791829} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2a2012ea7f7e0e042ac7ede06063b02b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7641792666894948448 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Movement + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1823982559256643145} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d0620b5ee177bad468ceeac53272b40b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-6579861193294717924 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack StateMachine + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3341830041777277662} + m_Position: {x: 240, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8728957671963534527} + m_Position: {x: 470, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3341830041777277662} --- !u!1101 &-6330240125597374797 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -74,32 +179,29 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-5490857201118474992 +--- !u!1101 &-6065043076313983848 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: SqrMagnitude - m_EventTreshold: 0.32 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4808342128172050504} + m_DstState: {fileID: -8728957671963534527} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.1 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!114 &-5225792750608852525 +--- !u!114 &-5192990550407791829 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -112,17 +214,122 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stateName: - rid: 806583484692037637 + rid: 806583545631342600 index: 0 duration: 0 variables: [] references: version: 2 RefIds: - - rid: 806583484692037637 + - rid: 806583545631342600 type: {class: Reference, ns: BITKit, asm: BITKit} data: - value: Attack + value: Idle.Run +--- !u!1101 &-4881351855068954110 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-4802416949874257785 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Climb + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4956630350526560830} + m_StateMachineBehaviours: + - {fileID: 3363469071731320141} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 566afe7098b7302459ad9409bb645498, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4791035013812960713 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4185332787347170882} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7343dade3869ad849987e58a41f83525, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4445559356404358493 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: SqrMagnitude + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7641792666894948448} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4397701157136412934 AnimatorState: serializedVersion: 6 @@ -151,31 +358,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-4317305609346238121 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: SqrMagnitude - m_EventTreshold: 0.32 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5014609197419658300} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-3878662175773778171 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -198,6 +380,77 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3392603333662517879 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3115364265430923869} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3354836846158127679 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5388638449516825869} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-3291284718368421646 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlockStun + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3354836846158127679} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5887a41e8fc7bba42b6dcd1f4a1b5a48, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-3045698355505083979 AnimatorState: serializedVersion: 6 @@ -226,28 +479,105 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-2370923636210611255 +--- !u!1101 &-2617953725317861317 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: -197837923353883791} - m_DstState: {fileID: 0} + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8643111206852330463} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2145889060832803261 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4926386949977767934} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.1 m_TransitionOffset: 0 - m_ExitTime: 0.9 - m_HasExitTime: 1 + m_ExitTime: 0.75 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-1823982559256643145 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: SqrMagnitude + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5388638449516825869} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!114 &-1162317070233373617 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342603 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342603 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Blocking --- !u!1102 &-558885443963498683 AnimatorState: serializedVersion: 6 @@ -288,14 +618,26 @@ AnimatorStateMachine: m_State: {fileID: 4808342128172050504} m_Position: {x: 270, y: 120, z: 0} - serializedVersion: 1 - m_State: {fileID: 5014609197419658300} + m_State: {fileID: -4802416949874257785} + m_Position: {x: 490, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8643111206852330463} m_Position: {x: 270, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4926386949977767934} + m_Position: {x: 270, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4791035013812960713} + m_Position: {x: 490, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5325781761861725638} + m_Position: {x: 490, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 50, y: 190, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} @@ -315,6 +657,24 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: IsGrounded + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsRunning + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsCrouched + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -328,6 +688,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Additive 1 + m_StateMachine: {fileID: 1735625358940520389} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 1 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!114 &43278618327760154 MonoBehaviour: m_ObjectHideFlags: 1 @@ -352,7 +724,7 @@ MonoBehaviour: type: {class: Reference, ns: BITKit, asm: BITKit} data: value: HeavyAttack ---- !u!114 &1535180452716256385 +--- !u!114 &1124578026182097206 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -365,17 +737,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stateName: - rid: 806583484692037648 + rid: 806583545631342614 index: 0 duration: 0 variables: [] references: version: 2 RefIds: - - rid: 806583484692037648 + - rid: 806583545631342614 type: {class: Reference, ns: BITKit, asm: BITKit} data: - value: Idle.Movement + value: Idle.Dodge --- !u!1107 &1676831279357673680 AnimatorStateMachine: serializedVersion: 6 @@ -385,9 +757,6 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -6953518709728688449} - m_Position: {x: 340, y: 90, z: 0} - serializedVersion: 1 m_State: {fileID: -3045698355505083979} m_Position: {x: -240, y: 110, z: 0} @@ -397,10 +766,19 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -558885443963498683} m_Position: {x: 340, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3115364265430923869} + m_Position: {x: 340, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6353618557057039409} + m_Position: {x: 570, y: 270, z: 0} m_ChildStateMachines: - serializedVersion: 1 m_StateMachine: {fileID: -197837923353883791} m_Position: {x: 40, y: 190, z: 0} + - serializedVersion: 1 + m_StateMachine: {fileID: -6579861193294717924} + m_Position: {x: 340, y: 90, z: 0} m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} @@ -410,6 +788,185 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -3045698355505083979} +--- !u!1107 &1735625358940520389 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Additive 1 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5388638449516825869} + m_Position: {x: 30, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3291284718368421646} + m_Position: {x: 340, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7641792666894948448} + m_Position: {x: 30, y: 260, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5388638449516825869} +--- !u!1101 &2554244241180360008 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3115364265430923869 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blocking + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: + - {fileID: -1162317070233373617} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cc4b95bc4bb045f428916021bfd5faa6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3341830041777277662 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6065043076313983848} + m_StateMachineBehaviours: + - {fileID: 5834955998016208131} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e9a482e76374d514b85c18777e90a9c7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &3363469071731320141 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342599 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342599 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Idle.Vault +--- !u!1101 &4185332787347170882 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsCrouched + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4643574653100910473 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: -197837923353883791} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &4664303776892623618 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -443,7 +1000,9 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -4317305609346238121} + - {fileID: -2145889060832803261} + - {fileID: 5775584611772211645} + - {fileID: -2617953725317861317} m_StateMachineBehaviours: - {fileID: 7042765674023784786} m_Position: {x: 50, y: 50, z: 0} @@ -460,20 +1019,20 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &5014609197419658300 +--- !u!1102 &4926386949977767934 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Movement + m_Name: Air m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -5490857201118474992} + - {fileID: 6342257274747645586} m_StateMachineBehaviours: - - {fileID: 1535180452716256385} + - {fileID: -8676084553781277148} m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -482,12 +1041,259 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d0620b5ee177bad468ceeac53272b40b, type: 2} + m_Motion: {fileID: 7400000, guid: 1d074b7dc9160cb48a7556138159b8d7, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4956630350526560830 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5325781761861725638 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dodge + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6387561320612314491} + m_StateMachineBehaviours: + - {fileID: 1124578026182097206} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3b07b2b951dc7244b9f0792fe29bdfe3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5388638449516825869 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4445559356404358493} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &5555200198169463364 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342613 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342613 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Blocking.Break +--- !u!1101 &5775584611772211645 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsCrouched + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4791035013812960713} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 1 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!114 &5834955998016208131 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583484692037637 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583484692037637 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Attack +--- !u!1101 &5878045903825463455 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: -197837923353883791} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6342257274747645586 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6353618557057039409 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlockBreak + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3392603333662517879} + m_StateMachineBehaviours: + - {fileID: 5555200198169463364} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fe874620c09697c47bbb1fb873e16586, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6387561320612314491 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4808342128172050504} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!114 &7042765674023784786 MonoBehaviour: m_ObjectHideFlags: 1 @@ -512,6 +1318,30 @@ MonoBehaviour: type: {class: Reference, ns: BITKit, asm: BITKit} data: value: Idle +--- !u!114 &7125295406401311545 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583545631342602 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583545631342602 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Idle.AttackEnd --- !u!114 &7593551683899810710 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Artists/Configs/Animator/Pose.controller b/Assets/Artists/Configs/Animator/Pose.controller new file mode 100644 index 000000000..d64d16fac --- /dev/null +++ b/Assets/Artists/Configs/Animator/Pose.controller @@ -0,0 +1,165 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7279506085134558611 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_Tag: + m_SpeedParameter: Speed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6115830228273227718 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsAlive + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-5383015995915285676 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7279506085134558611} + m_Position: {x: 30, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8070093193186123607} + m_Position: {x: 370, y: 70, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -1887378640362712805} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 630, y: 60, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7279506085134558611} +--- !u!1101 &-1887378640362712805 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsAlive + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8070093193186123607} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pose + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0.2 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsAlive + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5383015995915285676} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &8070093193186123607 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6115830228273227718} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: db6569b2f424b464592fb079f6c8e435, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Artists/Configs/Animator/ThrowingController.controller b/Assets/Artists/Configs/Animator/ThrowingController.controller new file mode 100644 index 000000000..9336c156a --- /dev/null +++ b/Assets/Artists/Configs/Animator/ThrowingController.controller @@ -0,0 +1,251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8000311602464041889 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Throw + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4967112762278070718} + m_StateMachineBehaviours: + - {fileID: -6247976549397085200} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 46f6bba0b7dfc524c814da620942f888, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!114 &-6517901631659466536 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583526086934671 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583526086934671 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Draw +--- !u!1107 &-6249399899547047150 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4618170466298800719} + m_Position: {x: 30, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5544499878387165102} + m_Position: {x: 30, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8000311602464041889} + m_Position: {x: 260, y: 210, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 490, y: 210, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 4618170466298800719} +--- !u!114 &-6247976549397085200 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583526086934674 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583526086934674 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Throw +--- !u!114 &-5679675043502648851 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8427dbe4b1369d4facb6106e0a37fe5, type: 3} + m_Name: + m_EditorClassIdentifier: + stateName: + rid: 806583526086934673 + index: 0 + duration: 0 + variables: [] + references: + version: 2 + RefIds: + - rid: 806583526086934673 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Idle +--- !u!1102 &-5544499878387165102 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: + - {fileID: -5679675043502648851} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4967112762278070718 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 1 + m_OrderedInterruption: 0 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowingController + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6249399899547047150} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &4618170466298800719 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Draw + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5333647381821307321} + m_StateMachineBehaviours: + - {fileID: -6517901631659466536} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 73f4040677932bd4eb75341b67350857, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5333647381821307321 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5544499878387165102} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Artists/Configs/Animator/Zombie.overrideController b/Assets/Artists/Configs/Animator/Zombie.overrideController index 99a65cc2c..6c086a71e 100644 --- a/Assets/Artists/Configs/Animator/Zombie.overrideController +++ b/Assets/Artists/Configs/Animator/Zombie.overrideController @@ -15,6 +15,12 @@ AnimatorOverrideController: - m_OriginalClip: {fileID: 7400000, guid: d0620b5ee177bad468ceeac53272b40b, type: 2} m_OverrideClip: {fileID: -5091876547363602435, guid: a91e64e3665997c4aab9ac6657ec7fd2, type: 3} - - m_OriginalClip: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2} - m_OverrideClip: {fileID: -722364122401081825, guid: 10b7a755d3c5c284d978736e6f8af395, + - m_OriginalClip: {fileID: 7400000, guid: c9d4ca0a62700ee488e80586d79da367, type: 2} + m_OverrideClip: {fileID: 6718848898307459054, guid: 2d1247122cb945c48b03642fe8f48bf9, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 2e02f8e429bd50041a0a22e527708abf, type: 2} + m_OverrideClip: {fileID: 4941507361278309450, guid: 69621cc42f6a3324c9a7f7b7ae747a38, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 65a4736dd630e3e4e9f7c6a572a54956, type: 2} + m_OverrideClip: {fileID: 3623907491181672982, guid: 3460fe979eaba16409a3f7668ae33fe5, type: 3} diff --git a/Assets/Artists/Configs/AssetCache.asset b/Assets/Artists/Configs/AssetCache.asset new file mode 100644 index 000000000..adbecd88b --- /dev/null +++ b/Assets/Artists/Configs/AssetCache.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80b507ad25f1af24687db7fa18d953fd, type: 3} + m_Name: AssetCache + m_EditorClassIdentifier: + isEditable: 1 + _assets: + - {fileID: 4066453597750257159, guid: f18510934c4581d47819abfbf1bd3647, type: 3} + - {fileID: 4826102346843731729, guid: e5d265393747af741b4f5d719598831a, type: 3} + - {fileID: 594564951014165300, guid: 374b2f92905c4f147abf889c9aeb5aab, type: 3} + - {fileID: 102900000, guid: 2dee481995db18f4f833cba844c60c01, type: 3} + - {fileID: 102900000, guid: 64ec0870d67188d4a92d78fb4f1b656e, type: 3} + - {fileID: 102900000, guid: b89cff0714cbe0f47916a494c499616e, type: 3} + - {fileID: 102900000, guid: c983dbe6ebc2b57489601f50c99fa1cb, type: 3} + - {fileID: 102900000, guid: c07a96c3e3e14944ca8e41b6d805923e, type: 3} diff --git a/Assets/Artists/Configs/Items/Apple.asset b/Assets/Artists/Configs/Items/Apple.asset index 5533bf6f0..e94f6e5ed 100644 --- a/Assets/Artists/Configs/Items/Apple.asset +++ b/Assets/Artists/Configs/Items/Apple.asset @@ -23,6 +23,7 @@ MonoBehaviour: - rid: 6077775448293769231 - rid: 806583097028509696 - rid: 806583097028509697 + - rid: 806583545631342594 references: version: 2 RefIds: @@ -34,6 +35,9 @@ MonoBehaviour: type: {class: PlayerEatAddThirst, ns: BITFALL.Player.Survival, asm: BITFALL.Player.Survival} data: value: 15 + - rid: 806583545631342594 + type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: - rid: 6077775448293769231 type: {class: ItemWeight, ns: BITFALL, asm: BITFALL.Item} data: diff --git a/Assets/Artists/Configs/Items/BodyPlate.asset b/Assets/Artists/Configs/Items/BodyPlate.asset index 392740a12..5da416794 100644 --- a/Assets/Artists/Configs/Items/BodyPlate.asset +++ b/Assets/Artists/Configs/Items/BodyPlate.asset @@ -20,7 +20,7 @@ MonoBehaviour: rectangleIcon: {fileID: 2800000, guid: 0e89085d0836ce54f955db61e1762017, type: 3} quality: 3 factoryProperties: - - rid: 806583484692037655 + - rid: 806583526086934678 - rid: 806583484692037794 meleeDamage: 0 meleeRange: 0 @@ -31,10 +31,15 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 806583484692037655 - type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment} - data: - rid: 806583484692037794 type: {class: AddArmor, ns: BITFALL.Items.Armor, asm: BITFALL.Item} data: Armor: 25 + - rid: 806583526086934678 + type: {class: EquipmentAsSlot, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: + slot: + rid: 806583526086934680 + - rid: 806583526086934680 + type: {class: EquipmentAsArmorPlate, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: diff --git a/Assets/Artists/Configs/Items/Grenade.asset b/Assets/Artists/Configs/Items/Grenade.asset new file mode 100644 index 000000000..3d387572e --- /dev/null +++ b/Assets/Artists/Configs/Items/Grenade.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85133da5368bfe4b845d18f4e7def30, type: 3} + m_Name: Grenade + m_EditorClassIdentifier: + displayName: "\u9AD8\u7206\u624B\u96F7" + description: "\u4E22\u51FA\u53BB" + addressablePath: Assets/Grenade + prefab: {fileID: 2065734771687522921, guid: a553c303344ee814ab274017e0f0e389, type: 3} + squareIcon: {fileID: 2800000, guid: eb6f6f191136996449c69251d147e308, type: 3} + rectangleIcon: {fileID: 2800000, guid: eb6f6f191136996449c69251d147e308, type: 3} + quality: 0 + factoryProperties: + - rid: 806583526086934675 + instance: {fileID: 5322756313667207077, guid: 6c561c5784df77f4aa248f741584c96f, + type: 3} + references: + version: 2 + RefIds: + - rid: 806583526086934675 + type: {class: EquipmentAsSlot, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: + slot: + rid: 806583526086934677 + - rid: 806583526086934677 + type: {class: EquipmentAsThrow, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: diff --git a/Assets/Artists/Configs/Items/Soda.asset b/Assets/Artists/Configs/Items/Soda.asset new file mode 100644 index 000000000..1ea7d44f5 --- /dev/null +++ b/Assets/Artists/Configs/Items/Soda.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1124c18d28c78f74cae355c518715ba3, type: 3} + m_Name: Soda + m_EditorClassIdentifier: + displayName: "\u82CF\u6253\u6C34" + description: "\u996E\u6599" + addressablePath: Assets/Soda + prefab: {fileID: 1906669864236619332, guid: 90a7e66310865604a84cc4f70bccc45b, type: 3} + squareIcon: {fileID: 0} + rectangleIcon: {fileID: 0} + quality: 0 + factoryProperties: + - rid: 806583545631342598 + references: + version: 2 + RefIds: + - rid: 806583545631342598 + type: {class: EquipmentUseItem, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: diff --git a/Assets/Artists/Configs/Items/Weapon_Glock.asset b/Assets/Artists/Configs/Items/Weapon_Glock.asset index 56729908b..1682471b8 100644 --- a/Assets/Artists/Configs/Items/Weapon_Glock.asset +++ b/Assets/Artists/Configs/Items/Weapon_Glock.asset @@ -31,6 +31,8 @@ MonoBehaviour: heavyMeleeForce: 0 fireMode: rid: 806583484692037646 + initialDamage: 12 + initialBulletForce: 256 references: version: 2 RefIds: @@ -47,7 +49,7 @@ MonoBehaviour: - rid: 806583484692037646 type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item} data: - fireRate: 3 + fireRate: 8 - rid: 6077775441645010964 type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment} data: diff --git a/Assets/Artists/Configs/Items/Weapon_M4A1.asset b/Assets/Artists/Configs/Items/Weapon_M4A1.asset index 6f8e7284a..f16953062 100644 --- a/Assets/Artists/Configs/Items/Weapon_M4A1.asset +++ b/Assets/Artists/Configs/Items/Weapon_M4A1.asset @@ -23,6 +23,7 @@ MonoBehaviour: - rid: 749940214065790993 - rid: 749940214065790995 - rid: 6077775441645010963 + - rid: 806583545631342592 meleeDamage: 32 meleeRange: 2 meleeForce: 64 @@ -31,6 +32,8 @@ MonoBehaviour: heavyMeleeForce: 0 fireMode: rid: 806583484692037645 + initialDamage: 32 + initialBulletForce: 512 references: version: 2 RefIds: @@ -48,6 +51,10 @@ MonoBehaviour: type: {class: AutoFireMode, ns: BITFALL.Guns, asm: BITFALL.Item} data: fireRate: 10 + - rid: 806583545631342592 + type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item} + data: + recoil: {x: -1, y: 1, z: 1} - rid: 6077775441645010963 type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment} data: diff --git a/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset b/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset index 6240e9b26..8857d7e9f 100644 --- a/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset +++ b/Assets/Artists/Configs/Items/Weapon_TacticalKnife.asset @@ -28,6 +28,8 @@ MonoBehaviour: heavyMeleeDamage: 64 heavyMeleeRange: 2.4 heavyMeleeForce: 512 + blockStaminaCost: 32 + heavyAttackStaminaCost: 64 references: version: 2 RefIds: diff --git a/Assets/Artists/Configs/PhysicsMaterial/Prop.physicMaterial b/Assets/Artists/Configs/PhysicsMaterial/Prop.physicMaterial new file mode 100644 index 000000000..bd354a579 --- /dev/null +++ b/Assets/Artists/Configs/PhysicsMaterial/Prop.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Prop + dynamicFriction: 0.6 + staticFriction: 0.6 + bounciness: 1 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/Artists/Configs/URP/Universal Render Pipeline Asset_Renderer.asset b/Assets/Artists/Configs/URP/Universal Render Pipeline Asset_Renderer.asset index b4648b792..6adcdeb23 100644 --- a/Assets/Artists/Configs/URP/Universal Render Pipeline Asset_Renderer.asset +++ b/Assets/Artists/Configs/URP/Universal Render Pipeline Asset_Renderer.asset @@ -158,10 +158,10 @@ MonoBehaviour: m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 - m_Bits: 2147513463 + m_Bits: 2147578999 m_TransparentLayerMask: serializedVersion: 2 - m_Bits: 2147513463 + m_Bits: 2147578999 m_DefaultStencilState: overrideStencilState: 0 stencilReference: 0 diff --git a/Assets/Artists/Configs/VFX/VFX_Explosion_Large.asset b/Assets/Artists/Configs/VFX/VFX_Explosion_Large.asset new file mode 100644 index 000000000..02f2fc561 --- /dev/null +++ b/Assets/Artists/Configs/VFX/VFX_Explosion_Large.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdd387d83e4ca1e42ac03c3aa9700ffb, type: 3} + m_Name: VFX_Explosion_Large + m_EditorClassIdentifier: + tags: + - Explosion + - Large + prefabs: + - {fileID: 4070324366562018, guid: 585a1ef8c48a0cf4f97332139e4344de, type: 3} + clips: [] diff --git a/Assets/Artists/Configs/VFX/VFX_Explosion_Small.asset b/Assets/Artists/Configs/VFX/VFX_Explosion_Small.asset new file mode 100644 index 000000000..870754c09 --- /dev/null +++ b/Assets/Artists/Configs/VFX/VFX_Explosion_Small.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdd387d83e4ca1e42ac03c3aa9700ffb, type: 3} + m_Name: VFX_Explosion_Small + m_EditorClassIdentifier: + tags: + - Explosion + - Small + prefabs: + - {fileID: 4934833856949886, guid: 5ed0a013702bd9f42847584f2fba7b21, type: 3} + clips: [] diff --git a/Assets/Artists/Materials/PropTrail.mat b/Assets/Artists/Materials/PropTrail.mat new file mode 100644 index 000000000..3e94f528a --- /dev/null +++ b/Assets/Artists/Materials/PropTrail.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PropTrail + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} + - _Color: {r: 0.23584905, g: 0.23584905, b: 0.23584905, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8701979043053073582 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Artists/Models/Character/Pixel T Pose.overrideController b/Assets/Artists/Models/Character/Pixel T Pose.overrideController new file mode 100644 index 000000000..d84e4dac3 --- /dev/null +++ b/Assets/Artists/Models/Character/Pixel T Pose.overrideController @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pixel T Pose + m_Controller: {fileID: 9100000, guid: e02d4ce1a25e59044ab795f54f132e81, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_OverrideClip: {fileID: -2293594877620285250, guid: d2f75d8e6a81ba847a6a465d67613ca3, + type: 3} diff --git a/Assets/Artists/Models/Character/Pixel Zombie Walk Pose.overrideController b/Assets/Artists/Models/Character/Pixel Zombie Walk Pose.overrideController new file mode 100644 index 000000000..619ad5825 --- /dev/null +++ b/Assets/Artists/Models/Character/Pixel Zombie Walk Pose.overrideController @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pixel Zombie Walk Pose + m_Controller: {fileID: 9100000, guid: e02d4ce1a25e59044ab795f54f132e81, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_OverrideClip: {fileID: -5091876547363602435, guid: a91e64e3665997c4aab9ac6657ec7fd2, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: db6569b2f424b464592fb079f6c8e435, type: 2} + m_OverrideClip: {fileID: -203655887218126122, guid: dc4756a89a53e6d4e82c39f5049fbe01, + type: 3} diff --git a/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController b/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController index c5f85a845..299f8d2e2 100644 --- a/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController +++ b/Assets/Artists/Models/Guns/Glock/Weapon_Glock.overrideController @@ -51,3 +51,6 @@ AnimatorOverrideController: - m_OriginalClip: {fileID: 7400000, guid: 77284660b64f8b747a959381bd306474, type: 2} m_OverrideClip: {fileID: 4080960951410847890, guid: 1ce161a4d1dd40c4fa95801c98f74a9a, type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 15a76fda2edc7f546ba25b31b5ef83df, type: 2} + m_OverrideClip: {fileID: -6195238572310982530, guid: 1ce161a4d1dd40c4fa95801c98f74a9a, + type: 3} diff --git a/Assets/Artists/Models/Guns/Grenade/GrenadeController.overrideController b/Assets/Artists/Models/Guns/Grenade/GrenadeController.overrideController new file mode 100644 index 000000000..1226f55a0 --- /dev/null +++ b/Assets/Artists/Models/Guns/Grenade/GrenadeController.overrideController @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrenadeController + m_Controller: {fileID: 9100000, guid: fb4196238dafc7d4d82517684cd52530, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 73f4040677932bd4eb75341b67350857, type: 2} + m_OverrideClip: {fileID: -8338382455432740736, guid: cb6f4c06ca047ab46a4544cf72d3dd29, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_OverrideClip: {fileID: 4393887427240190399, guid: 8a672a6cd8c71ed46828951d174a3668, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 46f6bba0b7dfc524c814da620942f888, type: 2} + m_OverrideClip: {fileID: -5257303220199946108, guid: 8ff32d43bc7cc854bac5229cfb1391ef, + type: 3} diff --git a/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade.fbx b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade.fbx new file mode 100644 index 000000000..2d050bb33 Binary files /dev/null and b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade.fbx differ diff --git a/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Draw.fbx b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Draw.fbx new file mode 100644 index 000000000..634f8f772 Binary files /dev/null and b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Draw.fbx differ diff --git a/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Idle.fbx b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Idle.fbx new file mode 100644 index 000000000..95ceb8579 Binary files /dev/null and b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Idle.fbx differ diff --git a/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Throw.fbx b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Throw.fbx new file mode 100644 index 000000000..71b2647f9 Binary files /dev/null and b/Assets/Artists/Models/Guns/Grenade/Weapon_Grenade_Throw.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife.overrideController b/Assets/Artists/Models/Guns/Knife/Weapon_Knife.overrideController index 4c4e866cf..81d662169 100644 --- a/Assets/Artists/Models/Guns/Knife/Weapon_Knife.overrideController +++ b/Assets/Artists/Models/Guns/Knife/Weapon_Knife.overrideController @@ -15,15 +15,42 @@ AnimatorOverrideController: - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} m_OverrideClip: {fileID: 5657959625736482136, guid: 795d0394edea55e48877e2a1344c6a6c, type: 3} - - m_OriginalClip: {fileID: 7400000, guid: 2b45424ac8e214c4da0c4b01e0f12e26, type: 2} - m_OverrideClip: {fileID: -8258539846888773597, guid: a448c064cd1091842b88dd43ca2eefe0, - type: 3} - - m_OriginalClip: {fileID: 7400000, guid: b284fad7bab8946409596cf2fa026183, type: 2} - m_OverrideClip: {fileID: -3788192840474646268, guid: a55d4a17eb62edb4088f46d749b58533, - type: 3} - m_OriginalClip: {fileID: 7400000, guid: 4da740d3fb8d6314e83c21319babaf42, type: 2} - m_OverrideClip: {fileID: 6244984777284968991, guid: a55d4a17eb62edb4088f46d749b58533, + m_OverrideClip: {fileID: -7970074381734785042, guid: a55d4a17eb62edb4088f46d749b58533, type: 3} - m_OriginalClip: {fileID: 7400000, guid: d0620b5ee177bad468ceeac53272b40b, type: 2} m_OverrideClip: {fileID: 2769012671361460899, guid: d3faafbd3fcedd649b6552d0f9a62783, type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 566afe7098b7302459ad9409bb645498, type: 2} + m_OverrideClip: {fileID: -414979343953801861, guid: a6bcb63f8a49a8749a351c3c2ab1aa99, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 2a2012ea7f7e0e042ac7ede06063b02b, type: 2} + m_OverrideClip: {fileID: -5450341521799247371, guid: 3dca7acf70681964ba9a1e1152b3400b, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 1d074b7dc9160cb48a7556138159b8d7, type: 2} + m_OverrideClip: {fileID: -4509724848758072185, guid: d6e319582f9a33d4a80cbbdcaf8520f4, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 741f207a9cd5e274e9857c8413b4612d, type: 2} + m_OverrideClip: {fileID: -5753053011699401731, guid: a448c064cd1091842b88dd43ca2eefe0, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: b284fad7bab8946409596cf2fa026183, type: 2} + m_OverrideClip: {fileID: -1530120222888193253, guid: a55d4a17eb62edb4088f46d749b58533, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: cc4b95bc4bb045f428916021bfd5faa6, type: 2} + m_OverrideClip: {fileID: 6072056331044761096, guid: 3bd721f5e09f35543b71d790dc1d7194, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 5887a41e8fc7bba42b6dcd1f4a1b5a48, type: 2} + m_OverrideClip: {fileID: -8167393430906583419, guid: 942f9bcafa8296544af76bb30b0b1dc5, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 7343dade3869ad849987e58a41f83525, type: 2} + m_OverrideClip: {fileID: -4500336822287237752, guid: b3f9dea9c53d5e243bae675f68d83135, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: fe874620c09697c47bbb1fb873e16586, type: 2} + m_OverrideClip: {fileID: 57119479966093960, guid: 31c701cf0cec38048a0f3d4d7c4c1263, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 3b07b2b951dc7244b9f0792fe29bdfe3, type: 2} + m_OverrideClip: {fileID: 7129494066840294688, guid: e4a84e7ecee6f4942b3e90407a90b983, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: e9a482e76374d514b85c18777e90a9c7, type: 2} + m_OverrideClip: {fileID: -8258539846888773597, guid: a448c064cd1091842b88dd43ca2eefe0, + type: 3} diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Air.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Air.fbx new file mode 100644 index 000000000..5167deae0 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Air.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Break.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Break.fbx new file mode 100644 index 000000000..cf7a1dd99 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Break.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Dodge.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Dodge.fbx new file mode 100644 index 000000000..27dc48d1a Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Dodge.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Stun.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Stun.fbx new file mode 100644 index 000000000..e81a08863 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Block_Stun.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Blocking.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Blocking.fbx new file mode 100644 index 000000000..3f3d642b8 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Blocking.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Charging.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Charging.fbx new file mode 100644 index 000000000..bb027adb7 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Charging.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Climb.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Climb.fbx new file mode 100644 index 000000000..503e2e7a0 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Climb.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Crouch.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Crouch.fbx new file mode 100644 index 000000000..fb1c99a69 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Crouch.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Power_Melee.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Power_Melee.fbx index 206cb79ab..b92499ddc 100644 Binary files a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Power_Melee.fbx and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Power_Melee.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Run.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Run.fbx new file mode 100644 index 000000000..485808e80 Binary files /dev/null and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Run.fbx differ diff --git a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Walk.fbx b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Walk.fbx index 3a52634f1..fdc253697 100644 Binary files a/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Walk.fbx and b/Assets/Artists/Models/Guns/Knife/Weapon_Knife_Walk.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Drink Controller.overrideController b/Assets/Artists/Models/Guns/Universal/Drink Controller.overrideController new file mode 100644 index 000000000..209543d82 --- /dev/null +++ b/Assets/Artists/Models/Guns/Universal/Drink Controller.overrideController @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Drink Controller + m_Controller: {fileID: 9100000, guid: 54bb0a1b6be534c41943702b6ed03fcd, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 73f4040677932bd4eb75341b67350857, type: 2} + m_OverrideClip: {fileID: -1857513517209602094, guid: 1f96d1b73da522e479a6528064c4befd, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 54f4e2ca20ada7048b4391fd9d34437b, type: 2} + m_OverrideClip: {fileID: -4414857318166680542, guid: 0a2ac41cf551d6341ac828c4dc090409, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: f6a6f20b92917f641892b11af02a0efb, type: 2} + m_OverrideClip: {fileID: 3563520493156505153, guid: 2eba13da9dcb6284d8f5bbc8e3a542b7, + type: 3} diff --git a/Assets/Artists/Models/Guns/Universal/Eat Controller.overrideController b/Assets/Artists/Models/Guns/Universal/Eat Controller.overrideController new file mode 100644 index 000000000..ba440ea90 --- /dev/null +++ b/Assets/Artists/Models/Guns/Universal/Eat Controller.overrideController @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Eat Controller + m_Controller: {fileID: 9100000, guid: 54bb0a1b6be534c41943702b6ed03fcd, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 73f4040677932bd4eb75341b67350857, type: 2} + m_OverrideClip: {fileID: -1857513517209602094, guid: 1f96d1b73da522e479a6528064c4befd, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 54f4e2ca20ada7048b4391fd9d34437b, type: 2} + m_OverrideClip: {fileID: -6515507247370789092, guid: 403a36bac54bcd244acf8bdcd4a17530, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: f6a6f20b92917f641892b11af02a0efb, type: 2} + m_OverrideClip: {fileID: 3563520493156505153, guid: 2eba13da9dcb6284d8f5bbc8e3a542b7, + type: 3} diff --git a/Assets/Artists/Models/Guns/Universal/Universal Armature.fbx b/Assets/Artists/Models/Guns/Universal/Universal Armature.fbx new file mode 100644 index 000000000..33a204b3e Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Armature.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Universal Drink 01.fbx b/Assets/Artists/Models/Guns/Universal/Universal Drink 01.fbx new file mode 100644 index 000000000..85804e9bf Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Drink 01.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Universal Drink.fbx b/Assets/Artists/Models/Guns/Universal/Universal Drink.fbx new file mode 100644 index 000000000..f6e058aae Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Drink.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Universal Eat Draw.fbx b/Assets/Artists/Models/Guns/Universal/Universal Eat Draw.fbx new file mode 100644 index 000000000..9e3206fc9 Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Eat Draw.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Universal Eat.fbx b/Assets/Artists/Models/Guns/Universal/Universal Eat.fbx new file mode 100644 index 000000000..28116ef52 Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Eat.fbx differ diff --git a/Assets/Artists/Models/Guns/Universal/Universal Exit.fbx b/Assets/Artists/Models/Guns/Universal/Universal Exit.fbx new file mode 100644 index 000000000..f3d43b4bc Binary files /dev/null and b/Assets/Artists/Models/Guns/Universal/Universal Exit.fbx differ diff --git a/Assets/Artists/Prefabs/EntityProxy.prefab b/Assets/Artists/Prefabs/EntityProxy.prefab index 18cf298ed..dc823752b 100644 --- a/Assets/Artists/Prefabs/EntityProxy.prefab +++ b/Assets/Artists/Prefabs/EntityProxy.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 970665078024910077} serializedVersion: 2 m_LocalRotation: {x: 0.70710665, y: 0.70710695, z: 0.00000033102063, w: -0.0000001986123} - m_LocalPosition: {x: 0.7999984, y: 1.099999, z: 0} + m_LocalPosition: {x: 0.79999924, y: 1.099999, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -189,6 +189,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 8190192540717976532} layerInfos: [] --- !u!114 &3488683244084915478 @@ -205,10 +206,6 @@ MonoBehaviour: m_EditorClassIdentifier: healthPoint: 100 maxHealthPoint: 100 - additiveCallback: [] - references: - version: 2 - RefIds: [] --- !u!136 &2630237995018867325 CapsuleCollider: m_ObjectHideFlags: 0 @@ -392,7 +389,7 @@ PrefabInstance: - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: 0.2999996 + value: 0.29999924 objectReference: {fileID: 0} - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -429,6 +426,11 @@ PrefabInstance: propertyPath: m_Sources.Array.data[0].sourceTransform value: objectReference: {fileID: 7966736535697609210} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.10000038 + objectReference: {fileID: 0} - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.y @@ -527,7 +529,7 @@ PrefabInstance: - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.00000011920929 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -557,7 +559,7 @@ PrefabInstance: - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.000000059604645 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -587,7 +589,7 @@ PrefabInstance: - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.29999977 + value: -0.29999924 objectReference: {fileID: 0} - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -632,7 +634,7 @@ PrefabInstance: - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.29999977 + value: -0.29999924 objectReference: {fileID: 0} - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -657,7 +659,7 @@ PrefabInstance: - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: 0.2999996 + value: 0.29999924 objectReference: {fileID: 0} - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -687,7 +689,7 @@ PrefabInstance: - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.099999964 + value: -0.10000038 objectReference: {fileID: 0} - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -714,6 +716,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.00000009362675 objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000038 + objectReference: {fileID: 0} - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.y @@ -742,7 +749,7 @@ PrefabInstance: - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: -0.000000059604645 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} @@ -767,7 +774,7 @@ PrefabInstance: - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_LocalPosition.x - value: 0.099999785 + value: 0.10000038 objectReference: {fileID: 0} - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} diff --git a/Assets/Artists/Prefabs/Experimental/Physics.prefab b/Assets/Artists/Prefabs/Experimental/Physics.prefab new file mode 100644 index 000000000..e59cb6ac4 --- /dev/null +++ b/Assets/Artists/Prefabs/Experimental/Physics.prefab @@ -0,0 +1,773 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5184500551525858626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1488513706006886731} + - component: {fileID: 1059752911028458492} + - component: {fileID: 3263246318226491613} + m_Layer: 6 + m_Name: Physics + m_TagString: Untagged + m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1488513706006886731 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184500551525858626} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6654904854822696360} + - {fileID: 7675112552290532003} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1059752911028458492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184500551525858626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73333e0a8f0bc4a4b82c06db4c35a21f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3263246318226491613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184500551525858626} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 085a82cd092152541adfdf24c9f42394, type: 3} + m_Name: + m_EditorClassIdentifier: + healthPoint: 100 + maxHealthPoint: 100 +--- !u!1001 &4733328602091139164 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488513706006886731} + m_Modifications: + - target: {fileID: 1630585989029977934, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Name + value: Physics Variant + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4298570866601109607, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4378624254320444163, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9cc7ad0d733f9a84d89a008275cac4b4, type: 2} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} +--- !u!4 &236783739773492473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4825906924822146213, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &577840618519049956 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5311098224781035192, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &600191881288175418 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 5324492942882635622, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1255713259091355519 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5826841836839622435, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &4400005316181101327 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8989146153544629075, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4921863787326827064 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 431730115155581540, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4981850690467787189 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 329677050363986409, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &5178581637388159851 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 463358143652920119, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5294819008325123768 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 633548069016882916, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &5332698323852698695 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 842636669685928987, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5588193203707827092 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 881976917834032072, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &6595802139768547508 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 1889495685208529128, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6654904854822696360 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &6873856420735714614 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 2221680581860341098, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &7078363941500400596 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 2561228540091958152, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7091072646279727237 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2582995021366606041, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &7762971062336806598 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 3029713378771627674, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &7885159738411666043 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 3232914140568484391, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8472748404607860572 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3757434209619021568, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8606114299085410055 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3953920859050344283, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8651046498550145619 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4160932145006727695, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &8797709461692913723 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 4298570866601109607, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!54 &9186358438782565937 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 4525177668422684269, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 4733328602091139164} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7502351149582208748 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1488513706006886731} + m_Modifications: + - target: {fileID: 139291906883361929, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 8606114299085410055} + - target: {fileID: 150634226952185381, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Name + value: Hitbox + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999988 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 913909496426237269, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 8472748404607860572} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.10000038 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1739064665863670345, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 1255713259091355519} + - target: {fileID: 1874199891205045866, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 7078363941500400596} + - target: {fileID: 2141917366135397946, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 9186358438782565937} + - target: {fileID: 2473833789607836118, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 5178581637388159851} + - target: {fileID: 2553428034442830580, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 7762971062336806598} + - target: {fileID: 2917499401471096760, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 5588193203707827092} + - target: {fileID: 3187664028531886934, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 577840618519049956} + - target: {fileID: 3305645500564667542, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 8651046498550145619} + - target: {fileID: 3626321072363289128, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 8797709461692913723} + - target: {fileID: 4122386449072780396, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 7091072646279727237} + - target: {fileID: 4228425057871401426, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 7885159738411666043} + - target: {fileID: 4749050591813349255, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 4400005316181101327} + - target: {fileID: 4871982522611036922, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 236783739773492473} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.2999988 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121728491104445451, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 4921863787326827064} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.59999996 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5881815326525319811, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 5332698323852698695} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.29999924 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999987 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 5997892003019056750, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 6873856420735714614} + - target: {fileID: 6420050546190708472, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 5294819008325123768} + - target: {fileID: 6450095961494564829, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 6595802139768547508} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.29999924 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240822 + objectReference: {fileID: 0} + - target: {fileID: 7520077443289668456, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 600191881288175418} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.10000038 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 8.7659685e-15 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000038 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9000001 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000038 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9080110541041845623, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 4981850690467787189} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} +--- !u!4 &7675112552290532003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + m_PrefabInstance: {fileID: 7502351149582208748} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Loot/Apple.prefab b/Assets/Artists/Prefabs/Loot/Apple.prefab index d2d8f087c..8beccfd55 100644 --- a/Assets/Artists/Prefabs/Loot/Apple.prefab +++ b/Assets/Artists/Prefabs/Loot/Apple.prefab @@ -1,97 +1,97 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7228637743355734416 -GameObject: +--- !u!1001 &3618885455122787520 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1536248110091890728} - - component: {fileID: 2486184499613721321} - - component: {fileID: 6587314398399098282} - m_Layer: 10 - m_Name: Sprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1536248110091890728 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7228637743355734416} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.16, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5208964436538694514} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2486184499613721321 -SpriteRenderer: + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5208964436538694514} + 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.0746 + 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} + m_RemovedComponents: + - {fileID: 2120823588654661318, guid: 6db7680dca4eb2748a7339cb3bc13d14, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1755865475335770947, guid: 6db7680dca4eb2748a7339cb3bc13d14, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6730421992040075449} + m_SourcePrefab: {fileID: 100100000, guid: 6db7680dca4eb2748a7339cb3bc13d14, type: 3} +--- !u!4 &2390597563865195833 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1375224013855558137, guid: 6db7680dca4eb2748a7339cb3bc13d14, + type: 3} + m_PrefabInstance: {fileID: 3618885455122787520} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3055353135379332995 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1755865475335770947, guid: 6db7680dca4eb2748a7339cb3bc13d14, + type: 3} + m_PrefabInstance: {fileID: 3618885455122787520} + m_PrefabAsset: {fileID: 0} +--- !u!135 &6730421992040075449 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7228637743355734416} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9191ebffef8c77c4690899c5c64eec2c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 1847463989, guid: a03c2610221b14940b818fb271b448fa, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 1 - m_Size: {x: 0.32, y: 0.32} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!65 &6587314398399098282 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7228637743355734416} + m_GameObject: {fileID: 3055353135379332995} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -104,8 +104,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.32, y: 0.32, z: 0.2} - m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.052194618 + m_Center: {x: 0.0063194875, y: -0.017724512, z: 0.0038924012} --- !u!1001 &8313153689434553364 PrefabInstance: m_ObjectHideFlags: 0 @@ -119,6 +119,21 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8a2e296f2c4fc694cbc3aaa9ab680cf2, type: 2} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: rmsCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} propertyPath: m_Icon @@ -185,7 +200,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} insertIndex: -1 - addedObject: {fileID: 1536248110091890728} + addedObject: {fileID: 2390597563865195833} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} --- !u!4 &5208964436538694514 stripped diff --git a/Assets/Artists/Prefabs/Loot/Container/Medical Container Variant.prefab b/Assets/Artists/Prefabs/Loot/Container/Medical Container Variant.prefab new file mode 100644 index 000000000..440b1e639 --- /dev/null +++ b/Assets/Artists/Prefabs/Loot/Container/Medical Container Variant.prefab @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2291556582085502530 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1280648063199100991} + m_Modifications: + - target: {fileID: 1588381071799560, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_Name + value: SM_Prop_Crate_Medical_01 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 538bd2dae55dac44f942fd3ed7c2a334, type: 3} +--- !u!4 &2288768479888608342 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4055409609746964, guid: 538bd2dae55dac44f942fd3ed7c2a334, + type: 3} + m_PrefabInstance: {fileID: 2291556582085502530} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6414151364918162970 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 983746125067583350, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: containerName + value: "\u533B\u7597\u7BB1" + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.865595 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalPosition.z + value: -29.873026 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3039668467423147567, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5514379543162470980, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_Name + value: Medical Container Variant + objectReference: {fileID: 0} + - target: {fileID: 6613225001753557279, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + propertyPath: m_Mass + value: 20 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5243986628670584357, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2288768479888608342} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 27719a3d454f29b4381adf6c7c1bd84d, type: 3} +--- !u!4 &1280648063199100991 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5243986628670584357, guid: 27719a3d454f29b4381adf6c7c1bd84d, + type: 3} + m_PrefabInstance: {fileID: 6414151364918162970} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Loot/Core/World Container.prefab b/Assets/Artists/Prefabs/Loot/Core/World Container.prefab new file mode 100644 index 000000000..e612204b7 --- /dev/null +++ b/Assets/Artists/Prefabs/Loot/Core/World Container.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5514379543162470980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3039668467423147567} + - component: {fileID: 4022326282636868525} + - component: {fileID: 983746125067583350} + - component: {fileID: 6613225001753557279} + - component: {fileID: 8314584148488170862} + m_Layer: 0 + m_Name: World Container + m_TagString: Untagged + m_Icon: {fileID: 419385456094870383, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3039668467423147567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514379543162470980} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 29.865595, y: 0, z: -29.873026} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5243986628670584357} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4022326282636868525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514379543162470980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc54ec95ef8983c43ba8ef43dae16792, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &983746125067583350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514379543162470980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 562931a926056a5449f518859ae34807, type: 3} + m_Name: + m_EditorClassIdentifier: + containerName: +--- !u!54 &6613225001753557279 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514379543162470980} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &8314584148488170862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5514379543162470980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad098f307334e54dbcffd896748414c, type: 3} + m_Name: + m_EditorClassIdentifier: + OnNone: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3613778988776262925} + m_TargetAssemblyTypeName: HighlightPlus.HighlightEffect, Assembly-CSharp-firstpass + m_MethodName: set_highlighted + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + OnHover: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3613778988776262925} + m_TargetAssemblyTypeName: HighlightPlus.HighlightEffect, Assembly-CSharp-firstpass + m_MethodName: set_highlighted + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + OnActive: + m_PersistentCalls: + m_Calls: [] + OnInactive: + m_PersistentCalls: + m_Calls: [] + OnFocus: + m_PersistentCalls: + m_Calls: [] + OnSelected: + m_PersistentCalls: + m_Calls: [] + OnEnabled: + m_PersistentCalls: + m_Calls: [] + OnChecked: + m_PersistentCalls: + m_Calls: [] + OnRoot: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7906612773314706052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5243986628670584357} + - component: {fileID: 3613778988776262925} + m_Layer: 0 + m_Name: Models + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5243986628670584357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7906612773314706052} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3039668467423147567} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3613778988776262925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7906612773314706052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 11400000, guid: cfdd534c99ce7c14b89b0f4ae415d2c6, type: 2} + profileSync: 1 + previewInEditor: 1 + camerasLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + effectGroup: 0 + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + combineMeshes: 0 + alphaCutOff: 0 + cullBackFaces: 1 + ignoreObjectVisibility: 0 + reflectionProbes: 0 + GPUInstancing: 1 + depthClip: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + normalsOption: 0 + ignore: 0 + _highlighted: 0 + fadeInDuration: 0 + fadeOutDuration: 0 + flipY: 0 + constantWidth: 1 + subMeshMask: -1 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 1 + overlayMinIntensity: 0.5 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureScale: 1 + outline: 1 + outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineWidth: 0.64 + outlineQuality: 1 + outlineDownsampling: 2 + outlineVisibility: 0 + glowBlendMode: 0 + outlineBlitDebug: 0 + outlineIndependent: 0 + glow: 0 + glowWidth: 0.4 + glowQuality: 1 + glowDownsampling: 2 + glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} + glowDithering: 1 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowBlitDebug: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowIgnoreMask: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 0} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXCenter: {fileID: 0} + targetFXRotationSpeed: 50 + targetFXInitialScale: 4 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 0 + targetFXAlignToGround: 0 + targetFXFadePower: 32 + targetFXGroundMaxDistance: 15 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 1.5 + targetFXVisibility: 1 + seeThrough: 2 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderThreshold: 0.4 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderOnly: 0 + seeThroughBorderWidth: 0.45 + seeThroughOrdered: 0 + rmsCount: 1 + hitFxInitialIntensity: 0 + hitFxMode: 0 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 diff --git a/Assets/Artists/Prefabs/Loot/Grenade.prefab b/Assets/Artists/Prefabs/Loot/Grenade.prefab new file mode 100644 index 000000000..87a713b2d --- /dev/null +++ b/Assets/Artists/Prefabs/Loot/Grenade.prefab @@ -0,0 +1,190 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &927458598961844653 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2863517944815216392} + m_Modifications: + - target: {fileID: 2592293680569191996, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 13400000, guid: 32c83055040644f4bab72889aab3344a, + type: 2} + - target: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Name + value: Grenade_02 + objectReference: {fileID: 0} + - target: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.0572 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138148280581934609, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3} +--- !u!4 &5976630138459621894 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + m_PrefabInstance: {fileID: 927458598961844653} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2065734773772091502 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2084569607, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} + propertyPath: asset + value: + objectReference: {fileID: 11400000, guid: beaccfe60f8582e4895457499e18b12c, + type: 2} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: rmsCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_Name + value: Grenade + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.x + value: 27.302896 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.z + value: -33.83466 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5976630138459621894} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} +--- !u!4 &2863517944815216392 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + m_PrefabInstance: {fileID: 2065734773772091502} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Loot/Soda Variant.prefab b/Assets/Artists/Prefabs/Loot/Soda Variant.prefab new file mode 100644 index 000000000..9059d2da3 --- /dev/null +++ b/Assets/Artists/Prefabs/Loot/Soda Variant.prefab @@ -0,0 +1,174 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &759870061630108761 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2405606720286323493} + m_Modifications: + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4208630599157371214, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_Name + value: Soda + objectReference: {fileID: 0} + - target: {fileID: 4208630599157371214, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3193c7f4a5f15774f852cd126f08b72a, type: 3} +--- !u!4 &4298763206849445805 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + m_PrefabInstance: {fileID: 759870061630108761} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1906669864433751107 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2084569607, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} + propertyPath: asset + value: + objectReference: {fileID: 11400000, guid: 2830d77b981a3a3489bda2a3c4fba460, + type: 2} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_Name + value: Soda Variant + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.x + value: 28.480923 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.443342 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4298763206849445805} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} +--- !u!4 &2405606720286323493 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + m_PrefabInstance: {fileID: 1906669864433751107} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Loot/Watermelon Variant.prefab b/Assets/Artists/Prefabs/Loot/Watermelon Variant.prefab index 7de51bb39..54330a04c 100644 --- a/Assets/Artists/Prefabs/Loot/Watermelon Variant.prefab +++ b/Assets/Artists/Prefabs/Loot/Watermelon Variant.prefab @@ -14,6 +14,16 @@ PrefabInstance: value: objectReference: {fileID: -1595615294, guid: a03c2610221b14940b818fb271b448fa, type: 3} + - target: {fileID: 3055353135379332995, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208964436538694515, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + propertyPath: rmsCount + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5208964436538694515, guid: 373d78c28a8f6024cada3a296368b6c5, type: 3} propertyPath: outlineColor.b @@ -79,6 +89,11 @@ PrefabInstance: propertyPath: m_Name value: Watermelon Variant objectReference: {fileID: 0} + - target: {fileID: 6575783896384710454, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8313153688960597523, guid: 373d78c28a8f6024cada3a296368b6c5, type: 3} propertyPath: asset @@ -87,6 +102,95 @@ PrefabInstance: type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5208964436538694514, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2754413717951350076} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 373d78c28a8f6024cada3a296368b6c5, type: 3} +--- !u!4 &8481550540619126700 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5208964436538694514, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + m_PrefabInstance: {fileID: 4466850414174145758} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7683223200286424081 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8481550540619126700} + m_Modifications: + - target: {fileID: 5175267955941368727, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_Name + value: Watermelon + objectReference: {fileID: 0} + - target: {fileID: 5175267955941368727, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.162 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 517e976be9ac3ee41a961dd8bf728615, type: 3} +--- !u!4 &2754413717951350076 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5519704939534268717, guid: 517e976be9ac3ee41a961dd8bf728615, + type: 3} + m_PrefabInstance: {fileID: 7683223200286424081} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Player.prefab b/Assets/Artists/Prefabs/Player.prefab index 8cfdd79f6..ac8229836 100644 --- a/Assets/Artists/Prefabs/Player.prefab +++ b/Assets/Artists/Prefabs/Player.prefab @@ -816,6 +816,79 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: locationAdditive: {fileID: 843716438194269699} +--- !u!1 &3370164524282622499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4360143678650541021} + - component: {fileID: 1744425689527395555} + - component: {fileID: 3983529064666457131} + m_Layer: 7 + m_Name: CameraRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4360143678650541021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3370164524282622499} + serializedVersion: 2 + m_LocalRotation: {x: -0.00017264773, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4854163182128762144} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1773428102 &1744425689527395555 +ParentConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3370164524282622499} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_TranslationAtRest: {x: 0, y: 0, z: 0} + m_RotationAtRest: {x: -0.019783963, y: 0, z: 0} + m_TranslationOffsets: + - {x: 0, y: 0, z: 0} + m_RotationOffsets: + - {x: -90, y: 0, z: -180} + m_AffectTranslationX: 1 + m_AffectTranslationY: 1 + m_AffectTranslationZ: 1 + m_AffectRotationX: 1 + m_AffectRotationY: 1 + m_AffectRotationZ: 1 + m_Active: 1 + m_IsLocked: 0 + m_Sources: + - sourceTransform: {fileID: 1760710309514978608} + weight: 1 +--- !u!114 &3983529064666457131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3370164524282622499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98ce129373beee341b6f0723f3fb2ce7, type: 3} + m_Name: + m_EditorClassIdentifier: + locationAdditive: {fileID: 843716438194269699} --- !u!1 &3979507243906087761 GameObject: m_ObjectHideFlags: 0 @@ -1061,8 +1134,10 @@ GameObject: - component: {fileID: 6002452162850529175} - component: {fileID: 2495495580039550089} - component: {fileID: 6678778182358330342} + - component: {fileID: 6438031452483613087} - component: {fileID: 7617151341549785245} - component: {fileID: 1315802043012238542} + - component: {fileID: 5362342980643103828} - component: {fileID: 3865076157975442983} - component: {fileID: 300229368} - component: {fileID: 9003860659457902396} @@ -1085,6 +1160,7 @@ GameObject: - component: {fileID: 9030101287583947972} - component: {fileID: 7303924725377500738} - component: {fileID: 532745093476038155} + - component: {fileID: 1894260874635406670} m_Layer: 6 m_Name: Player m_TagString: Untagged @@ -1148,6 +1224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 6417910595033156401} layerInfos: [] --- !u!114 &2495495580039550089 @@ -1166,6 +1243,8 @@ MonoBehaviour: _serializedList: - Key: Assets/Weapon_M4A1 Value: {fileID: 974388490910736766} + - Key: Assets/Improvised_AmmoBox + Value: {fileID: 6442263292730759531} - Key: Assets/TacticalKnife Value: {fileID: 6778784877586059904} --- !u!114 &6678778182358330342 @@ -1180,6 +1259,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73333e0a8f0bc4a4b82c06db4c35a21f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6438031452483613087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826102346843731729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bf3c729cc99f0b47a6b0bd8f97fac73, type: 3} + m_Name: + m_EditorClassIdentifier: + isOvering: 0 --- !u!114 &7617151341549785245 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1206,6 +1298,28 @@ MonoBehaviour: m_EditorClassIdentifier: healthPoint: 100 maxHealthPoint: 100 +--- !u!114 &5362342980643103828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826102346843731729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08c479c2ef329e94aaac1cc920eb8ce1, type: 3} + m_Name: + m_EditorClassIdentifier: + unityAnimator: {fileID: 6002452162850529175} + damage: 50 + meleeService: + rid: 806583545631342608 + references: + version: 2 + RefIds: + - rid: 806583545631342608 + type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} + data: --- !u!114 &3865076157975442983 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1896,6 +2010,7 @@ MonoBehaviour: - rid: 806583406218444824 - rid: 806583416685330432 - rid: 806583431680491650 + - rid: 806583545631342612 _currentStateName: debug: 0 transitionOnNextFrame: 0 @@ -1977,6 +2092,37 @@ MonoBehaviour: data: characterController: {fileID: 4784073750897180643} actor: {fileID: 1821939497119884460} + - rid: 806583545631342612 + type: {class: Dodge, ns: BITFALL.Entities.Player.Movement.States, asm: BITFALL.Player.Movement.CharacterControllerPro} + data: + characterController: {fileID: 4784073750897180643} + actor: {fileID: 1821939497119884460} + costStamina: 32 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -8.2847595 + outSlope: -8.2847595 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.039143622 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + duration: 0.64 - rid: 6077775219685064711 type: {class: CinemachineBasedAds, ns: BITKit, asm: BITKit.Extensions.Cinemachine} data: @@ -2210,6 +2356,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a313e13727e0db74296ff917991c6ae7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1894260874635406670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826102346843731729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4e62fe503fa9eb45aba921100310343, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4826102347057741775 GameObject: m_ObjectHideFlags: 0 @@ -2349,6 +2507,11 @@ Transform: - {fileID: 1336897182535564798} - {fileID: 5723309033838735307} - {fileID: 2817909135410992819} + - {fileID: 4854163182128762144} + - {fileID: 4138942853584030110} + - {fileID: 1074771797319587490} + - {fileID: 9120422628210139297} + - {fileID: 3989134628387755881} m_Father: {fileID: 2648601869858448235} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4630340609974338260 @@ -2894,6 +3057,37 @@ Transform: - {fileID: 6708843809861981616} m_Father: {fileID: 4826102346843731735} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7803029868302187038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3989134628387755881} + m_Layer: 7 + m_Name: GlobalThrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3989134628387755881 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7803029868302187038} + serializedVersion: 2 + m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2019605867538852436} + m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} --- !u!1 &8587898794680105710 GameObject: m_ObjectHideFlags: 0 @@ -3039,6 +3233,211 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 5736973103143551457} +--- !u!1001 &411372159712421332 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4722680610291221762} + m_Modifications: + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.177 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000016519333 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000020858991 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000008797053 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4208630599157371214, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_Name + value: Soda + objectReference: {fileID: 0} + - target: {fileID: 4208630599157371214, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 256690179937131547, guid: 3193c7f4a5f15774f852cd126f08b72a, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3193c7f4a5f15774f852cd126f08b72a, type: 3} +--- !u!23 &2656437168441267535 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2407441506344562843, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + m_PrefabInstance: {fileID: 411372159712421332} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3789395749545569824 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3540919575286451188, guid: 3193c7f4a5f15774f852cd126f08b72a, + type: 3} + m_PrefabInstance: {fileID: 411372159712421332} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &984723819954259080 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 3259623828982151547, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: renderers.Array.size + value: 3 + 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 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_Name + value: Apple Controller + objectReference: {fileID: 0} + - target: {fileID: 6727292768049680845, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_TranslationAtRest.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 6889852121995218875, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: locationAdditive + value: + objectReference: {fileID: 4486952052422082421} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 518203656061299679} + m_AddedComponents: [] + 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!4 &4138942853584030110 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 984723819954259080} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1040364863550748081 PrefabInstance: m_ObjectHideFlags: 0 @@ -3139,6 +3538,92 @@ 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: 7 + 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 &1466224020970150780 PrefabInstance: m_ObjectHideFlags: 0 @@ -3396,6 +3881,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 4986478004874159853} layerInfos: [] --- !u!114 &2426015728857496741 @@ -3417,7 +3903,7 @@ MonoBehaviour: - rid: 806583484692037639 - rid: 806583484692037641 - rid: 806583484692037642 - - rid: 806583484692037643 + - rid: 806583545631342604 _currentStateName: debug: 0 transitionOnNextFrame: 0 @@ -3427,10 +3913,13 @@ MonoBehaviour: - {fileID: 1221488407187310397} - {fileID: 735532174701725946} - {fileID: 8312879711771833223} + cameraTransform: {fileID: 5251641949277770887} meleeService: rid: 806583484692037644 attackAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + blockAction: {fileID: 5345126666820269769, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} velocityReference: {fileID: 2437386659687487010} references: version: 2 @@ -3455,13 +3944,13 @@ MonoBehaviour: type: {class: HeavyAttack, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip} data: meleeController: {fileID: 2426015728857496741} - - rid: 806583484692037643 - type: {class: Run, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip} - data: - meleeController: {fileID: 2426015728857496741} - rid: 806583484692037644 type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} data: + - rid: 806583545631342604 + type: {class: Blocking, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip} + data: + meleeController: {fileID: 2426015728857496741} --- !u!4 &2437386659687487010 stripped Transform: m_CorrespondingSourceObject: {fileID: 3857971597623217502, guid: 8ce64bfbf2bb80840af381346bccb782, @@ -3844,6 +4333,7 @@ MonoBehaviour: - {fileID: 4538978027255161566} - {fileID: 5158269637596109219} - {fileID: 5163696523639820346} + cameraTransform: {fileID: 8946689202084560547} meleeService: rid: 806583484692037659 references: @@ -3876,6 +4366,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 514671996699977757} layerInfos: [] --- !u!137 &4538978027255161566 stripped @@ -4530,6 +5021,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 8907247608405424211} layerInfos: [] --- !u!114 &6600209918710237285 @@ -4577,12 +5069,13 @@ MonoBehaviour: _currentStateName: debug: 0 transitionOnNextFrame: 0 - item: {fileID: 0} + item: {fileID: 11400000, guid: 5557f2edf7d8c4b43934c79878628d22, type: 2} animator: {fileID: 4676489320873285128} renderers: - {fileID: 279771559974666008} - {fileID: 3790416042972862020} - {fileID: 5616597724130929977} + cameraTransform: {fileID: 6776512646665043589} meleeService: rid: 806583325261299712 bulletInitialOffset: {x: 0, y: 0, z: 0} @@ -4598,7 +5091,7 @@ MonoBehaviour: type: 3} meleeAction: {fileID: 709374767176041235, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} - cameraView: {fileID: 6776512646665043589} + cameraView: {fileID: 8525020893898639929} vfxPlayer: {fileID: 5006172060748096908} locationAdditive: {fileID: 4486952052422082421} assetable: {fileID: 11400000, guid: 5557f2edf7d8c4b43934c79878628d22, type: 2} @@ -5566,6 +6059,443 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3751233493665284926} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4192940043719826356 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: f061a2b905ec27b4ab419e07bb529c7f, + type: 2} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_Name + value: Watermelon Controller + objectReference: {fileID: 0} + - target: {fileID: 6727292768049680845, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_TranslationAtRest.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 6889852121995218875, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: locationAdditive + value: + objectReference: {fileID: 4486952052422082421} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} +--- !u!4 &1074771797319587490 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 4192940043719826356} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4960656506693216971 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8483079287735800029, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7982445368288305232, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7805527542236588859, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7083826889706597962, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6761239244867884074, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6565134293425240629, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6179275997006789232, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6052065096587244515, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4042785810770032844, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4042785810770032844, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -3799896878483850562, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3686551328258449376, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2853424563086286810, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2853424563086286810, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2107066420424512121, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0bdc17ca1b76bc640b010f622a6886c3, type: 2} + - target: {fileID: -1745863489998566550, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -457497680185661411, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 422738843169862328, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Name + value: Weapon_Grenade + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4387719810744567721, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4824860256124165047, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6003611815629638046, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8260868571131455172, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8315903294366468851, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4360143678650541021} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + insertIndex: -1 + addedObject: {fileID: 313032677180539518} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + insertIndex: -1 + addedObject: {fileID: 446310280712231859} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4846561725160298145} + m_SourcePrefab: {fileID: 100100000, guid: 59fe55bce6eff274ba5812ea0ffba739, type: 3} +--- !u!137 &230503227726884351 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -4042785810770032844, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1760710309514978608 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2542134114980474885, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} +--- !u!137 &2581565581698908720 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -1800213932466231045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4854163182128762144 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5194518571645982618 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} +--- !u!95 &313032677180539518 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5194518571645982618} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} + m_Controller: {fileID: 22100000, guid: 5121ad7e25c7ec949aa9111725bc4f9a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &446310280712231859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5194518571645982618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} + m_Name: + m_EditorClassIdentifier: + debug: 0 + animator: {fileID: 313032677180539518} + layerInfos: [] +--- !u!114 &4846561725160298145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5194518571645982618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f1e70fb5667ce84ab5295a61fa76234, type: 3} + m_Name: + m_EditorClassIdentifier: + stateMachine: + states: [] + _currentStateName: + debug: 0 + transitionOnNextFrame: 0 + item: {fileID: 11400000, guid: beaccfe60f8582e4895457499e18b12c, type: 2} + animator: {fileID: 446310280712231859} + renderers: + - {fileID: 230503227726884351} + - {fileID: 6538094884673845581} + - {fileID: 2581565581698908720} + cameraTransform: {fileID: 1760710309514978608} + meleeService: + rid: 806583526086934616 + throwPoint: {fileID: 3989134628387755881} + throwForce: 16 + throwAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} + references: + version: 2 + RefIds: + - rid: 806583526086934616 + type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} + data: +--- !u!137 &6538094884673845581 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + m_PrefabInstance: {fileID: 4960656506693216971} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5253447055459780640 PrefabInstance: m_ObjectHideFlags: 0 @@ -5907,7 +6837,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 7853171868855391787} - locationAdditive: {fileID: 0} --- !u!114 &7853171868855391787 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5920,6 +6849,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 1841246478262089137} layerInfos: [] --- !u!4 &5723309033838735307 stripped @@ -5928,6 +6858,132 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5253447055459780640} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5352611233010789815 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 2466019206098262755, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 22100000, guid: 62069b990bc5eef46a51917b62fd82b3, + type: 2} + - target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 2830d77b981a3a3489bda2a3c4fba460, + type: 2} + - target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: renderers.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3555939717849507634, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: renderers.Array.data[2] + value: + objectReference: {fileID: 2656437168441267535} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_Name + value: Soda Controller + objectReference: {fileID: 0} + - target: {fileID: 6727292768049680845, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: m_TranslationAtRest.x + value: 0.0000011771917 + objectReference: {fileID: 0} + - target: {fileID: 6889852121995218875, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + propertyPath: locationAdditive + value: + objectReference: {fileID: 4486952052422082421} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3789395749545569824} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} +--- !u!4 &4722680610291221762 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 5352611233010789815} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9120422628210139297 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 5352611233010789815} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5914482566494439404 PrefabInstance: m_ObjectHideFlags: 0 @@ -6367,7 +7423,7 @@ MonoBehaviour: _currentStateName: debug: 0 transitionOnNextFrame: 0 - item: {fileID: 0} + item: {fileID: 11400000, guid: 4cf1920e287c0234f9fa77937708ffe2, type: 2} animator: {fileID: 4874137276923287036} renderers: - {fileID: 8322527087331379143} @@ -6376,6 +7432,7 @@ MonoBehaviour: - {fileID: 8917623201527980123} - {fileID: 904657455915816816} - {fileID: 8328709370662673394} + cameraTransform: {fileID: 3284211731386840313} meleeService: rid: 806583325261299713 bulletInitialOffset: {x: 0, y: 0, z: 0} @@ -6391,7 +7448,7 @@ MonoBehaviour: type: 3} meleeAction: {fileID: 709374767176041235, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} - cameraView: {fileID: 3284211731386840313} + cameraView: {fileID: 3579016247041219514} vfxPlayer: {fileID: 49539130056838808} locationAdditive: {fileID: 4486952052422082421} assetable: {fileID: 11400000, guid: 4cf1920e287c0234f9fa77937708ffe2, type: 2} @@ -6465,6 +7522,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 4357561961615010256} layerInfos: [] --- !u!4 &7681178683086533546 stripped diff --git a/Assets/Artists/Prefabs/Props/Bouncing Betty.prefab b/Assets/Artists/Prefabs/Props/Bouncing Betty.prefab new file mode 100644 index 000000000..604c22fe9 --- /dev/null +++ b/Assets/Artists/Prefabs/Props/Bouncing Betty.prefab @@ -0,0 +1,445 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2924693015492943149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7265850983360665320} + - component: {fileID: 4246386550975626452} + - component: {fileID: 1303898904214839384} + - component: {fileID: 7713224582118482445} + m_Layer: 16 + m_Name: Bouncing Betty + m_TagString: Untagged + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7265850983360665320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924693015492943149} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 31.56, y: 0, z: -35.78} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3309709144465950356} + - {fileID: 7832072391849033796} + - {fileID: 7246082583446328267} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4246386550975626452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924693015492943149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d4aaac0758ba7e4b995de4605744706, type: 3} + m_Name: + m_EditorClassIdentifier: + rangeSensor: + rid: 806583526086934555 + vfxTags: + - rid: 806583526086934556 + - rid: 806583526086934557 + damageCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 150 + inSlope: -50 + outSlope: -50 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 100 + inSlope: -33.333332 + outSlope: -33.333332 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 50 + inSlope: -16.666666 + outSlope: -16.666666 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + physicsLayer: + serializedVersion: 2 + m_Bits: 257 + explosionRadius: 4 + jumpForce: 6 + rigidbody: {fileID: 1303898904214839384} + references: + version: 2 + RefIds: + - rid: 806583526086934555 + type: {class: UnitySensor, ns: BITKit.Sensors, asm: BITKit.Sensor} + data: + gameObject: {fileID: 5205027976770469345} + - rid: 806583526086934556 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Explosion + - rid: 806583526086934557 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Small +--- !u!54 &1303898904214839384 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924693015492943149} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &7713224582118482445 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2924693015492943149} + 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: 3 + m_Size: {x: 0.27629036, y: 0.11459474, z: 0.27629036} + m_Center: {x: 0, y: 0.07, z: 0} +--- !u!1 &5205027976770469345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3309709144465950356} + - component: {fileID: 9090432265946380651} + m_Layer: 0 + m_Name: RangeSensor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3309709144465950356 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5205027976770469345} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7265850983360665320} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9090432265946380651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5205027976770469345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f305912600022b4c824367828ddc333, type: 3} + m_Name: + m_EditorClassIdentifier: + detectLayer: + serializedVersion: 2 + m_Bits: 64 + autoUpdate: 1 + ignoreColliders: [] + radius: 4 + fov: 0 + requireSight: 1 + blockLayer: + serializedVersion: 2 + m_Bits: 1 +--- !u!1 &5538531199964334625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7832072391849033796} + - component: {fileID: 702155229119661729} + - component: {fileID: 1471506365719968151} + - component: {fileID: 4090986354790218397} + m_Layer: 15 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7832072391849033796 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5538531199964334625} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7265850983360665320} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &702155229119661729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5538531199964334625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 099996f054b64cb499431974f59539f2, type: 3} + m_Name: + m_EditorClassIdentifier: + ignores: [] + detectedLayer: + allow: 1 + value: + serializedVersion: 2 + m_Bits: 64 + allowStatic: 0 + useRigidbody: 0 + immediately: 1 + onDetected: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4246386550975626452} + m_TargetAssemblyTypeName: BITFALL.Props.Prop_BouncingBetty, BITFALL.Props.Runtime + m_MethodName: OnDetected + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onLost: + m_PersistentCalls: + m_Calls: [] +--- !u!135 &1471506365719968151 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5538531199964334625} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &4090986354790218397 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5538531199964334625} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1001 &2048894204575496563 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7265850983360665320} + m_Modifications: + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.061 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559727256, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_Name + value: Mine_01 + objectReference: {fileID: 0} + - target: {fileID: 8710071474559727256, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6953002729139025519, guid: 1add3a53fc05d8045a20f94a88135193, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8710071474559727256, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8258539341136467634} + m_SourcePrefab: {fileID: 100100000, guid: 1add3a53fc05d8045a20f94a88135193, type: 3} +--- !u!1 &7246082583445966827 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8710071474559727256, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + m_PrefabInstance: {fileID: 2048894204575496563} + m_PrefabAsset: {fileID: 0} +--- !u!65 &8258539341136467634 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7246082583445966827} + 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: 3 + m_Size: {x: 0.27629036, y: 0.11459474, z: 0.27629036} + m_Center: {x: 0, y: 0.011138046, z: 0} +--- !u!4 &7246082583446328267 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8710071474559560376, guid: 1add3a53fc05d8045a20f94a88135193, + type: 3} + m_PrefabInstance: {fileID: 2048894204575496563} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Props/Grenade.prefab b/Assets/Artists/Prefabs/Props/Grenade.prefab new file mode 100644 index 000000000..06e13ae7c --- /dev/null +++ b/Assets/Artists/Prefabs/Props/Grenade.prefab @@ -0,0 +1,379 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5779926447835973807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5322756313667207077} + - component: {fileID: 7291062444143870419} + - component: {fileID: 8273245965406520439} + - component: {fileID: 2790648435517538154} + - component: {fileID: 6550306330222230957} + m_Layer: 16 + m_Name: Grenade + m_TagString: Untagged + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5322756313667207077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779926447835973807} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 31.56, y: 1, z: -34.06} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6578672529516370771} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7291062444143870419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779926447835973807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ea10f3eac02f2441978a201ec1770fd, type: 3} + m_Name: + m_EditorClassIdentifier: + rangeSensor: + rid: 806583526086934612 + vfxTags: + - rid: 806583526086934613 + - rid: 806583526086934614 + physicsLayer: + serializedVersion: 2 + m_Bits: 8449 + explosionRadius: 8 + fuse: 4 + damageCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 300 + inSlope: -37.5 + outSlope: -37.5 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 150 + inSlope: -33.5 + outSlope: -33.5 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: 32 + inSlope: -29.5 + outSlope: -29.5 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + references: + version: 2 + RefIds: + - rid: 806583526086934612 + type: {class: UnitySensor, ns: BITKit.Sensors, asm: BITKit.Sensor} + data: + gameObject: {fileID: 5779926447835973807} + - rid: 806583526086934613 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Explosion + - rid: 806583526086934614 + type: {class: Reference, ns: BITKit, asm: BITKit} + data: + value: Large +--- !u!114 &8273245965406520439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779926447835973807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f305912600022b4c824367828ddc333, type: 3} + m_Name: + m_EditorClassIdentifier: + detectLayer: + serializedVersion: 2 + m_Bits: 64 + autoUpdate: 1 + ignoreColliders: [] + radius: 8 + fov: 0 + requireSight: 1 + blockLayer: + serializedVersion: 2 + m_Bits: 1 +--- !u!54 &2790648435517538154 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779926447835973807} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_IsKinematic: 0 + m_Interpolate: 2 + m_Constraints: 0 + m_CollisionDetection: 3 +--- !u!96 &6550306330222230957 +TrailRenderer: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779926447835973807} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b9ee288987a7daf438ed100698f0cad8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.16 + m_PreviewTimeScale: 1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 + m_Autodestruct: 0 + m_Emitting: 1 + m_ApplyActiveColorSpace: 1 +--- !u!1001 &388325602139472120 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5322756313667207077} + m_Modifications: + - target: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Name + value: Grenade_02 + objectReference: {fileID: 0} + - target: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9138148280581934609, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3068067858031020117, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3} + - {fileID: 5564562486419412761, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6413852522637078568} + m_SourcePrefab: {fileID: 100100000, guid: 3fb4d614204c5a941a68cea812e8d217, type: 3} +--- !u!4 &6578672529516370771 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6786854117429418923, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + m_PrefabInstance: {fileID: 388325602139472120} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6578672529516660595 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6786854117428987787, guid: 3fb4d614204c5a941a68cea812e8d217, + type: 3} + m_PrefabInstance: {fileID: 388325602139472120} + m_PrefabAsset: {fileID: 0} +--- !u!135 &6413852522637078568 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6578672529516660595} + 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: 3 + m_Radius: 0.055223584 + m_Center: {x: -0.00048495643, y: 0.012884719, z: -0.000000009313226} diff --git a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab index b311047b8..4de088381 100644 --- a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab +++ b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab @@ -181,7 +181,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} propertyPath: m_Layer - value: 8 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1167343693203600193, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} @@ -438,6 +438,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7017296101148560579} + - targetCorrespondingSourceObject: {fileID: -8241982726922733620, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5299458023377957176} - targetCorrespondingSourceObject: {fileID: 1564719497880037662, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} insertIndex: -1 @@ -1266,6 +1270,17 @@ MonoBehaviour: positionSpring: 256 positionDamper: 8 maximumForce: 512 + rootSync: + allow: 0 + value: + Item1: {fileID: 0} + Item2: {fileID: 0} + overrideMotion: + allow: 0 + value: 0 + overrideAngularMotion: + allow: 0 + value: 0 --- !u!1 &1729084152005531091 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8241982726922733620, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -1422,6 +1437,27 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.2 m_Center: {x: 0, y: 0.11, z: 0} +--- !u!65 &5299458023377957176 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1729084152005531091} + 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: 3 + m_Size: {x: 0.4, y: 0.3, z: 0.4} + m_Center: {x: 0, y: 0.15, z: 0} --- !u!1 &2088774989351461923 stripped GameObject: m_CorrespondingSourceObject: {fileID: 476459386056918588, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -1997,7 +2033,7 @@ ConfigurableJoint: m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -0.00000002235177, y: 0.29999992, z: -0.00000008583147} serializedVersion: 3 - m_SecondaryAxis: {x: 0, y: -1, z: 0} + m_SecondaryAxis: {x: 0, y: 1, z: 0} m_XMotion: 0 m_YMotion: 0 m_ZMotion: 0 @@ -2015,22 +2051,22 @@ ConfigurableJoint: spring: 0 damper: 0 m_LowAngularXLimit: - limit: -8.454285 + limit: -99.73186 bounciness: 0 contactDistance: 0 m_HighAngularXLimit: - limit: 100.72039 + limit: -17.059673 bounciness: 0 contactDistance: 0 m_AngularYZLimitSpring: spring: 0 damper: 0 m_AngularYLimit: - limit: 14.494176 + limit: 41.52196 bounciness: 0 contactDistance: 0 m_AngularZLimit: - limit: 3 + limit: 41.699974 bounciness: 0 contactDistance: 0 m_TargetPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/Artists/Prefabs/Rig/Universal Use Controller Variant.prefab b/Assets/Artists/Prefabs/Rig/Universal Use Controller Variant.prefab new file mode 100644 index 000000000..104c30d54 --- /dev/null +++ b/Assets/Artists/Prefabs/Rig/Universal Use Controller Variant.prefab @@ -0,0 +1,480 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2291000265839380471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 847274249425463477} + - component: {fileID: 6727292768049680845} + m_Layer: 7 + m_Name: Slot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &847274249425463477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2291000265839380471} + serializedVersion: 2 + m_LocalRotation: {x: -0.0002992311, y: 0, z: 0, w: 0.99999994} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3808369081287560470} + m_LocalEulerAnglesHint: {x: -0.034289338, y: 0, z: 0} +--- !u!1773428102 &6727292768049680845 +ParentConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2291000265839380471} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_TranslationAtRest: {x: 0, y: 0, z: 0} + m_RotationAtRest: {x: -0.034289338, y: 0, z: 0} + m_TranslationOffsets: + - {x: 0, y: 0, z: -0.100000024} + m_RotationOffsets: + - {x: -90, y: 0, z: -180} + m_AffectTranslationX: 1 + m_AffectTranslationY: 1 + m_AffectTranslationZ: 1 + m_AffectRotationX: 1 + m_AffectRotationY: 1 + m_AffectRotationZ: 1 + m_Active: 1 + m_IsLocked: 0 + m_Sources: + - sourceTransform: {fileID: 493977895243638691} + weight: 1 +--- !u!1 &6218569972769331630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7064332371324838899} + - component: {fileID: 3459688953754204546} + - component: {fileID: 6889852121995218875} + m_Layer: 7 + m_Name: CameraRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7064332371324838899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6218569972769331630} + serializedVersion: 2 + m_LocalRotation: {x: -0.00017264773, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3808369081287560470} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1773428102 &3459688953754204546 +ParentConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6218569972769331630} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_TranslationAtRest: {x: 0, y: 0, z: 0} + m_RotationAtRest: {x: -0.019783963, y: 0, z: 0} + m_TranslationOffsets: + - {x: 0, y: 0, z: 0} + m_RotationOffsets: + - {x: -90, y: 0, z: -180} + m_AffectTranslationX: 1 + m_AffectTranslationY: 1 + m_AffectTranslationZ: 1 + m_AffectRotationX: 1 + m_AffectRotationY: 1 + m_AffectRotationZ: 1 + m_Active: 1 + m_IsLocked: 0 + m_Sources: + - sourceTransform: {fileID: 8063752860525618438} + weight: 1 +--- !u!114 &6889852121995218875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6218569972769331630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98ce129373beee341b6f0723f3fb2ce7, type: 3} + m_Name: + m_EditorClassIdentifier: + locationAdditive: {fileID: 0} +--- !u!1001 &3697652093918948093 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8833942878136105421, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8833942878136105421, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8483079287735800029, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7982445368288305232, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7805527542236588859, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7083826889706597962, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6761239244867884074, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6565134293425240629, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6179275997006789232, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3799896878483850562, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3686551328258449376, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2853424563086286810, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2107066420424512121, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1745863489998566550, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -457497680185661411, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 422738843169862328, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Name + value: Universal Use Controller Variant + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4387719810744567721, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4824860256124165047, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6003611815629638046, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7824638177861515733, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7824638177861515733, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8260868571131455172, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8315903294366468851, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7064332371324838899} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 847274249425463477} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3555939717849507634} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2466019206098262755} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5932963691464575127} + m_SourcePrefab: {fileID: 100100000, guid: c43c476b0442e3d4381c31aafe43a67d, type: 3} +--- !u!4 &493977895243638691 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3857971597623217502, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} +--- !u!137 &3259623828982151547 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3808369081287560470 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4580683282014377900 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3555939717849507634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580683282014377900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33c1c1e0ca03d374ab5faeff29166425, type: 3} + m_Name: + m_EditorClassIdentifier: + stateMachine: + states: + - rid: 806583545631342595 + - rid: 806583545631342596 + - rid: 806583545631342597 + _currentStateName: + debug: 0 + transitionOnNextFrame: 0 + item: {fileID: 11400000, guid: 8a2e296f2c4fc694cbc3aaa9ab680cf2, type: 2} + animator: {fileID: 5932963691464575127} + renderers: + - {fileID: 3259623828982151547} + - {fileID: 6076736928665862662} + cameraTransform: {fileID: 8063752860525618438} + meleeService: + rid: 806583545631342593 + references: + version: 2 + RefIds: + - rid: 806583545631342593 + type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} + data: + - rid: 806583545631342595 + type: {class: Draw, ns: BITFALL.Entities.Equipment.Universal.States, asm: BITFALL.Equip} + data: + useController: {fileID: 3555939717849507634} + - rid: 806583545631342596 + type: {class: Use, ns: BITFALL.Entities.Equipment.Universal.States, asm: BITFALL.Equip} + data: + useController: {fileID: 3555939717849507634} + - rid: 806583545631342597 + type: {class: Exit, ns: BITFALL.Entities.Equipment.Universal.States, asm: BITFALL.Equip} + data: + useController: {fileID: 3555939717849507634} +--- !u!95 &2466019206098262755 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580683282014377900} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} + m_Controller: {fileID: 22100000, guid: 37e11042b182af749aa3e10a43b4f122, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5932963691464575127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4580683282014377900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} + m_Name: + m_EditorClassIdentifier: + debug: 0 + animator: {fileID: 2466019206098262755} + layerInfos: [] +--- !u!137 &6076736928665862662 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -1800213932466231045, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8063752860525618438 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2542134114980474885, guid: c43c476b0442e3d4381c31aafe43a67d, + type: 3} + m_PrefabInstance: {fileID: 3697652093918948093} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Services/Framework.prefab b/Assets/Artists/Prefabs/Services/Framework.prefab index e4f4b16d7..e6d05afc6 100644 --- a/Assets/Artists/Prefabs/Services/Framework.prefab +++ b/Assets/Artists/Prefabs/Services/Framework.prefab @@ -166,6 +166,8 @@ MonoBehaviour: vfxs: - {fileID: 11400000, guid: ce6c3c9ba0efabc4ea63cfbcfc322a81, type: 2} - {fileID: 11400000, guid: 02442f5995195f54b8bfc5883a53cf97, type: 2} + - {fileID: 11400000, guid: 15b4dfbd87c32c5469f0a352c0c4634d, type: 2} + - {fileID: 11400000, guid: 02650cfde82c0ab46a7e0a7ef0bb1491, type: 2} --- !u!114 &8706619578051318029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -245,6 +247,14 @@ MonoBehaviour: detectLayer: serializedVersion: 2 m_Bits: 512 + damageService: + rid: 806583484692037822 + references: + version: 2 + RefIds: + - rid: 806583484692037822 + type: {class: DamageServiceSingleton, ns: BITKit.Entities, asm: BITKit.Entities.Component} + data: --- !u!114 &5926973457414884315 MonoBehaviour: m_ObjectHideFlags: 0 @@ -431,9 +441,6 @@ MonoBehaviour: type: 3} returnAction: {fileID: 7656137919724235468, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} - inputActionGroup: - allowGlobalActivation: 0 - isEnabled: 0 weightBar: {fileID: 864832324694903615} playerService: rid: 6077775405181829457 @@ -1307,9 +1314,6 @@ MonoBehaviour: type: 3} returnAction: {fileID: 7656137919724235468, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} - inputActionGroup: - allowGlobalActivation: 0 - isEnabled: 0 references: version: 2 RefIds: @@ -3069,6 +3073,7 @@ Transform: - {fileID: 1353630767569795514} - {fileID: 4146873518232350710} - {fileID: 1868127212333961775} + - {fileID: 4833761556466753053} m_Father: {fileID: 1621845164855518716} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7708469949725506088 @@ -3092,3 +3097,84 @@ MonoBehaviour: type: {class: UIToolkitPanelMonoProxy, ns: BITKit.UX, asm: BITKit.UX} data: monoBehaviour: {fileID: 3506318474073017514} +--- !u!1 &9168312257502869030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4833761556466753053} + - component: {fileID: 3371563757742596682} + - component: {fileID: 738191188923120248} + m_Layer: 0 + m_Name: InventorySwap + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: b34f30cbf6975d34fb6ca73deeb90202, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4833761556466753053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9168312257502869030} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5885585653203836409} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3371563757742596682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9168312257502869030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PanelSettings: {fileID: 11400000, guid: 64cd93f02c042ad43a96d66da32f0c6c, type: 2} + m_ParentUI: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: 8a8f68e9df589694cbe15e6fabe2ab4d, + type: 3} + m_SortingOrder: 0 +--- !u!114 &738191188923120248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9168312257502869030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ae3434f3e26d304495b8fd8fddddb49, type: 3} + m_Name: + m_EditorClassIdentifier: + document: {fileID: 3371563757742596682} + isAnimate: 0 + allowCursor: 1 + allowInput: 0 + autoEntry: 0 + escapeAction: {fileID: 7656137919724235468, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} + inventoryAction: {fileID: 4731022410478041803, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} + playerService: + rid: 806583571845218358 + itemPrefab: {fileID: 9197481963319205126, guid: 6e7ac9656332fa2489cc7fe4a9f0bf81, + type: 3} + references: + version: 2 + RefIds: + - rid: 806583571845218358 + type: {class: UnityPlayerServiceService, ns: BITKit.Entities.Player, asm: BITKit.Entities.Player} + data: diff --git a/Assets/Artists/Prefabs/Zombie.prefab b/Assets/Artists/Prefabs/Zombie.prefab index df3ef007c..598d1ca76 100644 --- a/Assets/Artists/Prefabs/Zombie.prefab +++ b/Assets/Artists/Prefabs/Zombie.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 8579368653672686413} - component: {fileID: 673930142905110667} - component: {fileID: 1765543596226114749} + - component: {fileID: 5020317200630596891} - component: {fileID: 7936474328313349173} - component: {fileID: 3691802904714930186} - component: {fileID: 1663689908842247019} @@ -105,6 +106,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73333e0a8f0bc4a4b82c06db4c35a21f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5020317200630596891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610736432900663163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bf3c729cc99f0b47a6b0bd8f97fac73, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &7936474328313349173 MonoBehaviour: m_ObjectHideFlags: 0 @@ -117,6 +130,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} m_Name: m_EditorClassIdentifier: + debug: 0 animator: {fileID: 673930142905110667} layerInfos: [] --- !u!195 &3691802904714930186 @@ -246,8 +260,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 08c479c2ef329e94aaac1cc920eb8ce1, type: 3} m_Name: m_EditorClassIdentifier: + unityAnimator: {fileID: 7936474328313349173} damage: 50 - singleTarget: 1 meleeService: rid: 806583325261299714 references: diff --git a/Assets/Artists/Scenes/DMZ.unity b/Assets/Artists/Scenes/DMZ.unity index 0c9976bf0..04db7e378 100644 --- a/Assets/Artists/Scenes/DMZ.unity +++ b/Assets/Artists/Scenes/DMZ.unity @@ -399,6 +399,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 13837384} m_PrefabAsset: {fileID: 0} +--- !u!1 &14030908 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6625335125320094231, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &14523442 PrefabInstance: m_ObjectHideFlags: 0 @@ -658,6 +664,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 8345163904790233255, guid: 405a2254073206e42bbe8aad0088a501, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8345163904790233255, guid: 405a2254073206e42bbe8aad0088a501, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8345163905356490176, guid: 405a2254073206e42bbe8aad0088a501, type: 3} propertyPath: m_Name @@ -1689,6 +1705,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 35434373} m_PrefabAsset: {fileID: 0} +--- !u!1 &35713158 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7438910584769629244, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &36767410 PrefabInstance: m_ObjectHideFlags: 0 @@ -3023,6 +3045,298 @@ Transform: type: 3} m_PrefabInstance: {fileID: 57990471} m_PrefabAsset: {fileID: 0} +--- !u!1001 &59200419 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 22.48 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.22 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8091568879305240854, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8078969198260371399, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6439136948098473700, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9cc7ad0d733f9a84d89a008275cac4b4, type: 2} + - target: {fileID: -4217540975723366251, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3970312474992961079, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, + type: 0} + - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Name + value: Reference Animator + objectReference: {fileID: 0} + - target: {fileID: 3809497168930087674, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 22100000, guid: 3b2141e9994c07a4ab6c0aa978b55701, + type: 2} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_CullingMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7442431411280267050, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7697765139837514942, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3227681933796678702, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 59200425} + - targetCorrespondingSourceObject: {fileID: -8161387987429181625, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 59200423} + - targetCorrespondingSourceObject: {fileID: 1167343693203600193, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 59200424} + m_SourcePrefab: {fileID: 100100000, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} +--- !u!1 &59200420 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8161387987429181625, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 59200419} + m_PrefabAsset: {fileID: 0} +--- !u!1 &59200421 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1167343693203600193, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 59200419} + m_PrefabAsset: {fileID: 0} +--- !u!1 &59200422 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3227681933796678702, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 59200419} + m_PrefabAsset: {fileID: 0} +--- !u!54 &59200423 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59200420} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!54 &59200424 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59200421} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!54 &59200425 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 59200422} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &61276565 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08d179eb94bcf1044985cf4b1f0ab4f3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &61276566 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!4 &61786857 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3182735201027922777, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &61786858 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14030908} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &62423130 GameObject: m_ObjectHideFlags: 0 @@ -5695,6 +6009,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 123430279} m_PrefabAsset: {fileID: 0} +--- !u!4 &123947535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2839105842755776838, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &124573048 PrefabInstance: m_ObjectHideFlags: 0 @@ -5773,6 +6093,226 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 124573048} m_PrefabAsset: {fileID: 0} +--- !u!1001 &125219454 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 999499001} + m_Modifications: + - target: {fileID: 1630585989029977934, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Name + value: Physics Variant + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4378624254320444163, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9cc7ad0d733f9a84d89a008275cac4b4, type: 2} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: maximumForce + value: 2048 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: positionDamper + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: positionSpring + value: 1024 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: rootSync.allow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: rootSync.value.Item1 + value: + objectReference: {fileID: 125219455} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: rootSync.value.Item2 + value: + objectReference: {fileID: 229678932} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: overrideAngularMotion.allow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: overrideAngularMotion.value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[0].animate + value: + objectReference: {fileID: 934329457} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[1].animate + value: + objectReference: {fileID: 422526894} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[2].animate + value: + objectReference: {fileID: 627982695} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[3].animate + value: + objectReference: {fileID: 505303611} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[4].animate + value: + objectReference: {fileID: 830196196} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[5].animate + value: + objectReference: {fileID: 589450235} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[6].animate + value: + objectReference: {fileID: 143040370} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[7].animate + value: + objectReference: {fileID: 123947535} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[8].animate + value: + objectReference: {fileID: 1803569863} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[9].animate + value: + objectReference: {fileID: 943742811} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[10].animate + value: + objectReference: {fileID: 1375726042} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[11].animate + value: + objectReference: {fileID: 1711070105} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[12].animate + value: + objectReference: {fileID: 275819253} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[13].animate + value: + objectReference: {fileID: 2081923479} + - target: {fileID: 7613617252232372131, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: jointConfigures.Array.data[14].animate + value: + objectReference: {fileID: 61786857} + - target: {fileID: 9175704259732570125, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.20000026 + objectReference: {fileID: 0} + - target: {fileID: 9175704259732570125, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.000000071922585 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2155766259452216820, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 876052653} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3939364476258942513, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 928805569} + - targetCorrespondingSourceObject: {fileID: 1503221912631104856, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1703397500} + - targetCorrespondingSourceObject: {fileID: 744031168225087838, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 913705234} + m_SourcePrefab: {fileID: 100100000, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} +--- !u!54 &125219455 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 4298570866601109607, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &125320316 PrefabInstance: m_ObjectHideFlags: 0 @@ -6494,6 +7034,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 139270330} m_PrefabAsset: {fileID: 0} +--- !u!4 &143040370 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4207448628853120851, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &143502026 PrefabInstance: m_ObjectHideFlags: 0 @@ -6707,6 +7253,39 @@ MonoBehaviour: blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: 9b3b2dce7a21d034480413d0c5315aef, type: 2} +--- !u!1 &153545165 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3398720915967387667, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &153545166 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153545165} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &154602111 PrefabInstance: m_ObjectHideFlags: 0 @@ -6999,6 +7578,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 161154421} m_PrefabAsset: {fileID: 0} +--- !u!1001 &164282125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2924693015492943149, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_Name + value: Bouncing Betty (1) + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.x + value: 37.809998 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.z + value: -32.03 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fb120cc0b5f76434da0fe379afda7f28, type: 3} --- !u!1001 &166710438 PrefabInstance: m_ObjectHideFlags: 0 @@ -7383,6 +8030,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 171205619} m_PrefabAsset: {fileID: 0} +--- !u!1 &175287820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8241982726922733620, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &180407165 PrefabInstance: m_ObjectHideFlags: 0 @@ -7973,6 +8626,16 @@ PrefabInstance: propertyPath: m_Name value: Lootable_Ammo Variant objectReference: {fileID: 0} + - target: {fileID: 4305911198703365347, guid: 08bf595b66a0f9347973cbccd7039436, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4305911198703365347, guid: 08bf595b66a0f9347973cbccd7039436, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8070,6 +8733,89 @@ Transform: - {fileID: 1016229885} m_Father: {fileID: 1382913975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &203784454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 203784455} + - component: {fileID: 203784457} + - component: {fileID: 203784456} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &203784455 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203784454} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1954051268} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &203784456 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203784454} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &203784457 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203784454} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &205664861 PrefabInstance: m_ObjectHideFlags: 0 @@ -9599,6 +10345,16 @@ PrefabInstance: propertyPath: m_Name value: Weapon_M4A1 Variant objectReference: {fileID: 0} + - target: {fileID: 5681355521736104402, guid: 91b80a7cf885c984ea8d0d306d167dea, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5681355521736104402, guid: 91b80a7cf885c984ea8d0d306d167dea, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -9686,6 +10442,45 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 224088730} m_PrefabAsset: {fileID: 0} +--- !u!1 &229678931 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3227681933796678702, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!4 &229678932 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7878282167494398725, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &229678933 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229678931} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &230507591 PrefabInstance: m_ObjectHideFlags: 0 @@ -11202,12 +11997,126 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 264991927} m_PrefabAsset: {fileID: 0} +--- !u!1 &265186337 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8607815523763654915, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &265186341 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265186337} + m_ConnectedBody: {fileID: 943742812} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500001, y: -0.00000017881393, z: -1.0000001} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!4 &266790361 stripped Transform: m_CorrespondingSourceObject: {fileID: 4608805242581785863, guid: 82f624b1964c7ba4fb21eae95f185a9c, type: 3} m_PrefabInstance: {fileID: 247882212} m_PrefabAsset: {fileID: 0} +--- !u!4 &275819253 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3334209642920111391, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &277029082 PrefabInstance: m_ObjectHideFlags: 0 @@ -12418,6 +13327,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 295965508} m_PrefabAsset: {fileID: 0} +--- !u!1 &298658816 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3904109736575556253, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &298658821 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 298658816} + m_ConnectedBody: {fileID: 2081923480} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.74999946, y: 0.0000002736872, z: 1} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &298901944 PrefabInstance: m_ObjectHideFlags: 0 @@ -15661,6 +16678,120 @@ Transform: type: 3} m_PrefabInstance: {fileID: 381582181} m_PrefabAsset: {fileID: 0} +--- !u!1 &382774991 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8582530856858570349, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!54 &382774994 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8797709461692913723, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &382774995 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382774991} + m_ConnectedBody: {fileID: 229678933} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500002, y: -0.00000005960465, z: -0.9999999} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &383730451 PrefabInstance: m_ObjectHideFlags: 0 @@ -17114,6 +18245,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} +--- !u!1 &407874499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7824008451125550634, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &409571650 PrefabInstance: m_ObjectHideFlags: 0 @@ -17611,6 +18748,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 419464892} m_PrefabAsset: {fileID: 0} +--- !u!4 &422526894 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1504565572924216257, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &422526895 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 407874499} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &423794868 PrefabInstance: m_ObjectHideFlags: 0 @@ -18766,6 +19936,114 @@ Transform: type: 3} m_PrefabInstance: {fileID: 445626878} m_PrefabAsset: {fileID: 0} +--- !u!1 &447516865 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9213895380132396970, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &447516870 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447516865} + m_ConnectedBody: {fileID: 61786858} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7499996, y: 0.00000014172667, z: 0.9999999} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &450515314 PrefabInstance: m_ObjectHideFlags: 0 @@ -19615,6 +20893,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 460501039} m_PrefabAsset: {fileID: 0} +--- !u!4 &466827526 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 329677050363986409, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &466827528 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 463358143652920119, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &467050084 PrefabInstance: m_ObjectHideFlags: 0 @@ -21087,6 +22377,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 480148009} m_PrefabAsset: {fileID: 0} +--- !u!1 &482347557 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4389901372889341567, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &482347561 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482347557} + m_ConnectedBody: {fileID: 934329458} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500002, y: 0.000000007450581, z: -0.99999994} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &483492101 PrefabInstance: m_ObjectHideFlags: 0 @@ -21484,6 +22882,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 484634148} m_PrefabAsset: {fileID: 0} +--- !u!4 &485408094 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1498816037398356229, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &485522222 PrefabInstance: m_ObjectHideFlags: 0 @@ -22553,6 +23957,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 493816681} m_PrefabAsset: {fileID: 0} +--- !u!1 &493852048 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 476459386056918588, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1 &495572860 GameObject: m_ObjectHideFlags: 0 @@ -22899,7 +24309,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh36208 + m_Name: pb_Mesh36382 serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 @@ -23058,6 +24468,12 @@ Mesh: offset: 0 size: 0 path: +--- !u!4 &505303611 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3983025326440498736, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &507357727 PrefabInstance: m_ObjectHideFlags: 0 @@ -23395,6 +24811,12 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &514845482 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1447333612848246914, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &514924634 PrefabInstance: m_ObjectHideFlags: 0 @@ -23528,6 +24950,78 @@ Transform: type: 3} m_PrefabInstance: {fileID: 515137638} m_PrefabAsset: {fileID: 0} +--- !u!1 &519196722 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!4 &519196723 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!95 &519196724 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!114 &519196725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519196722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2d8418b0b9634b1892b0268dd9c2743, type: 3} + m_Name: + m_EditorClassIdentifier: + boneShape: 1 + drawBones: 1 + drawTripods: 0 + boneSize: 1 + tripodSize: 1 + boneColor: {r: 0, g: 0, b: 1, a: 0.5} + m_Transforms: + - {fileID: 229678932} + - {fileID: 1711070105} + - {fileID: 275819253} + - {fileID: 2013501707} + - {fileID: 2081923479} + - {fileID: 61786857} + - {fileID: 2114106790} + - {fileID: 934329457} + - {fileID: 422526894} + - {fileID: 627982695} + - {fileID: 505303611} + - {fileID: 830196196} + - {fileID: 589450235} + - {fileID: 2017573892} + - {fileID: 485408094} + - {fileID: 943742811} + - {fileID: 1375726042} + - {fileID: 143040370} + - {fileID: 123947535} + - {fileID: 1803569863} + - {fileID: 782270516} + - {fileID: 1534369531} +--- !u!114 &519196726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519196722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c77ffb9999903044809af0e80a9d4fc, type: 3} + m_Name: + m_EditorClassIdentifier: + root: {fileID: 999499001} --- !u!1001 &523249022 PrefabInstance: m_ObjectHideFlags: 0 @@ -23985,6 +25479,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 533551956} m_PrefabAsset: {fileID: 0} +--- !u!4 &534526648 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4825906924822146213, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &534526650 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 1889495685208529128, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &538094450 PrefabInstance: m_ObjectHideFlags: 0 @@ -24324,6 +25830,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 543961566} m_PrefabAsset: {fileID: 0} +--- !u!1 &544802409 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3217077931218125632, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &549755845 PrefabInstance: m_ObjectHideFlags: 0 @@ -25017,6 +26529,74 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &564294253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.x + value: 24.91 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.414 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068462, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_Name + value: Grenade (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a553c303344ee814ab274017e0f0e389, type: 3} --- !u!1 &567886088 GameObject: m_ObjectHideFlags: 0 @@ -26501,6 +28081,45 @@ Transform: type: 3} m_PrefabInstance: {fileID: 588013463} m_PrefabAsset: {fileID: 0} +--- !u!1 &589450234 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8161387987429181625, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!4 &589450235 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6638603555421802480, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &589450236 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 589450234} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &592007163 PrefabInstance: m_ObjectHideFlags: 0 @@ -27383,6 +29002,114 @@ Transform: type: 3} m_PrefabInstance: {fileID: 608445056} m_PrefabAsset: {fileID: 0} +--- !u!1 &609655922 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8429312864378616400, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &609655927 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609655922} + m_ConnectedBody: {fileID: 153545166} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.0000007748605, y: -0.7500007, z: 1.0000005} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &611156518 PrefabInstance: m_ObjectHideFlags: 0 @@ -27702,6 +29429,126 @@ Transform: type: 3} m_PrefabInstance: {fileID: 611156518} m_PrefabAsset: {fileID: 0} +--- !u!4 &612360973 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 881976917834032072, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &612360976 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 8989146153544629075, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!1 &620800467 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 705255310408056127, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &620800472 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620800467} + m_ConnectedBody: {fileID: 1418618360} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0.00000083446514, y: 0.74999976, z: 1.0000002} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &626801303 PrefabInstance: m_ObjectHideFlags: 0 @@ -27849,6 +29696,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 626801303} m_PrefabAsset: {fileID: 0} +--- !u!4 &627982695 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6993150107015568394, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &627982696 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514845482} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &630953841 GameObject: m_ObjectHideFlags: 0 @@ -29864,6 +31744,82 @@ Transform: - {fileID: 1391773240} m_Father: {fileID: 1382913975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &663811205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 663811207} + - component: {fileID: 663811209} + - component: {fileID: 663811208} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &663811207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663811205} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 21.48, y: 0.65, z: -32.864} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 820421431} + - {fileID: 1954051268} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &663811208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663811205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6fe23fca67cb7346a3c423d97c9e101, type: 3} + m_Name: + m_EditorClassIdentifier: + joint: {fileID: 1954051272} + animate: {fileID: 820421431} +--- !u!54 &663811209 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663811205} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &664687214 PrefabInstance: m_ObjectHideFlags: 0 @@ -35279,6 +37235,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8964120458767515333, guid: f9d15657f7beab142b68c36f80b7e192, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8964120458767515333, guid: f9d15657f7beab142b68c36f80b7e192, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -36595,46 +38561,91 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 321554626776762334, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.59999996 + objectReference: {fileID: 0} - target: {fileID: 1030070154462784955, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1030070154462784955, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.2999988 + objectReference: {fileID: 0} - target: {fileID: 1530111044160733237, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: -0.29999924 objectReference: {fileID: 0} + - target: {fileID: 1530111044160733237, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999987 + objectReference: {fileID: 0} - target: {fileID: 1993274947507926246, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: -0.29999924 objectReference: {fileID: 0} + - target: {fileID: 1993274947507926246, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999987 + objectReference: {fileID: 0} - target: {fileID: 2600311461855359849, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: -0.10000038 objectReference: {fileID: 0} + - target: {fileID: 2600311461855359849, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 3049114897794640783, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: 0.29999924 objectReference: {fileID: 0} + - target: {fileID: 3049114897794640783, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999988 + objectReference: {fileID: 0} - target: {fileID: 3628348256900614807, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: 0.79999924 objectReference: {fileID: 0} + - target: {fileID: 3628348256900614807, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.099999 + objectReference: {fileID: 0} - target: {fileID: 3667554056392843487, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3667554056392843487, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9000001 + objectReference: {fileID: 0} - target: {fileID: 3870777989283905909, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: 0.10000038 objectReference: {fileID: 0} + - target: {fileID: 3870777989283905909, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} - target: {fileID: 4066453597750257159, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_Name @@ -36645,20 +38656,25 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0.10000038 objectReference: {fileID: 0} + - target: {fileID: 4508621981374493830, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x - value: 31.17 + value: 27.07 objectReference: {fileID: 0} - target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.y - value: 0.0024564266 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.z - value: -30.44 + value: -31.07 objectReference: {fileID: 0} - target: {fileID: 5088247503209915273, guid: f18510934c4581d47819abfbf1bd3647, type: 3} @@ -36700,11 +38716,21 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0.29999924 objectReference: {fileID: 0} + - target: {fileID: 5513352452581566642, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999988 + objectReference: {fileID: 0} - target: {fileID: 6378096379543769463, guid: f18510934c4581d47819abfbf1bd3647, type: 3} propertyPath: m_LocalPosition.x value: -0.10000038 objectReference: {fileID: 0} + - target: {fileID: 6378096379543769463, guid: f18510934c4581d47819abfbf1bd3647, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -37434,6 +39460,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781490796} m_Mesh: {fileID: 4300002, guid: 4682e67e862cfb041829f0e8b78e0826, type: 3} +--- !u!4 &782270516 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4378679199943689658, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &787803752 PrefabInstance: m_ObjectHideFlags: 0 @@ -38529,6 +40561,65 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &820421430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 820421431} + - component: {fileID: 820421432} + m_Layer: 0 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &820421431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820421430} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.778, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 663811207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &820421432 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820421430} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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!1001 &821218995 PrefabInstance: m_ObjectHideFlags: 0 @@ -39254,6 +41345,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 826608510} m_PrefabAsset: {fileID: 0} +--- !u!4 &830196196 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5998989788883804860, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &831801475 PrefabInstance: m_ObjectHideFlags: 0 @@ -40134,6 +42231,39 @@ MonoBehaviour: mr: {fileID: 839107671} mf: {fileID: 839107672} garbageCollectMesh: {fileID: 839107673} +--- !u!1 &840554929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7569844970340953266, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &840554930 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840554929} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &842186678 PrefabInstance: m_ObjectHideFlags: 0 @@ -41164,6 +43294,67 @@ Transform: type: 3} m_PrefabInstance: {fileID: 872436782} m_PrefabAsset: {fileID: 0} +--- !u!1 &876052652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 876052653} + - component: {fileID: 876052655} + - component: {fileID: 876052654} + m_Layer: 8 + m_Name: Additive + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &876052653 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876052652} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 61276566} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &876052654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876052652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6fe23fca67cb7346a3c423d97c9e101, type: 3} + m_Name: + m_EditorClassIdentifier: + joint: {fileID: 1265748026} + animate: {fileID: 934329457} +--- !u!114 &876052655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 876052652} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6fe23fca67cb7346a3c423d97c9e101, type: 3} + m_Name: + m_EditorClassIdentifier: + joint: {fileID: 928805569} + animate: {fileID: 229678932} --- !u!1001 &876705209 PrefabInstance: m_ObjectHideFlags: 0 @@ -42966,6 +45157,126 @@ Transform: type: 3} m_PrefabInstance: {fileID: 913402460} m_PrefabAsset: {fileID: 0} +--- !u!1 &913705229 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 744031168225087838, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!4 &913705230 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2582995021366606041, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &913705232 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 842636669685928987, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!153 &913705234 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913705229} + m_ConnectedBody: {fileID: 1803569864} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.00000028469233, y: 0.0000007450581, z: -0.000000106891676} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &917218663 PrefabInstance: m_ObjectHideFlags: 0 @@ -43363,6 +45674,120 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 920665884} m_PrefabAsset: {fileID: 0} +--- !u!1 &928805566 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3939364476258942513, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!4 &928805568 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 633548069016882916, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!153 &928805569 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 928805566} + m_ConnectedBody: {fileID: 229678933} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0.00000005245368, y: -0.00000011920929, z: 0.000000059604666} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 512 + positionDamper: 8 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 512 + positionDamper: 8 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!43 &930309100 Mesh: m_ObjectHideFlags: 0 @@ -43701,6 +46126,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 934281413} m_PrefabAsset: {fileID: 0} +--- !u!4 &934329457 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3843661480532256425, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &934329458 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35713158} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &934980313 PrefabInstance: m_ObjectHideFlags: 0 @@ -44247,6 +46705,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 938874121} m_PrefabAsset: {fileID: 0} +--- !u!4 &943742811 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4364741603791511328, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &943742812 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544802409} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &946014112 PrefabInstance: m_ObjectHideFlags: 0 @@ -44749,6 +47240,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 950382151} m_PrefabAsset: {fileID: 0} +--- !u!1 &953886830 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5468352012422127874, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &953886835 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953886830} + m_ConnectedBody: {fileID: 1803569864} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.0000010235442, y: -0.74999976, z: 1.0000001} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &954352048 PrefabInstance: m_ObjectHideFlags: 0 @@ -45067,6 +47666,16 @@ PrefabInstance: propertyPath: m_Name value: SelfReviveKit Variant objectReference: {fileID: 0} + - target: {fileID: 415166089917043345, guid: df402c9deba8902458ad72d7a8fd0faf, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 415166089917043345, guid: df402c9deba8902458ad72d7a8fd0faf, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -46120,6 +48729,16 @@ PrefabInstance: propertyPath: rmsCount value: 4 objectReference: {fileID: 0} + - target: {fileID: 8889410695792324462, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8889410695792324462, guid: bc90096cf6047474a8195137fb77e890, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8889410696358529545, guid: bc90096cf6047474a8195137fb77e890, type: 3} propertyPath: m_Name @@ -47509,6 +50128,205 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 997325359} m_PrefabAsset: {fileID: 0} +--- !u!1 &999499000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 999499001} + - component: {fileID: 999499007} + - component: {fileID: 999499006} + - component: {fileID: 999499005} + - component: {fileID: 999499004} + - component: {fileID: 999499003} + - component: {fileID: 999499002} + - component: {fileID: 999499008} + - component: {fileID: 999499009} + m_Layer: 6 + m_Name: Physics Zombie + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &999499001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.98, y: 0, z: -34.22} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 519196723} + - {fileID: 61276566} + - {fileID: 1452634203} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &999499002 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + 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!114 &999499003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} + m_Name: + m_EditorClassIdentifier: + debug: 0 + animator: {fileID: 519196724} + layerInfos: [] +--- !u!114 &999499004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 296eab603fe190540b4cd37839b1e7e6, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 999499003} + _getDamage: + rid: -2 + aliveCollider: + allow: 1 + value: {fileID: 999499002} + allowAnimatorParameter: 1 + physicsBasedAnimation: + allow: 1 + value: {fileID: 61276565} + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } +--- !u!114 &999499005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c78fe9fd58f5efc4abdeb6d193bf258b, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 0} + rigidbodies: [] + ragdollColliders: [] + joint: {fileID: 928805569} + rigidbody: {fileID: 125219455} +--- !u!114 &999499006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 085a82cd092152541adfdf24c9f42394, type: 3} + m_Name: + m_EditorClassIdentifier: + healthPoint: 100 + maxHealthPoint: 100 +--- !u!114 &999499007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73333e0a8f0bc4a4b82c06db4c35a21f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!54 &999499008 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!114 &999499009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9db04e8e30068ef40b2afa725bdc239d, type: 3} + m_Name: + m_EditorClassIdentifier: + stateMachine: + states: [] + _currentStateName: + debug: 0 + transitionOnNextFrame: 0 + rigidbody: {fileID: 999499008} + animator: {fileID: 519196724} + references: + version: 2 + RefIds: [] --- !u!1001 &1001131830 PrefabInstance: m_ObjectHideFlags: 0 @@ -47940,6 +50758,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1007443852} m_PrefabAsset: {fileID: 0} +--- !u!1 &1009672770 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5241002553495663509, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1009672774 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009672770} + m_ConnectedBody: {fileID: 422526895} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500001, y: -0.000000044703484, z: -1} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1 &1016229884 GameObject: m_ObjectHideFlags: 0 @@ -52791,6 +55717,16 @@ PrefabInstance: propertyPath: m_Name value: Umbrella Variant objectReference: {fileID: 0} + - target: {fileID: 7886677397312935857, guid: 1c5b3b0f90030a348ad16d547555b6ed, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7886677397312935857, guid: 1c5b3b0f90030a348ad16d547555b6ed, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -54295,6 +57231,16 @@ PrefabInstance: propertyPath: m_Name value: Umbrella Variant (1) objectReference: {fileID: 0} + - target: {fileID: 7886677397312935857, guid: 1c5b3b0f90030a348ad16d547555b6ed, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7886677397312935857, guid: 1c5b3b0f90030a348ad16d547555b6ed, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -55639,6 +58585,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1171538283} m_PrefabAsset: {fileID: 0} +--- !u!1 &1171587975 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5748202298887807681, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1171587980 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1171587975} + m_ConnectedBody: {fileID: 627982696} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500001, y: -0.00000014901164, z: -1.0000001} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1173949835 PrefabInstance: m_ObjectHideFlags: 0 @@ -56667,6 +59721,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} +--- !u!1 &1192066505 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -304833110879391243, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1192066506 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1192066505} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1196432764 PrefabInstance: m_ObjectHideFlags: 0 @@ -60052,6 +63139,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1263436925} m_PrefabAsset: {fileID: 0} +--- !u!153 &1265748026 stripped +ConfigurableJoint: + m_CorrespondingSourceObject: {fileID: 5387712713472214081, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1267557895 PrefabInstance: m_ObjectHideFlags: 0 @@ -65076,6 +68169,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1366397421} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1368139029 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.x + value: 26.111 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.414 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068462, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_Name + value: Grenade (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a553c303344ee814ab274017e0f0e389, type: 3} --- !u!1001 &1369456229 PrefabInstance: m_ObjectHideFlags: 0 @@ -65556,6 +68717,39 @@ Transform: m_Children: [] m_Father: {fileID: 2057076194} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1375726042 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1611446259368198615, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1375726043 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175287820} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1380747660 PrefabInstance: m_ObjectHideFlags: 0 @@ -67594,6 +70788,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1417540063} m_PrefabAsset: {fileID: 0} +--- !u!1 &1418618359 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3307383484744224900, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1418618360 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418618359} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1420158934 GameObject: m_ObjectHideFlags: 0 @@ -68298,6 +71525,560 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1450517238} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1452634202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 999499001} + m_Modifications: + - target: {fileID: 139291906883361929, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 2048394489} + - target: {fileID: 150634226952185381, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Name + value: Hitbox + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: 22.48 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.22 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -21.98 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999988 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 913909496426237269, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 1594314421} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.58 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1739064665863670345, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 1979323695} + - target: {fileID: 1874199891205045866, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 1703397498} + - target: {fileID: 2141917366135397946, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 2048394491} + - target: {fileID: 2473833789607836118, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 466827528} + - target: {fileID: 2553428034442830580, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 2053339092} + - target: {fileID: 2917499401471096760, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 612360973} + - target: {fileID: 3187664028531886934, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 1831403502} + - target: {fileID: 3305645500564667542, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 1703397496} + - target: {fileID: 3626321072363289128, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 125219455} + - target: {fileID: 4122386449072780396, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 913705230} + - target: {fileID: 4228425057871401426, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 1831403503} + - target: {fileID: 4749050591813349255, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 612360976} + - target: {fileID: 4871982522611036922, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 534526648} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.48 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.2999988 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121079316718983630, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5121728491104445451, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 2053339091} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.48 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.59999996 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5560914069738189739, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5881815326525319811, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 913705232} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.779999 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999987 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 5997892003019056750, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 1594314422} + - target: {fileID: 6420050546190708472, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 928805568} + - target: {fileID: 6450095961494564829, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 534526650} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.98 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999987 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.18 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.0999988 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240822 + objectReference: {fileID: 0} + - target: {fileID: 7520077443289668456, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_rigidbody + value: + objectReference: {fileID: 1979323696} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.58 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 8.7659685e-15 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.38 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.48 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9000001 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8917115317957186730, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.x + value: -22.38 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.30000016 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalPosition.z + value: 34.22 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9080110541041845623, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Sources.Array.data[0].sourceTransform + value: + objectReference: {fileID: 466827526} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} +--- !u!4 &1452634203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 188815475637777487, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + m_PrefabInstance: {fileID: 1452634202} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1454020007 PrefabInstance: m_ObjectHideFlags: 0 @@ -70601,6 +74382,111 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1502964656} m_PrefabAsset: {fileID: 0} +--- !u!1 &1503175392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1503175396} + - component: {fileID: 1503175395} + - component: {fileID: 1503175394} + - component: {fileID: 1503175393} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1503175393 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503175392} + 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: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1503175394 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503175392} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1503175395 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503175392} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1503175396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503175392} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 21.48, y: 0.505, z: -34.22} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1513523053 PrefabInstance: m_ObjectHideFlags: 0 @@ -71582,6 +75468,114 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1525011471} m_PrefabAsset: {fileID: 0} +--- !u!1 &1525610375 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5649556681030613853, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1525610379 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525610375} + m_ConnectedBody: {fileID: 1972272394} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -1.0000005, y: -0.7500006, z: -0.00000023841864} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1529764492 PrefabInstance: m_ObjectHideFlags: 0 @@ -71824,6 +75818,12 @@ MonoBehaviour: mr: {fileID: 1533677600} mf: {fileID: 1533677601} garbageCollectMesh: {fileID: 1533677602} +--- !u!4 &1534369531 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1455171076697021789, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1535670664 PrefabInstance: m_ObjectHideFlags: 0 @@ -73858,6 +77858,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1590485126} m_PrefabAsset: {fileID: 0} +--- !u!4 &1594314421 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3757434209619021568, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1594314422 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 2221680581860341098, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1595874953 PrefabInstance: m_ObjectHideFlags: 0 @@ -75216,6 +79228,114 @@ MonoBehaviour: mr: {fileID: 1608336198} mf: {fileID: 1608336199} garbageCollectMesh: {fileID: 1608336200} +--- !u!1 &1611222955 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6723021573283189887, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1611222960 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611222955} + m_ConnectedBody: {fileID: 1711070106} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.75000083, y: -0.0000000988419, z: 0.99999976} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1616186940 PrefabInstance: m_ObjectHideFlags: 0 @@ -78172,6 +82292,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1927291750646019853, guid: d35acde394701754dbb50a0f9421c492, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1927291750646019853, guid: d35acde394701754dbb50a0f9421c492, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1927291751145116266, guid: d35acde394701754dbb50a0f9421c492, type: 3} propertyPath: m_Name @@ -78545,6 +82675,126 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1701514085} m_PrefabAsset: {fileID: 0} +--- !u!1 &1703397495 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1503221912631104856, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1703397496 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4160932145006727695, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1703397498 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 2561228540091958152, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1703397500 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1703397495} + m_ConnectedBody: {fileID: 589450236} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0.00000028469216, y: 0.00000055134296, z: -0.0000000719226} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1705219438 PrefabInstance: m_ObjectHideFlags: 0 @@ -78771,6 +83021,147 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1707943400} m_PrefabAsset: {fileID: 0} +--- !u!4 &1711070105 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5385585283068900668, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1711070106 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493852048} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &1712456735 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6155485094068053252, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1712456740 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1712456735} + m_ConnectedBody: {fileID: 589450236} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0.0000014109746, y: 0.7500008, z: 1.0000002} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1713478358 PrefabInstance: m_ObjectHideFlags: 0 @@ -82029,6 +86420,16 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0.172 objectReference: {fileID: 0} + - target: {fileID: 5208964436538694515, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5208964436538694515, guid: 373d78c28a8f6024cada3a296368b6c5, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5208964437046230547, guid: 373d78c28a8f6024cada3a296368b6c5, type: 3} propertyPath: m_LocalPosition.x @@ -82089,6 +86490,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 373d78c28a8f6024cada3a296368b6c5, type: 3} +--- !u!1 &1785653064 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1297477771064440610, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1786579111 PrefabInstance: m_ObjectHideFlags: 0 @@ -82677,6 +87084,45 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1802140938} m_PrefabAsset: {fileID: 0} +--- !u!1 &1803569862 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1167343693203600193, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1803569863 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5064072613576713530, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1803569864 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803569862} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1809707989 PrefabInstance: m_ObjectHideFlags: 0 @@ -83598,6 +88044,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1826397467} m_PrefabAsset: {fileID: 0} +--- !u!4 &1831403502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5311098224781035192, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1831403503 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 3232914140568484391, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1833093002 PrefabInstance: m_ObjectHideFlags: 0 @@ -84377,6 +88835,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1851558200} m_PrefabAsset: {fileID: 0} +--- !u!1 &1857528257 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6219147455449703823, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &1857528263 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857528257} + m_ConnectedBody: {fileID: 1375726043} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500001, y: -0.00000014901161, z: -1.0000001} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1859298075 PrefabInstance: m_ObjectHideFlags: 0 @@ -88785,6 +93351,193 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1951606292} m_PrefabAsset: {fileID: 0} +--- !u!1 &1954051267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1954051268} + - component: {fileID: 1954051269} + - component: {fileID: 1954051273} + - component: {fileID: 1954051272} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1954051268 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954051267} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.778, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 203784455} + m_Father: {fileID: 663811207} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1954051269 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954051267} + 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.05 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!153 &1954051272 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954051267} + m_ConnectedBody: {fileID: 663811209} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0, y: 0, z: 0} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 2 + m_AngularYMotion: 2 + m_AngularZMotion: 2 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 64 + positionDamper: 8 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 64 + positionDamper: 8 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 1 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!54 &1954051273 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954051267} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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!1001 &1955631000 PrefabInstance: m_ObjectHideFlags: 0 @@ -89269,6 +94022,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 6922057147405518897, guid: 104758e6f51cb7249b19c8a1f3dd7782, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6922057147405518897, guid: 104758e6f51cb7249b19c8a1f3dd7782, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6922057147913022801, guid: 104758e6f51cb7249b19c8a1f3dd7782, type: 3} propertyPath: m_LocalPosition.x @@ -89482,6 +94245,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1972063865} m_PrefabAsset: {fileID: 0} +--- !u!1 &1972272393 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1564719497880037662, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1972272394 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1972272393} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1972282229 PrefabInstance: m_ObjectHideFlags: 0 @@ -91216,6 +96012,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1977641844} m_PrefabAsset: {fileID: 0} +--- !u!4 &1979323695 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5826841836839622435, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1979323696 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 5324492942882635622, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1980809903 PrefabInstance: m_ObjectHideFlags: 0 @@ -92545,6 +97353,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: fcf359a961a07e64ba9c8fc0875e8e5c, type: 3} +--- !u!4 &2013501707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2298526965207050156, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2017573892 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8317421034184080212, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2018174900 PrefabInstance: m_ObjectHideFlags: 0 @@ -92635,6 +97455,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2018174900} m_PrefabAsset: {fileID: 0} +--- !u!1 &2019545777 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3665151837850631921, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &2019545781 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019545777} + m_ConnectedBody: {fileID: 840554930} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 1, y: 0.74999994, z: -0.0000004172325} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &2024345574 PrefabInstance: m_ObjectHideFlags: 0 @@ -93914,6 +98842,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2047790584} m_PrefabAsset: {fileID: 0} +--- !u!4 &2048394489 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3953920859050344283, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2048394491 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 4525177668422684269, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2049332870 PrefabInstance: m_ObjectHideFlags: 0 @@ -94286,6 +99226,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2052773547} m_PrefabAsset: {fileID: 0} +--- !u!4 &2053339091 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 431730115155581540, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2053339092 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 3029713378771627674, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2053995033 PrefabInstance: m_ObjectHideFlags: 0 @@ -95168,6 +100120,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2925653065538950463, guid: c7d364eea8941e847b69eba0d43e22b6, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2925653065538950463, guid: c7d364eea8941e847b69eba0d43e22b6, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2925653066038063192, guid: c7d364eea8941e847b69eba0d43e22b6, type: 3} propertyPath: m_Name @@ -95947,6 +100909,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2080733486} m_PrefabAsset: {fileID: 0} +--- !u!4 &2081923479 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6945191914899588997, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2081923480 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785653064} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 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: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &2082767413 PrefabInstance: m_ObjectHideFlags: 0 @@ -96433,6 +101428,173 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2093618418} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2096711820 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 999499001} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8091568879305240854, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, + type: 0} + - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Name + value: Physics Animator + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 22100000, guid: 3b2141e9994c07a4ab6c0aa978b55701, + type: 2} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_CullingMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 519196725} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 519196726} + - targetCorrespondingSourceObject: {fileID: 3227681933796678702, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 229678933} + - targetCorrespondingSourceObject: {fileID: 476459386056918588, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1711070106} + - targetCorrespondingSourceObject: {fileID: -304833110879391243, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1192066506} + - targetCorrespondingSourceObject: {fileID: -1297477771064440610, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2081923480} + - targetCorrespondingSourceObject: {fileID: -6625335125320094231, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 61786858} + - targetCorrespondingSourceObject: {fileID: 7438910584769629244, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 934329458} + - targetCorrespondingSourceObject: {fileID: -7824008451125550634, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 422526895} + - targetCorrespondingSourceObject: {fileID: 1447333612848246914, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 627982696} + - targetCorrespondingSourceObject: {fileID: 7569844970340953266, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 840554930} + - targetCorrespondingSourceObject: {fileID: -3307383484744224900, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1418618360} + - targetCorrespondingSourceObject: {fileID: -8161387987429181625, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 589450236} + - targetCorrespondingSourceObject: {fileID: 3217077931218125632, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 943742812} + - targetCorrespondingSourceObject: {fileID: -8241982726922733620, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1375726043} + - targetCorrespondingSourceObject: {fileID: 1564719497880037662, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1972272394} + - targetCorrespondingSourceObject: {fileID: 3398720915967387667, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 153545166} + - targetCorrespondingSourceObject: {fileID: 1167343693203600193, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1803569864} + m_SourcePrefab: {fileID: 100100000, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} --- !u!1001 &2100697585 PrefabInstance: m_ObjectHideFlags: 0 @@ -96492,6 +101654,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2100697585} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2101486724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.x + value: 25.513 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.414 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068462, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_Name + value: Grenade (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a553c303344ee814ab274017e0f0e389, type: 3} --- !u!1001 &2105046256 PrefabInstance: m_ObjectHideFlags: 0 @@ -96669,6 +101899,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2106482740} m_PrefabAsset: {fileID: 0} +--- !u!1 &2109776892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2311826753980883894, guid: c332bc1caa59c234197931b60f008785, + type: 3} + m_PrefabInstance: {fileID: 4397988261444489944} + m_PrefabAsset: {fileID: 0} +--- !u!153 &2109776897 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109776892} + m_ConnectedBody: {fileID: 1192066506} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.7500007, y: 0.00000015662786, z: 1} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 2 + m_YMotion: 2 + m_ZMotion: 2 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &2113905350 PrefabInstance: m_ObjectHideFlags: 0 @@ -96792,6 +102130,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2113905350} m_PrefabAsset: {fileID: 0} +--- !u!4 &2114106790 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -36413479647146862, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 2096711820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2116710098 PrefabInstance: m_ObjectHideFlags: 0 @@ -98047,6 +103391,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2143105513} m_PrefabAsset: {fileID: 0} +--- !u!1001 &138017611848021903 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1550547054305604702, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_Name + value: Medical Container + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.865595 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalPosition.z + value: -29.873026 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299209368302174261, guid: a751561613388284c9d7ac13bd6b1a03, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a751561613388284c9d7ac13bd6b1a03, type: 3} --- !u!1 &352174712362304505 GameObject: m_ObjectHideFlags: 0 @@ -121937,6 +127349,142 @@ MonoBehaviour: foundLodObjects: [] foundLodGroups: [] foundColliders: [] +--- !u!1001 &1122624672663049176 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2924693015492943149, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_Name + value: Bouncing Betty + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.x + value: 31.56 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalPosition.z + value: -35.78 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fb120cc0b5f76434da0fe379afda7f28, type: 3} +--- !u!1001 &1188891078137991118 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.x + value: 26.7 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalPosition.z + value: -34.414 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068457, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2863517944316068462, guid: a553c303344ee814ab274017e0f0e389, + type: 3} + propertyPath: m_Name + value: Grenade + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a553c303344ee814ab274017e0f0e389, type: 3} --- !u!1001 &1355448914676904952 PrefabInstance: m_ObjectHideFlags: 0 @@ -122267,6 +127815,493 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5728103306521437659} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4397988261444489944 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 303486682702111883, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedBody + value: + objectReference: {fileID: 1803569864} + - target: {fileID: 303486682702111883, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.00000028469228 + objectReference: {fileID: 0} + - target: {fileID: 303486682702111883, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.00000008940689 + objectReference: {fileID: 0} + - target: {fileID: 303486682702111883, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0000000123176145 + objectReference: {fileID: 0} + - target: {fileID: 350420854451832664, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.000000014901153 + objectReference: {fileID: 0} + - target: {fileID: 350420854451832664, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.000000029802326 + objectReference: {fileID: 0} + - target: {fileID: 350420854451832664, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0000000035754897 + objectReference: {fileID: 0} + - target: {fileID: 705255310408056127, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 872619552803284974, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalPosition.x + value: 23.23 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalPosition.z + value: -35.22 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1488513706006886731, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1552697436473183318, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.000000065566745 + objectReference: {fileID: 0} + - target: {fileID: 1552697436473183318, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.099995896 + objectReference: {fileID: 0} + - target: {fileID: 1552697436473183318, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.000000044703484 + objectReference: {fileID: 0} + - target: {fileID: 2069485461155290295, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2311826753980883894, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2686929079725101847, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.09999988 + objectReference: {fileID: 0} + - target: {fileID: 2686929079725101847, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.30000016 + objectReference: {fileID: 0} + - target: {fileID: 2686929079725101847, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.00000008940697 + objectReference: {fileID: 0} + - target: {fileID: 2790208239317350100, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: root.Item1 + value: + objectReference: {fileID: 382774994} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: root.Item2 + value: + objectReference: {fileID: 229678932} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: rootSync.value.Item1 + value: + objectReference: {fileID: 382774994} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: rootSync.value.Item2 + value: + objectReference: {fileID: 229678932} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: overrideAngularMotion.allow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: overrideAngularMotion.value + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[0].animate + value: + objectReference: {fileID: 934329457} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[1].animate + value: + objectReference: {fileID: 422526894} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[2].animate + value: + objectReference: {fileID: 627982695} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[3].animate + value: + objectReference: {fileID: 505303611} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[4].animate + value: + objectReference: {fileID: 830196196} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[5].animate + value: + objectReference: {fileID: 589450235} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[6].animate + value: + objectReference: {fileID: 143040370} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[7].animate + value: + objectReference: {fileID: 123947535} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[8].animate + value: + objectReference: {fileID: 1803569863} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[9].animate + value: + objectReference: {fileID: 943742811} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[10].animate + value: + objectReference: {fileID: 1375726042} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[11].animate + value: + objectReference: {fileID: 1711070105} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[12].animate + value: + objectReference: {fileID: 275819253} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[13].animate + value: + objectReference: {fileID: 2081923479} + - target: {fileID: 2889386559131234303, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: jointConfigures.Array.data[14].animate + value: + objectReference: {fileID: 61786857} + - target: {fileID: 3665151837850631921, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3742355425337115745, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3904109736575556253, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4277682428209377291, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedBody + value: + objectReference: {fileID: 153545166} + - target: {fileID: 4277682428209377291, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.00000015944251 + objectReference: {fileID: 0} + - target: {fileID: 4277682428209377291, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.00000005960465 + objectReference: {fileID: 0} + - target: {fileID: 4277682428209377291, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.000000044703413 + objectReference: {fileID: 0} + - target: {fileID: 4389901372889341567, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5098019642649589463, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5184500551525858626, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Name + value: Physics Limit + objectReference: {fileID: 0} + - target: {fileID: 5184500551525858626, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5184500551525858626, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5202699737389053749, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5241002553495663509, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5468352012422127874, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5649556681030613853, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5748202298887807681, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6155485094068053252, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6219147455449703823, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6273839840908472082, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6723021573283189887, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8318334955678501366, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8429312864378616400, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8582530856858570349, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8607815523763654915, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8738885092112411198, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797709461692913723, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8797709461692913723, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966168104747874516, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: 7.105428e-15 + objectReference: {fileID: 0} + - target: {fileID: 8966168104747874516, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: -0.00000014901161 + objectReference: {fileID: 0} + - target: {fileID: 8966168104747874516, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.00000005960467 + objectReference: {fileID: 0} + - target: {fileID: 9213895380132396970, guid: c332bc1caa59c234197931b60f008785, + type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8582530856858570349, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 382774995} + - targetCorrespondingSourceObject: {fileID: 6723021573283189887, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1611222960} + - targetCorrespondingSourceObject: {fileID: 2311826753980883894, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2109776897} + - targetCorrespondingSourceObject: {fileID: 3904109736575556253, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 298658821} + - targetCorrespondingSourceObject: {fileID: 9213895380132396970, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 447516870} + - targetCorrespondingSourceObject: {fileID: 4389901372889341567, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 482347561} + - targetCorrespondingSourceObject: {fileID: 5241002553495663509, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1009672774} + - targetCorrespondingSourceObject: {fileID: 5748202298887807681, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1171587980} + - targetCorrespondingSourceObject: {fileID: 3665151837850631921, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2019545781} + - targetCorrespondingSourceObject: {fileID: 705255310408056127, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 620800472} + - targetCorrespondingSourceObject: {fileID: 6155485094068053252, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1712456740} + - targetCorrespondingSourceObject: {fileID: 8607815523763654915, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 265186341} + - targetCorrespondingSourceObject: {fileID: 6219147455449703823, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1857528263} + - targetCorrespondingSourceObject: {fileID: 5649556681030613853, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1525610379} + - targetCorrespondingSourceObject: {fileID: 8429312864378616400, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 609655927} + - targetCorrespondingSourceObject: {fileID: 5468352012422127874, guid: c332bc1caa59c234197931b60f008785, + type: 3} + insertIndex: -1 + addedObject: {fileID: 953886835} + m_SourcePrefab: {fileID: 100100000, guid: c332bc1caa59c234197931b60f008785, type: 3} --- !u!1001 &5201691158714744108 PrefabInstance: m_ObjectHideFlags: 0 @@ -122408,6 +128443,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc75a0fddbed3cd449eeb3c41a63dafa, type: 3} +--- !u!1001 &8235205982781951058 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2405606720785421891, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_Name + value: Soda + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalPosition.x + value: 28.480923 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.443342 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2405606720785421892, guid: 90a7e66310865604a84cc4f70bccc45b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90a7e66310865604a84cc4f70bccc45b, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -122430,6 +128533,11 @@ SceneRoots: - {fileID: 2449601950372023472} - {fileID: 1047065956} - {fileID: 733421350} + - {fileID: 59200419} + - {fileID: 999499001} + - {fileID: 1503175396} + - {fileID: 663811207} + - {fileID: 4397988261444489944} - {fileID: 758967405} - {fileID: 1554728538} - {fileID: 402751311} @@ -122468,3 +128576,11 @@ SceneRoots: - {fileID: 686680624} - {fileID: 30348527} - {fileID: 1617257321} + - {fileID: 1122624672663049176} + - {fileID: 164282125} + - {fileID: 1188891078137991118} + - {fileID: 2101486724} + - {fileID: 564294253} + - {fileID: 1368139029} + - {fileID: 8235205982781951058} + - {fileID: 138017611848021903} diff --git a/Assets/Artists/Scripts/BulletService/BulletService.cs b/Assets/Artists/Scripts/BulletService/BulletService.cs index 24a98f79c..47152ddeb 100644 --- a/Assets/Artists/Scripts/BulletService/BulletService.cs +++ b/Assets/Artists/Scripts/BulletService/BulletService.cs @@ -18,6 +18,7 @@ namespace BITFALL public record InstanceBullet : SpawnBullet { public Vector3 currentPos; + public float InitialForce; public float currentSpeed = 64; public BITBullet model; } @@ -45,7 +46,7 @@ namespace BITFALL public UnityPool pool = new(); [Header(Constant.Header.InternalVariables)] - public List instances = new(); + private readonly List instances = new(); private readonly RaycastHit[] _raycastHits = new RaycastHit[16]; private void Start() { @@ -57,7 +58,6 @@ namespace BITFALL } private void FixedUpdate() { - instances ??= new List(); foreach (var bullet in instances.ToArray()) { var size = Physics.RaycastNonAlloc(bullet.currentPos, bullet.forward, _raycastHits, bullet.currentSpeed * Time.fixedDeltaTime, layerMask); @@ -95,7 +95,8 @@ namespace BITFALL rot = x.rot, forward = x.forward, initialDamage = x.initialDamage, - model = instance + model = instance, + InitialForce = x.InitialForce, }; var instanceTransform = instance.transform; instanceTransform.SetPositionAndRotation(x.pos, x.rot); @@ -118,17 +119,23 @@ namespace BITFALL if (layerMask.Includes(raycastHit.collider.gameObject.layer) is false) return false; var msg = new DamageMessage() { - target = damagable.Entity, - hit = damagable, - damage = bullet.initialDamage, + Target = damagable.Entity, + Hit = damagable, + Damage = bullet.initialDamage, }; damageService.Execute(msg); } - if (raycastHit.rigidbody is not null) + var _rigidbody = (raycastHit.rigidbody,damagable?.Rigidbody) switch { - if(raycastHit.rigidbody.gameObject.layer is not 0) - raycastHit.rigidbody.AddForceAtPositionAsync(force, raycastHit.point, ForceMode.Impulse).Forget(); + (null, null) => null, + (null, not null) => damagable?.Rigidbody, + (not null, null) => raycastHit.rigidbody, + (not null, not null) => raycastHit.rigidbody, + }; + if (_rigidbody is not null && _rigidbody.gameObject.layer is not 0) + { + _rigidbody.AddForceAtPositionAsync(force, raycastHit.point, ForceMode.Impulse).Forget(); } diff --git a/Assets/Artists/Scripts/Editor/BITFALLDebuger.cs b/Assets/Artists/Scripts/Editor/BITFALLDebuger.cs index 12df11b3d..c13b45cfa 100644 --- a/Assets/Artists/Scripts/Editor/BITFALLDebuger.cs +++ b/Assets/Artists/Scripts/Editor/BITFALLDebuger.cs @@ -27,8 +27,8 @@ namespace BITFALL.Editor { playerService.LocalPlayer.Invoke(new DamageMessage() { - target = playerService.LocalPlayer, - damage = 101, + Target = playerService.LocalPlayer, + Damage = 101, }); } if (Keyboard.current.numpadPlusKey.wasPressedThisFrame) diff --git a/Assets/Artists/Scripts/Entities/Armor/EntityArmor.cs b/Assets/Artists/Scripts/Entities/Armor/EntityArmor.cs index 3b5b5d387..c7a38e693 100644 --- a/Assets/Artists/Scripts/Entities/Armor/EntityArmor.cs +++ b/Assets/Artists/Scripts/Entities/Armor/EntityArmor.cs @@ -40,13 +40,13 @@ namespace BITFALL.Entities.Armor public override void OnAwake() { base.OnAwake(); - _health.OnDamage += OnDamage; - _inventory.OnUsed += OnUsed; - + _health.OnDamageFactory += OnDamageFactory; + _inventory.OnUsedItem += OnUsedItem; + _equipmentContainer.OnEquip += OnEquip; _equipmentContainer.OnDeEquip += OnDeEquip; - _playerEquipSelector.OnTryEquip += OnTryEquip; + _playerEquipSelector.TryEquipFactory += OnTryEquip; } private bool OnTryEquip(IBasicItem arg) @@ -81,7 +81,7 @@ namespace BITFALL.Entities.Armor OnEquipArmor?.Invoke(arg2); } - private void OnUsed(IBasicItem obj) + private void OnUsedItem(IBasicItem obj) { if (_currentArmor?.GetAssetable() is not AssetableArmor assetableArmor) return; if (obj.GetAssetable().TryGetProperty(out var addArmor)) @@ -89,7 +89,7 @@ namespace BITFALL.Entities.Armor Armor = Mathf.Clamp(Armor + addArmor.Armor, 0, assetableArmor.MaxArmor); } } - private int OnDamage(DamageMessage arg1, int damage) + private int OnDamageFactory(DamageMessage arg1, int damage) { if (_currentArmor is null) return damage; if (Armor is 0) return damage; diff --git a/Assets/Artists/Scripts/Entities/BITFALL.Entities.Runtime.asmdef b/Assets/Artists/Scripts/Entities/BITFALL.Entities.Runtime.asmdef index 62a00d05d..82da0a18e 100644 --- a/Assets/Artists/Scripts/Entities/BITFALL.Entities.Runtime.asmdef +++ b/Assets/Artists/Scripts/Entities/BITFALL.Entities.Runtime.asmdef @@ -13,8 +13,7 @@ "GUID:9e24947de15b9834991c9d8411ea37cf", "GUID:84651a3751eca9349aac36a66bba901b", "GUID:f6155d9ae143f3949ac54e8355593d6c", - "GUID:b355af20142c0c541ba9588ab1d0f64e", - "GUID:ef0bb553b58b90b488bdbe8672e3be0b" + "GUID:48ef04d98836e2640bf90b524bdff904" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/Entities/Core/Character/BITKit.Entities.Core.Character.asmdef b/Assets/Artists/Scripts/Entities/Core/Character/BITKit.Entities.Core.Character.asmdef index bfc928f33..ed1923b1e 100644 --- a/Assets/Artists/Scripts/Entities/Core/Character/BITKit.Entities.Core.Character.asmdef +++ b/Assets/Artists/Scripts/Entities/Core/Character/BITKit.Entities.Core.Character.asmdef @@ -7,7 +7,8 @@ "GUID:7efac18f239530141802fb139776f333", "GUID:d525ad6bd40672747bde77962f1c401e", "GUID:49b49c76ee64f6b41bf28ef951cb0e50", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:bea3628e8b592ae47ade218cb9ec98db" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs b/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs index a6b81a7f0..5890d9415 100644 --- a/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs +++ b/Assets/Artists/Scripts/Entities/Core/Character/EntityProxyCharacter.cs @@ -1,16 +1,21 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using BITKit; using BITKit.Animations; using BITKit.Entities; +using BITKit.Physics; + namespace BITFALL.Entites { public class EntityProxyCharacter : EntityComponent { - public UnityAnimator animator; + [SerializeField] private UnityAnimator animator; [SerializeReference, SubclassSelector] public References _getDamage; [SerializeField] private Optional aliveCollider = new(); + [SerializeField] private bool allowAnimatorParameter; + [SerializeField] private Optional physicsBasedAnimation = new(); [Inject] private IHealth _health; public override void OnStart() @@ -20,10 +25,27 @@ namespace BITFALL.Entites _health.OnSetHealthPoint += OnSetHP; } + private void FixedUpdate() + { + if (physicsBasedAnimation.Allow) + { + physicsBasedAnimation.Value.Blend = + Mathf.MoveTowards( + physicsBasedAnimation.Value.Blend, + _health.IsAlive ? 1 : 0, + Time.fixedTime + ); + } + } + public void OnSetAlive(bool alive) { if (aliveCollider.Allow) aliveCollider.Value.enabled = alive; + if (allowAnimatorParameter && animator is not null) + { + animator.animator.SetBool(nameof(IHealth.IsAlive), alive); + } } public void OnSetHP(int hp) diff --git a/Assets/Artists/Scripts/Entities/Core/EquipSelector/IPlayerEquipSelector.cs b/Assets/Artists/Scripts/Entities/Core/EquipSelector/IPlayerEquipSelector.cs index acd5f7bce..c1f5b0a5b 100644 --- a/Assets/Artists/Scripts/Entities/Core/EquipSelector/IPlayerEquipSelector.cs +++ b/Assets/Artists/Scripts/Entities/Core/EquipSelector/IPlayerEquipSelector.cs @@ -15,7 +15,7 @@ namespace BITFALL /// public interface IPlayerEquipSelector { - event Func OnTryEquip; + event Func TryEquipFactory; event Action> OnUpdateEquip; bool TryDeEquip(IBasicItem item); bool Cancel(); diff --git a/Assets/Artists/Scripts/Entities/Core/Inventory/IEntityInventory.cs b/Assets/Artists/Scripts/Entities/Core/Inventory/IEntityInventory.cs index ced128a69..f0510f9cc 100644 --- a/Assets/Artists/Scripts/Entities/Core/Inventory/IEntityInventory.cs +++ b/Assets/Artists/Scripts/Entities/Core/Inventory/IEntityInventory.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using BITKit; @@ -7,6 +8,12 @@ namespace BITFALL.Entities.Inventory { public interface IEntityInventory : IBasicItemContainer { - bool UseItem(IBasicItem item); + /// + /// 已使用Item的回调 + /// + event Action OnUsedItem; + bool TryUseItem(IBasicItem item); + event Func TryUseItemFactory; + void UseItem(IBasicItem item); } } diff --git a/Assets/Artists/Scripts/Entities/EquipSelector/BITFALL.Entities.EquipSelector.Runtime.asmdef b/Assets/Artists/Scripts/Entities/EquipSelector/BITFALL.Entities.EquipSelector.Runtime.asmdef index e39bf7fae..01da5bea5 100644 --- a/Assets/Artists/Scripts/Entities/EquipSelector/BITFALL.Entities.EquipSelector.Runtime.asmdef +++ b/Assets/Artists/Scripts/Entities/EquipSelector/BITFALL.Entities.EquipSelector.Runtime.asmdef @@ -17,7 +17,8 @@ "GUID:ef0bb553b58b90b488bdbe8672e3be0b", "GUID:f6155d9ae143f3949ac54e8355593d6c", "GUID:d9ed46adfa0436d42b5f66480c967c74", - "GUID:f51ebe6a0ceec4240a699833d6309b23" + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:48ef04d98836e2640bf90b524bdff904" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/Entities/EquipSelector/PlayerEquipSelector.cs b/Assets/Artists/Scripts/Entities/EquipSelector/PlayerEquipSelector.cs index 2339b875b..16dc808dd 100644 --- a/Assets/Artists/Scripts/Entities/EquipSelector/PlayerEquipSelector.cs +++ b/Assets/Artists/Scripts/Entities/EquipSelector/PlayerEquipSelector.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Threading.Tasks; using BITFALL.Entities; using BITFALL.Entities.Improvised; +using BITFALL.Entities.Inventory; using BITFALL.Player.Inventory; using BITKit.Entities.Player; using Cysharp.Threading.Tasks; @@ -27,13 +28,11 @@ namespace BITFALL.Entities.Equipment [Header(Constant.Header.InternalVariables)] private readonly Dictionary equips=new(); - public event Func OnTryEquip; + public event Func TryEquipFactory; public event Action> OnUpdateEquip; - [Inject(true)] - private IPlayerInventory _playerInventory; [Inject] - private IBasicItemContainer _inventory; + private IEntityInventory _inventory; [Inject(true)] private IKnockdown _knockdown; [Inject] @@ -44,6 +43,8 @@ namespace BITFALL.Entities.Equipment private IEntityEquipment _equipment; [Inject(true)] private ImprovisedServiceInterface _improvisedService; + [Inject] + private IEntityEquipmentContainer _equipmentContainer; private readonly DoubleBuffer _cachedItem=new(); @@ -68,22 +69,17 @@ namespace BITFALL.Entities.Equipment _improvisedService.OnTryUnEquipImprovisedItem += OnTryUnEquipImprovisedItem; } } - + public override void OnStart() { base.OnStart(); - - if (_playerInventory is not null) - { - _playerInventory.OnUseItem += TryExecute; - _playerInventory.OnUseItemCustom += TryUseItemCustom; - _inventory.OnUsed += OnUsed; - _inventory.OnAdd += OnAdd; - _inventory.OnRemove += OnRemove; - } + _inventory.TryUseItemFactory += TryEquip; + _inventory.OnUsedItem += OnEquip; + _inventory.OnAdd += OnAdd; + _inventory.OnRemove += OnRemove; } - + private bool OnTryUnEquipImprovisedItem(IBasicItem arg) { @@ -135,7 +131,7 @@ namespace BITFALL.Entities.Equipment public void OnQuaternary(InputAction.CallbackContext context) { if (context is not {interaction:PressInteraction ,performed:true}) return; - Equip(4); + Equip(); } public void OnHolster(InputAction.CallbackContext context) { @@ -153,7 +149,7 @@ namespace BITFALL.Entities.Equipment UpdateEquip(); Equip(-1); } - private bool TryExecute(IBasicItem value) + private bool TryEquip(IBasicItem value) { if (_knockdown is not null && _knockdown.IsKnockdown) return false; var asset = value.GetAssetable(); @@ -167,31 +163,21 @@ namespace BITFALL.Entities.Equipment UpdateEquip(); _improvisedService?.TryUnEquipImprovised(out _); currentEquip = value; + _inventory.UseItem(value); return true; } break; - } - return false; - } - private bool TryUseItemCustom(IBasicItem value) - { - if (_knockdown is not null && _knockdown.IsKnockdown) return false; - var asset = value.GetAssetable(); - if (_equipment.IsSupportItem(value) is false) return false; - switch (asset) - { case var _ when asset.TryGetProperty(out _): - if (OnTryEquip?.CastAsFunc().Any(x => x.Invoke(value)) is false) return false; - _equipment.EntryEquip(value); - _improvisedService?.TryUnEquipImprovised(out _); - if (currentEquip is not null) - { - _cachedItem.Release(currentEquip); - } - currentEquip = value; - return true; + if (TryEquipFactory?.CastAsFunc().Any(x => x.Invoke(value)) is false) return false; + _equipment.EntryEquip(value); + _improvisedService?.TryUnEquipImprovised(out _); + if (currentEquip is not null) + { + _cachedItem.Release(currentEquip); + } + currentEquip = value; + return true; } - return false; } public async void OnAdd(IBasicItem item) @@ -216,9 +202,9 @@ namespace BITFALL.Entities.Equipment { await UniTask.NextFrame(); } - if (_equipment.IsSupportItem(item)) + if (_equipment.IsSupportItem(item) && item.GetAssetable().TryGetProperty(out _)) { - _playerInventory.TryUseItem(item); + _inventory.TryUseItem(item); } } catch(OperationCanceledException){} @@ -227,17 +213,25 @@ namespace BITFALL.Entities.Equipment public void Throw(InputAction.CallbackContext context) { - if (context is not { interaction: HoldInteraction, performed: true }) return; - if(currentEquip is null) return; - if(equips.TryGetAny(x=>x.Value.AddressablePath == currentEquip.AddressablePath,out var pair)) + switch (context) { - if (_inventory.DropOrSpawn(currentEquip)) - { - equips.Remove(pair.Key); - _equipment.EntryEquip((IBasicItem)null); - currentEquip = null; - UpdateEquip(); - } + case { interaction: HoldInteraction, performed: true }: + if (currentEquip is null) return; + if (equips.TryGetAny(x => x.Value.AddressablePath == currentEquip.AddressablePath, out var pair)) + { + if (_inventory.DropOrSpawn(currentEquip)) + { + equips.Remove(pair.Key); + _equipment.EntryEquip((IBasicItem)null); + currentEquip = null; + UpdateEquip(); + } + } + + break; + case { interaction: TapInteraction, performed: true }: + Equip(); + break; } } public void OnRemove(IBasicItem item) @@ -249,7 +243,7 @@ namespace BITFALL.Entities.Equipment _blockList.Add(item.Id); } - private void OnUsed(IBasicItem obj) + private void OnEquip(IBasicItem obj) { _blockList.Remove(obj.Id); } @@ -297,5 +291,13 @@ namespace BITFALL.Entities.Equipment _equipment.EntryEquip(x); return true; } + + private bool Equip() where T : IEquipmentSlot + { + if (!_equipmentContainer.Equipment.TryGetAny(x => x.Key is T, out var item)) return false; + //if (!_inventory.TryUseItem(item.Value)) return false; + Equip(item.Value); + return true; + } } } \ No newline at end of file diff --git a/Assets/Artists/Scripts/Entities/Equipment/BITFALL.Entities.Equipment.Runtime.asmdef b/Assets/Artists/Scripts/Entities/Equipment/BITFALL.Entities.Equipment.Runtime.asmdef index 8846abd3a..0a0245e90 100644 --- a/Assets/Artists/Scripts/Entities/Equipment/BITFALL.Entities.Equipment.Runtime.asmdef +++ b/Assets/Artists/Scripts/Entities/Equipment/BITFALL.Entities.Equipment.Runtime.asmdef @@ -15,7 +15,8 @@ "GUID:d8b63aba1907145bea998dd612889d6b", "GUID:30cdc242b1ac6a944a460f4ab0b77b88", "GUID:7efac18f239530141802fb139776f333", - "GUID:ef0bb553b58b90b488bdbe8672e3be0b" + "GUID:ef0bb553b58b90b488bdbe8672e3be0b", + "GUID:48ef04d98836e2640bf90b524bdff904" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs index 0e97f8cd6..622c0614e 100644 --- a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs +++ b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs @@ -19,11 +19,12 @@ namespace BITKit.Entities public abstract class BITEquipBase : StateBasedMonoBehaviour, IEquipBase where T : IState { [Header(Constant.Header.Settings)] - [SerializeField] protected AssetableEquip item; + [SerializeField] protected AssetableItem item; [Header(Constant.Header.Components)] public UnityAnimator animator; [SerializeField] private Renderer[] renderers; + [SerializeField] protected Transform cameraTransform; [Header(Constant.Header.Services)] [SerializeReference,SubclassSelector] protected IMeleeService meleeService; @@ -39,12 +40,12 @@ namespace BITKit.Entities public virtual string AddressablePath => item.AddressablePath; protected virtual Vector3 meleeForce => Transform.forward; public bool IsEntered { get; set; } + private Quaternion _initialCameraRotation; public virtual void Entry() { AllowRendering.AddElement(this); - animator.animator.enabled = true; - animator.animator.Update(0); + inputActionGroup.allowInput.AddElement(this); } public virtual UniTask EntryAsync() { @@ -58,18 +59,26 @@ namespace BITKit.Entities public virtual UniTask ExitAsync() { AllowRendering.RemoveElement(this); + if (cameraTransform is not null) + { + cameraTransform.localPosition = default; + cameraTransform.localRotation = _initialCameraRotation; + } return UniTask.CompletedTask; } + public virtual void OnAwake() { - AllowRendering.AddListener(x=>renderers.ForEach(y=> + AllowRendering.AddListener(x => renderers.ForEach(y => { y.enabled = x; - animator.animator.enabled = x; + animator.enabled = x; })); AllowRendering.Invoke(); - + if (cameraTransform is not null) + _initialCameraRotation = cameraTransform.localRotation; Initialize(); + inputActionGroup.allowInput.Invoke(); } public virtual void OnDestroy() @@ -86,6 +95,7 @@ namespace BITKit.Entities public virtual void AnimationEvent(string eventName) { if (IsEntered is false) return; + if (item is not AssetableEquip equip) return; switch (eventName) { case "Melee": @@ -94,9 +104,9 @@ namespace BITKit.Entities { PlayerId = Entity.Id, Position = Transform.position, - Force = meleeForce * item.MeleeForce, - Range = item.MeleeRange, - Damage = item.MeleeDamage + Force = meleeForce * equip.MeleeForce, + Range = equip.MeleeRange, + Damage = equip.MeleeDamage }); break; case "HeavyAttack": @@ -104,9 +114,9 @@ namespace BITKit.Entities { PlayerId = Entity.Id, Position = Transform.position, - Force = meleeForce * item.HeavyMeleeForce, - Range = item.HeavyMeleeRange, - Damage = item.HeavyMeleeDamage, + Force = meleeForce * equip.HeavyMeleeForce, + Range = equip.HeavyMeleeRange, + Damage = equip.HeavyMeleeDamage, }); break; } diff --git a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipmentContainer.cs b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipmentContainer.cs index 3979fde41..b44b7bb8d 100644 --- a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipmentContainer.cs +++ b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipmentContainer.cs @@ -3,14 +3,17 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using BITFALL.Entities.Equipment; +using BITFALL.Entities.Inventory; using BITFALL.Player.Inventory; using UnityEngine; using BITKit; using BITKit.Entities; +using Unity.IO.LowLevel.Unsafe; +using UnityEditor.Graphs; namespace BITFALL { - + /// /// 玩家装备容器 /// 支持，护甲，头盔和背包等 @@ -18,9 +21,11 @@ namespace BITFALL [CustomType(typeof(IEntityEquipmentContainer))] public class EntityEquipmentContainer : EntityComponent, IEntityEquipmentContainer { - private readonly Dictionary dictionary = new(); - [Inject] - private IBasicItemContainer inventory; + public IDictionary Equipment { get; } = + new Dictionary(); + + [Inject] private IEntityInventory _inventory; + public override void OnAwake() { var health = entity.Get(); @@ -30,20 +35,19 @@ namespace BITFALL private void OnSetAlive(bool obj) { if (obj) return; - foreach (var x in dictionary.ToArray()) + foreach (var x in Equipment.ToArray()) { OnDeEquip?.Invoke(x.Key, x.Value); - inventory.Add(x.Value); + _inventory.Add(x.Value); } - dictionary.Clear(); + + Equipment.Clear(); } public override void OnStart() { base.OnStart(); - inventory = entity.Get(); - var playerInventory = entity.Get(); - playerInventory.OnUseItem += TryExecute; + _inventory.TryUseItemFactory += TryExecute; } public Action OnEquip { get; set; } @@ -51,49 +55,66 @@ namespace BITFALL public bool TryDeEquip(T slot) where T : IEquipmentSlot { - if (!dictionary.TryGetValue(slot, out var equipable)) return false; - if (inventory.Add(equipable)) + if (!Equipment.TryGetAny(x => x.Key.GetType().IsInstanceOfType(slot), out var pair)) return false; + if (_inventory.Add(pair.Value)) { - DeEquip(slot, equipable); + DeEquip(slot, pair.Value); } + return false; } + + public bool TryUseEquip(T slot) where T : IEquipmentSlot + { + return TryUseEquip(System.Activator.CreateInstance(typeof(T)) as IEquipmentSlot); + } + + public bool TryUseEquip(IEquipmentSlot slot) + { + if (!Equipment.TryGetAny(x => x.Key.GetType().IsInstanceOfType(slot), out var pair)) return false; + if (!Equipment.TryRemove(pair.Key)) return false; + OnDeEquip?.Invoke(pair.Key, pair.Value); + _inventory.UseItem(pair.Value); + + if (_inventory.TryGetItem(x => x.AddressablePath == pair.Value.AddressablePath, out var item)) + { + Equip(pair.Key, item); + _inventory.Remove(item); + } + + return true; + } + private bool Equip(IEquipmentSlot slot, IBasicItem item) { - dictionary.Add(slot, item); + if (Equipment.TryAdd(slot, item) is false) return false; OnEquip?.Invoke(slot, item); return true; } + private bool DeEquip(IEquipmentSlot slot, IBasicItem item) { - dictionary.Remove(slot); + if (Equipment.TryRemove(slot) is false) return false; OnDeEquip?.Invoke(slot, item); return true; } + public int Priority => 0; public bool TryExecute(IBasicItem value) { var asset = value.GetAssetable(); //尝试获取可装备信息 - if (!asset.TryGetProperty(out var equipable)) return false; + if (!asset.TryGetProperty(out var equipmentAsSlot)) return false; //已装备物品 - if (dictionary.TryGetValue(equipable.slot, out var equipedItem)) + if (Equipment.TryGetValue(equipmentAsSlot.slot, out _)) { - //尝试将装配放回背包 - if (inventory.Add(equipedItem)) - { - //移除已装备物品 - DeEquip(equipable.slot, value); - } + return false; } - //从库存中移除物品 - if (inventory.Remove(value)) - { - //装配物品 - Equip(equipable.slot, value); - } - return false; + //装配物品 + Equip(equipmentAsSlot.slot, value); + _inventory.Remove(value); + return true; } } } diff --git a/Assets/Artists/Scripts/Entities/Inventory/EntityInventory.cs b/Assets/Artists/Scripts/Entities/Inventory/EntityInventory.cs index 72f23c95d..a2278dbfa 100644 --- a/Assets/Artists/Scripts/Entities/Inventory/EntityInventory.cs +++ b/Assets/Artists/Scripts/Entities/Inventory/EntityInventory.cs @@ -16,7 +16,7 @@ namespace BITFALL { [CustomType(typeof(IEntityInventory))] [CustomType(typeof(IBasicItemContainer))] - public abstract class EntityInventory : EntityComponent, IEntityInventory + public abstract class EntityInventory : EntityComponent, IEntityInventory,IBasicItemContainer { /// /// 数据字典 @@ -41,20 +41,30 @@ namespace BITFALL public event Func DropFactory; // 回调 public event Action OnAdd; - public event Action OnUsed; + public event Action OnUsedItem; public event Action OnRemove; + public event Func TryUseItemFactory; public event Action OnSet; public event Action OnDrop; public event Action OnRebuild; - public bool UseItem(IBasicItem item) + public bool Clear(int id) + { + throw new NotImplementedException(); + } + + public bool TryUseItem(IBasicItem item) { if (dictionary.ContainsKey(item.Id) is false) { return false; } - dictionary.Remove(item.Id); - OnUsed?.Invoke(item); - return true; + return TryUseItemFactory is not null && TryUseItemFactory.CastAsFunc().Any(x => x.Invoke(item)); + } + + public void UseItem(IBasicItem item) + { + OnUsedItem?.Invoke(item); + dictionary.TryRemove(item.Id); } [Inject] diff --git a/Assets/Artists/Scripts/Entities/Inventory/InventoryWeightable.cs b/Assets/Artists/Scripts/Entities/Inventory/InventoryWeightable.cs index 951d1ab63..9491d5801 100644 --- a/Assets/Artists/Scripts/Entities/Inventory/InventoryWeightable.cs +++ b/Assets/Artists/Scripts/Entities/Inventory/InventoryWeightable.cs @@ -1,5 +1,6 @@ using System; using BITFALL.Entities.Equipment; +using BITFALL.Entities.Inventory; using UnityEngine; using BITKit; using BITKit.Entities; @@ -17,20 +18,30 @@ namespace BITFALL public double currentWeight; [Header(Constant.Header.Settings)] public double maxWeight =8; + [Header(Constant.Header.InternalVariables)] - private IBasicItemContainer container; + [Inject] + private IBasicItemContainer _container; + [Inject(true)] + private IEntityInventory _inventory; + [Inject(true)] + private IEntityEquipmentContainer playerEquipContainer; public override void OnStart() { - base.OnStart(); - container = entity.Get(); - container.AddFactory += AddFactory; - container.OnAdd += OnAdd; - container.OnUsed += OnRemove; - container.OnRemove += OnRemove; + _container.AddFactory += AddFactory; + _container.OnAdd += OnAdd; + _container.OnRemove += OnRemove; - var playerEquipContainer = entity.Get(); - playerEquipContainer.OnEquip += OnEquip; - playerEquipContainer.OnDeEquip += DeEquip; + if (_inventory is not null) + { + _inventory.OnUsedItem += OnRemove; + } + + if (playerEquipContainer is not null) + { + playerEquipContainer.OnEquip += OnEquip; + playerEquipContainer.OnDeEquip += DeEquip; + } } private bool AddFactory(IBasicItem item) diff --git a/Assets/Artists/Scripts/Entities/Inventory/PlayerEquipContainer.cs b/Assets/Artists/Scripts/Entities/Inventory/PlayerEquipContainer.cs index bc1d0ed01..928920e6d 100644 --- a/Assets/Artists/Scripts/Entities/Inventory/PlayerEquipContainer.cs +++ b/Assets/Artists/Scripts/Entities/Inventory/PlayerEquipContainer.cs @@ -1,98 +1,99 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using BITFALL.Player.Inventory; -using UnityEngine; -using BITKit; -using BITKit.Entities; - -namespace BITFALL -{ - - /// - /// 玩家装备容器 - /// 支持，护甲，头盔和背包等 - /// - [CustomType(typeof(IPlayerEquipContainer))] - public class PlayerEquipContainer : EntityComponent, IPlayerEquipContainer - { - private readonly Dictionary dictionary = new(); - [Inject] - private IBasicItemContainer inventory; - public override void OnAwake() - { - var health = entity.Get(); - health.OnSetAlive += OnSetAlive; - } - - private void OnSetAlive(bool obj) - { - if (obj) return; - foreach (var x in dictionary.ToArray()) - { - OnDeEquip?.Invoke(x.Key, x.Value); - inventory.Add(x.Value); - } - dictionary.Clear(); - } - - public override void OnStart() - { - base.OnStart(); - inventory = entity.Get(); - var playerInventory = entity.Get(); - playerInventory.OnUseItem += TryExecute; - } - - public Action OnEquip { get; set; } - public Action OnDeEquip { get; set; } - - public bool TryDeEquip(T slot) where T : IEquipmentSlot - { - if (!dictionary.TryGetValue(slot, out var equipable)) return false; - if (inventory.Add(equipable)) - { - DeEquip(slot, equipable); - } - return false; - } - private bool Equip(IEquipmentSlot slot, IBasicItem item) - { - dictionary.Add(slot, item); - OnEquip?.Invoke(slot, item); - return true; - } - private bool DeEquip(IEquipmentSlot slot, IBasicItem item) - { - dictionary.Remove(slot); - OnDeEquip?.Invoke(slot, item); - return true; - } - public int Priority => 0; - - public bool TryExecute(IBasicItem value) - { - var asset = value.GetAssetable(); - //尝试获取可装备信息 - if (!asset.TryGetProperty(out var equipable)) return false; - //已装备物品 - if (dictionary.TryGetValue(equipable.slot, out var equipedItem)) - { - //尝试将装配放回背包 - if (inventory.Add(equipedItem)) - { - //移除已装备物品 - DeEquip(equipable.slot, value); - } - } - //从库存中移除物品 - if (inventory.Remove(value)) - { - //装配物品 - Equip(equipable.slot, value); - } - return false; - } - } -} +// using System; +// using System.Collections; +// using System.Collections.Generic; +// using System.Linq; +// using BITFALL.Entities.Equipment; +// using BITFALL.Player.Inventory; +// using UnityEngine; +// using BITKit; +// using BITKit.Entities; +// +// namespace BITFALL +// { +// +// /// +// /// 玩家装备容器 +// /// 支持，护甲，头盔和背包等 +// /// +// [CustomType(typeof(IEntityEquipmentContainer))] +// public class PlayerEquipContainer : EntityComponent, IEntityEquipmentContainer +// { +// private Dictionary Equipment = new(); +// [Inject] +// private IBasicItemContainer inventory; +// public override void OnAwake() +// { +// var health = entity.Get(); +// health.OnSetAlive += OnSetAlive; +// } +// +// private void OnSetAlive(bool obj) +// { +// if (obj) return; +// foreach (var x in Equipment.ToArray()) +// { +// OnDeEquip?.Invoke(x.Key, x.Value); +// inventory.Add(x.Value); +// } +// Equipment.Clear(); +// } +// +// public override void OnStart() +// { +// base.OnStart(); +// inventory = entity.Get(); +// var playerInventory = entity.Get(); +// playerInventory.OnUseItem += TryExecute; +// } +// +// public Action OnEquip { get; set; } +// public Action OnDeEquip { get; set; } +// +// public bool TryDeEquip(T slot) where T : IEquipmentSlot +// { +// if (!Equipment.TryGetValue(slot, out var equipable)) return false; +// if (inventory.Add(equipable)) +// { +// DeEquip(slot, equipable); +// } +// return false; +// } +// private bool Equip(IEquipmentSlot slot, IBasicItem item) +// { +// Equipment.Add(slot, item); +// OnEquip?.Invoke(slot, item); +// return true; +// } +// private bool DeEquip(IEquipmentSlot slot, IBasicItem item) +// { +// Equipment.Remove(slot); +// OnDeEquip?.Invoke(slot, item); +// return true; +// } +// public int Priority => 0; +// +// public bool TryExecute(IBasicItem value) +// { +// var asset = value.GetAssetable(); +// //尝试获取可装备信息 +// if (!asset.TryGetProperty(out var equipable)) return false; +// //已装备物品 +// if (Equipment.TryGetValue(equipable.slot, out var equipedItem)) +// { +// //尝试将装配放回背包 +// if (inventory.Add(equipedItem)) +// { +// //移除已装备物品 +// DeEquip(equipable.slot, value); +// } +// } +// //从库存中移除物品 +// if (inventory.Remove(value)) +// { +// //装配物品 +// Equip(equipable.slot, value); +// } +// return false; +// } +// } +// } diff --git a/Assets/Artists/Scripts/Entities/Inventory/PlayerInventory.cs b/Assets/Artists/Scripts/Entities/Inventory/PlayerInventory.cs index 2d8f69a57..5186766b3 100644 --- a/Assets/Artists/Scripts/Entities/Inventory/PlayerInventory.cs +++ b/Assets/Artists/Scripts/Entities/Inventory/PlayerInventory.cs @@ -39,43 +39,24 @@ namespace BITFALL } private void OnActive(ISelectable obj) { - if (obj.Transform.TryGetComponentAny(out var item)) + if (!obj.Transform.TryGetComponentAny(out var item)) return; + var _item = item.Pick(); + if(item.GetAssetable().TryGetProperty(out _)) { - var _item = item.Pick(); - if(item.GetAssetable().TryGetProperty(out _)) + if (_knockdown is not null && _knockdown.IsKnockdown) { - if (_knockdown is not null && _knockdown.IsKnockdown) - { - return; - } - if (_improvisedService.TryEquipImprovisedItem(_item)) - { - item.Picked(); - } + return; } - else if (Add(_item)) + if (_improvisedService.TryEquipImprovisedItem(_item)) { item.Picked(); } } - // else if(obj.Transform.TryGetComponentAny(out _)) - // { - // - // } + else if (Add(_item)) + { + item.Picked(); + } } - public bool TryUseItem(IBasicItem item) - { - if (OnUseItem is null) return false; - return OnUseItem.CastAsFunc().Any(func => func.Invoke(item)) && UseItem(item); - } - - public event Func OnUseItem; - public bool TryUseItemCustom(IBasicItem item) - { - return OnUseItemCustom is not null && OnUseItemCustom.CastAsFunc().Any(func => func.Invoke(item)); - } - - public event Func OnUseItemCustom; } #if UNITY_EDITOR [UnityEditor.CustomEditor(typeof(PlayerInventory))] diff --git a/Assets/Artists/Scripts/Entities/Inventory/PlayerInventorySwap.cs b/Assets/Artists/Scripts/Entities/Inventory/PlayerInventorySwap.cs new file mode 100644 index 000000000..69858a9b5 --- /dev/null +++ b/Assets/Artists/Scripts/Entities/Inventory/PlayerInventorySwap.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using BITFALL.Entities.Inventory; +using BITFALL.Items; +using BITKit; +using BITKit.Entities; +using BITKit.Selection; +using UnityEngine; + +namespace BITFALL.Player.Inventory +{ + [CustomType(typeof(IEntitySwapItem))] + public class PlayerInventorySwap : EntityComponent,IEntitySwapItem + { + public bool TryGetCurrentContainer(out IBasicItemContainer container) + { + container = _currentContainer; + return container is not null; + } + + public event Func OpenSwapFactory; + public event Action OnSwapOpened; + public event Action OnSwapClosed; + + [Inject] private ISelector _selector; + [Inject] private IHealth _health; + [Inject] private IEntityInventory _inventory; + + private IBasicItemContainer _currentContainer; + + public override void OnStart() + { + base.OnStart(); + _selector.OnActive += OnActive; + _health.OnSetAlive += OnSetAlive; + } + + private void OnSetAlive(bool obj) + { + if (obj is false) + { + Close(); + } + } + + private void OnActive(ISelectable obj) + { + if (_currentContainer is not null) return; + if (obj.Transform.TryGetComponent(out var container) is false) return; + Open(container); + } + + public bool Add(IBasicItem item) + { + if (_currentContainer is null) return false; + return _inventory.Add(item) && _currentContainer.Remove(item); + } + public bool Remove(IBasicItem item) + { + if (_currentContainer is null) return false; + return _currentContainer.Add(item) && _inventory.Remove(item); + } + + public bool Open(IBasicItemContainer container) + { + if (_currentContainer is not null) return false; + if (OpenSwapFactory.CastAsFunc().Any(x=>x.Invoke(container) is false)) return false; + _currentContainer = container; + OnSwapOpened?.Invoke(_currentContainer); + return true; + } + + public bool Close() + { + if (_currentContainer is null) return false; + OnSwapClosed?.Invoke(_currentContainer); + _currentContainer = null; + return true; + } + } + +} diff --git a/Assets/Artists/Scripts/Entities/Knockdown/EntityKnockdown.cs b/Assets/Artists/Scripts/Entities/Knockdown/EntityKnockdown.cs index 322603c87..372e18ad4 100644 --- a/Assets/Artists/Scripts/Entities/Knockdown/EntityKnockdown.cs +++ b/Assets/Artists/Scripts/Entities/Knockdown/EntityKnockdown.cs @@ -1,8 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; +using BITFALL.Entities.Inventory; using BITFALL.Items; -using BITFALL.Player.Inventory; using BITKit; using BITKit.Entities; using UnityEditor; @@ -31,32 +31,30 @@ namespace BITFALL.Entities private IHealth _health; [Inject] - private IPlayerInventory _inventory; + private IEntityInventory _inventory; public override void OnStart() { - _health.OnDamage += OnDamage; + _health.OnDamageFactory += OnDamageFactory; _health.OnSetAlive += OnSetAlive; _health.OnSetHealthPoint += OnSetHealthPoint; - _inventory.OnUseItem += OnUseItem; + _inventory.OnUsedItem += OnUseItem; } private void OnSetHealthPoint(int obj) { - if (obj > 0 && IsKnockdown && _health.IsAlive) - { - IsKnockdown = false; - OnRevive?.Invoke(); - } - } - - private bool OnUseItem(IBasicItem arg) - { - if (IsKnockdown is false || arg.GetAssetable().TryGetProperty(out var reviveItem) is false) return false; - OnRevive?.Invoke(); + if (obj <= 0 || !IsKnockdown || !_health.IsAlive) return; IsKnockdown = false; - return true; + OnRevive?.Invoke(); + } + private void OnUseItem(IBasicItem arg) + { + if (IsKnockdown is false || + arg.GetAssetable().TryGetProperty(out var reviveItem) is false) return; + IsKnockdown = false; + OnRevive?.Invoke(); + } private void OnSetAlive(bool obj) @@ -64,7 +62,7 @@ namespace BITFALL.Entities IsKnockdown = false; } - private int OnDamage(DamageMessage arg,int currentDamage) + private int OnDamageFactory(DamageMessage arg,int currentDamage) { if (IsKnockdown || _health.HealthPoint - currentDamage >=0 ) return currentDamage; IsKnockdown = true; diff --git a/Assets/Artists/Scripts/Entities/Melee/EntityMelee.cs b/Assets/Artists/Scripts/Entities/Melee/EntityMelee.cs index 97d20a76f..baa2ef7bc 100644 --- a/Assets/Artists/Scripts/Entities/Melee/EntityMelee.cs +++ b/Assets/Artists/Scripts/Entities/Melee/EntityMelee.cs @@ -1,27 +1,46 @@ using System.Collections; using System.Collections.Generic; using System.Xml; +using BITFALL.Combat; +using BITKit.Animations; using BITKit.Entities.Melee; using Unity.Mathematics; using UnityEngine; namespace BITKit.Entities { - public interface IEntityMelee - { - void Execute(); - } - public class EntityMelee : EntityComponent + [CustomType(typeof(IMeleeCombat))] + public class EntityMelee : EntityComponent,IMeleeCombat { + [SerializeField] private UnityAnimator unityAnimator; + [Header(Constant.Header.Settings)] - public int damage=50; - public bool singleTarget; + [SerializeField] private int damage=50; + [SerializeReference, SubclassSelector, Inject(true)] private IMeleeService meleeService; + [Inject(true)] private IEntityOverride entityOverride; public override void OnStart() { entity.AddListener("Melee", Melee); entity.AddListener(AIAction); + + unityAnimator[0].onStateEnter += OnStateEnter; } + + private void OnStateEnter(string obj) + { + if(entityOverride is null)return; + if (obj is "HitStun") + { + entityOverride.AddOverride(this); + } + else + { + entityOverride.RemoveOverride(this); + } + + } + private void AIAction(string actionName) { switch (actionName) @@ -40,7 +59,14 @@ namespace BITKit.Entities Range = 1.6f, Damage = _damage, }); - entity.Invoke(Constant.Animation.Play, "Melee"); + unityAnimator.Play("Attack"); + //entity.Invoke(Constant.Animation.Play, "Melee"); + } + + public void Execute() => Melee(damage); + public void HitStun() + { + unityAnimator.Play("HitStun"); } } } \ No newline at end of file diff --git a/Assets/Artists/Scripts/Equip/BITGun.cs b/Assets/Artists/Scripts/Equip/BITGun.cs index 0fa6302ed..814edf1f5 100644 --- a/Assets/Artists/Scripts/Equip/BITGun.cs +++ b/Assets/Artists/Scripts/Equip/BITGun.cs @@ -10,6 +10,7 @@ using UnityEngine.InputSystem; using BITKit.StateMachine; using Cysharp.Threading.Tasks; using Unity.Mathematics; +using UnityEditorInternal; using UnityEngine.InputSystem.Interactions; #if UNITY_EDITOR using UnityEditor; @@ -95,7 +96,7 @@ namespace BITFALL.Guns [Inject] private IHealth _health; private static readonly int IsGrounded = Animator.StringToHash("IsGrounded"); - + private AssetableGun _gun=>item as AssetableGun; private bool isHolstered; #region 接口实现 @@ -209,15 +210,12 @@ namespace BITFALL.Guns public override void OnUpdate(float deltaTime) { - //CurrentState?.OnStateUpdate(deltaTime); UpdateState(deltaTime); switch (assetable.FireMode) { case AutoFireMode: - expectFiring.shouldBe = fireAction.action.IsPressed(); break; case SemiFireMode: - expectFiring.shouldBe = fireAction.action.WasPressedThisFrame(); break; case BurstFireMode when expectFiring.being: expectFiring.shouldBe = fireAction.action.WasPressedThisFrame(); @@ -273,7 +271,8 @@ namespace BITFALL.Guns pos = (_transform.position+rotation * bulletInitialOffset).Fix(), rot = rotation, forward = _transform.forward.Fix(), - initialDamage = 32, + initialDamage = _gun.InitialDamage, + InitialForce = _gun.InitialBulletForce, }); //播放枪口MuzzleFlash @@ -313,7 +312,29 @@ namespace BITFALL.Guns } private void OnFire(InputAction.CallbackContext context) { - + switch (assetable.FireMode) + { + case AutoFireMode : + switch (context) + { + case {interaction:TapInteraction , started:true}: + expectFiring.shouldBe = true; + break; + case {interaction:TapInteraction , performed:true}: + case {interaction:HoldInteraction , canceled:true}: + expectFiring.shouldBe = false; + break; + } + break; + case SemiFireMode: + switch (context) + { + case { interaction: TapInteraction, started: true }: + expectFiring.shouldBe = true; + break; + } + break; + } } private void OnAim(InputAction.CallbackContext context) { diff --git a/Assets/Artists/Scripts/Equip/BITGunStates.cs b/Assets/Artists/Scripts/Equip/BITGunStates.cs index f1affaa50..d47b60cf3 100644 --- a/Assets/Artists/Scripts/Equip/BITGunStates.cs +++ b/Assets/Artists/Scripts/Equip/BITGunStates.cs @@ -51,8 +51,6 @@ namespace BITFALL.Guns.States { root.TransitionState(); } - - root.expectAiming.shouldBe = root.aimAction.action.IsPressed(); } public void OnActive(ISelectable selectable) { diff --git a/Assets/Artists/Scripts/Equip/MeleeController.cs b/Assets/Artists/Scripts/Equip/MeleeController.cs index a9d9e8c7f..7e1a77af3 100644 --- a/Assets/Artists/Scripts/Equip/MeleeController.cs +++ b/Assets/Artists/Scripts/Equip/MeleeController.cs @@ -2,6 +2,8 @@ using System; using System.Collections; using System.Collections.Generic; using BITFALL.Items.Melee; +using BITFALL.Combat; +using BITFALL.Player.Movement; using BITKit; using BITKit.Core.Entites; using BITKit.Entities; @@ -24,7 +26,7 @@ namespace BITFALL.Entities.Equipment.Melee public virtual bool Enabled { get; set; } public virtual void Initialize() { - + meleeController.Entity.Inject(this); } public virtual void OnStateEntry(IState old) @@ -43,6 +45,7 @@ namespace BITFALL.Entities.Equipment.Melee { [Header(Constant.Header.Input)] [SerializeField] private InputActionReference attackAction; + [SerializeField] private InputActionReference blockAction; [Header(Constant.Header.Gameobjects)] [SerializeField] private Transform velocityReference; @@ -55,15 +58,68 @@ namespace BITFALL.Entities.Equipment.Melee [Inject] private IEntityMovement _movement; + [Inject] + private IPlayerMovement _playerMovement; + [Inject] private IHealth _health; public override void OnAwake() { base.OnAwake(); inputActionGroup.RegisterCallback(attackAction, OnAttack); + inputActionGroup.RegisterCallback(blockAction, OnBlock); + _health.OnDamageFactory += OnDamageFactory; + + _movement.OnStateChanged += OnMovementStateChanged; } + private void OnMovementStateChanged(IEntityMovementState arg1, IEntityMovementState arg2) + { + switch (arg2) + { + case IPlayerDodgeState: + TransitionState(); + animator.Play(BITConstant.Player.Dodge); + break; + } + } + + private int OnDamageFactory(DamageMessage arg1, int arg2) + { + if (Enabled is false || arg1.Initiator is null) return arg2; + if (CurrentState is not Blocking blocking) return arg2; + var combat = arg1.Initiator.Get(); + if (combat is null) return arg2; + + if (blocking.AllowBlockStun && _playerMovement.Stamina >= melee.BlockStaminaCost) + { + arg2 =0; + combat.HitStun(); + + animator.Play(BITConstant.Player.BlockStun); + + _playerMovement.Stamina -= melee.BlockStaminaCost*0.5f; + } + else + { + if (_playerMovement.Stamina > melee.BlockStaminaCost) + { + animator.Play(BITConstant.Player.BlockStun); + arg2 /= 3; + } + else + { + animator.Play(BITConstant.Player.BlockBreak); + arg2 /= 2; + } + _playerMovement.Stamina -= melee.BlockStaminaCost; + } + + + return arg2; + } public override void Entry() { base.Entry(); + TransitionState(); } @@ -79,7 +135,19 @@ namespace BITFALL.Entities.Equipment.Melee animator.animator.SetFloat(BITConstant.Player.SqrMagnitude,sqr); } - + private void OnBlock(InputAction.CallbackContext obj) + { + switch (obj) + { + case {interaction:TapInteraction,started:true} when CurrentState is Idle: + TransitionState(); + break; + case {interaction:TapInteraction,performed:true} when CurrentState is Blocking: + case {interaction:HoldInteraction,canceled:true} when CurrentState is Blocking: + TransitionState(); + break; + } + } private void OnAttack(InputAction.CallbackContext context) { //如果启用了指针则不开火 @@ -89,13 +157,13 @@ namespace BITFALL.Entities.Equipment.Melee } switch (context) { - case {interaction: TapInteraction,performed:true} when CurrentState is not (Attack or HeavyAttack or Draw): + case {interaction: TapInteraction,performed:true} when CurrentState is not (Attack or HeavyAttack or Draw or Blocking): TransitionState(); break; - case {interaction: HoldInteraction,started:true} when CurrentState is not (Charging or Attack or HeavyAttack or Draw): + case {interaction: HoldInteraction,started:true} when CurrentState is not (Charging or Attack or HeavyAttack or Draw or Blocking): TransitionState(); break; - case {interaction: HoldInteraction,canceled:true} when CurrentState is not (Attack or Idle or Draw): + case {interaction: HoldInteraction,canceled:true} when CurrentState is not (Attack or Idle or Draw or Blocking): TransitionState(); break; } diff --git a/Assets/Artists/Scripts/Equip/MeleeControllerStates.cs b/Assets/Artists/Scripts/Equip/MeleeControllerStates.cs index d38f052f9..3a228720c 100644 --- a/Assets/Artists/Scripts/Equip/MeleeControllerStates.cs +++ b/Assets/Artists/Scripts/Equip/MeleeControllerStates.cs @@ -1,6 +1,9 @@ using System; using System.Collections; using System.Collections.Generic; +using BITFALL.Player.Movement; +using BITKit; +using BITKit.Entities; using BITKit.StateMachine; using UnityEngine; @@ -28,16 +31,46 @@ namespace BITFALL.Entities.Equipment.Melee [Serializable] public sealed class Idle:PlayerMeleeControllerState { - - } - [Serializable] - public sealed class Run:PlayerMeleeControllerState - { - + [Inject] + private IEntityMovement _movement; + public override void Initialize() + { + base.Initialize(); + _movement.OnStateChanged += OnMovementStateChanged; + } + + public override void OnStateEntry(IState old) + { + base.OnStateEntry(old); + meleeController.animator.CrossFade(BITConstant.Player.Idle,1f); + } + + public override void OnStateUpdate(float deltaTime) + { + base.OnStateUpdate(deltaTime); + meleeController.animator.animator.SetBool(BITConstant.Player.IsRunning,_movement.CurrentState is IPlayerRunState or IPlayerSprintState); + meleeController.animator.animator.SetBool(BITConstant.Player.IsGrounded,_movement.IsGrounded); + meleeController.animator.animator.SetBool(BITConstant.Player.IsCrouched,_movement.CurrentState is IPlayerCrouchState); + } + + private void OnMovementStateChanged(IEntityMovementState arg1, IEntityMovementState arg2) + { + switch (arg2) + { + case IPlayerClimbState: + case IPlayerLinkState: + meleeController.animator.Play(BITConstant.Player.Climb); + break; + } + + if (Enabled is false) return; + } } [Serializable] public sealed class Attack:PlayerMeleeControllerState { + [Inject] + private IEntityMovement _movement; public override void Initialize() { base.Initialize(); @@ -47,31 +80,40 @@ namespace BITFALL.Entities.Equipment.Melee meleeController.TransitionState(); }; } - public override void OnStateEntry(IState old) { base.OnStateEntry(old); meleeController.animator.Play(BITConstant.Player.Attack); } + public override void OnStateUpdate(float deltaTime) + { + base.OnStateUpdate(deltaTime); + _movement.ExecuteCommand(); + } } [Serializable] public sealed class Charging:PlayerMeleeControllerState { - public override void Initialize() - { - base.Initialize(); - - } + [Inject] + private IEntityMovement _movement; public override void OnStateEntry(IState old) { base.OnStateEntry(old); meleeController.animator.Play(BITConstant.Player.Charging); + + } + public override void OnStateUpdate(float deltaTime) + { + base.OnStateUpdate(deltaTime); + _movement.ExecuteCommand(); } } [Serializable] public sealed class HeavyAttack:PlayerMeleeControllerState { + [Inject] + private IPlayerMovement _playerMovement; public override void Initialize() { base.Initialize(); @@ -80,12 +122,33 @@ namespace BITFALL.Entities.Equipment.Melee if(Enabled && state is BITConstant.Player.HeavyAttack) meleeController.TransitionState(); }; + } - public override void OnStateEntry(IState old) { base.OnStateEntry(old); meleeController.animator.Play(BITConstant.Player.HeavyAttack); + _playerMovement.Stamina -= meleeController.melee.HeavyAttackStaminaCost; + } + } + + [Serializable] + public sealed class Blocking : PlayerMeleeControllerState + { + public bool AllowBlockStun => _interval.AllowUpdateWithoutReset is false; + private readonly IntervalUpdate _interval = new(0.32f); + [Inject] + private IEntityMovement _movement; + public override void OnStateEntry(IState old) + { + base.OnStateEntry(old); + _interval.Reset(); + meleeController.animator.Play(BITConstant.Player.Blocking); + } + public override void OnStateUpdate(float deltaTime) + { + base.OnStateUpdate(deltaTime); + _movement.ExecuteCommand(); } } } diff --git a/Assets/Artists/Scripts/Equip/PlayerImprovisedController.cs b/Assets/Artists/Scripts/Equip/PlayerImprovisedController.cs index 7ba92a5e0..0b7c58ebf 100644 --- a/Assets/Artists/Scripts/Equip/PlayerImprovisedController.cs +++ b/Assets/Artists/Scripts/Equip/PlayerImprovisedController.cs @@ -69,6 +69,7 @@ namespace BITFALL.Player.Equip private void OnEquip(IBasicItem obj) { + if (IsEntered is false) return; spriteRenderer.sprite = null; if (modelDictionary.TryGetValue(obj.AddressablePath, out var model)) model.gameObject.SetActive(true); diff --git a/Assets/Artists/Scripts/Equip/ThrowController.cs b/Assets/Artists/Scripts/Equip/ThrowController.cs new file mode 100644 index 000000000..902a12743 --- /dev/null +++ b/Assets/Artists/Scripts/Equip/ThrowController.cs @@ -0,0 +1,89 @@ +using System.Collections; +using System.Collections.Generic; +using BITFALL.Entities.Equipment; +using BITFALL.Entities.Inventory; +using BITFALL.Items; +using BITKit; +using BITKit.Entities; +using BITKit.StateMachine; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Interactions; + +namespace BITFALL.Throws +{ + public interface IThrowState:IState{} + public class ThrowController : BITEquipBase + { + [Header(nameof(throwPoint))] + [SerializeField] private Transform throwPoint; + [SerializeField] private float throwForce; + [SerializeField] private InputActionReference throwAction; + private AssetableThrow _assetableThrow=>(AssetableThrow)item; + [Inject] private IPlayerEquipSelector _equipSelector; + [Inject] private IEntityInventory _inventory; + [Inject] private IEntityEquipmentContainer _equipmentContainer; + private bool isHolding; + public override void OnAwake() + { + inputActionGroup.RegisterCallback(throwAction, OnThrow); + base.OnAwake(); + animator[0].onStateExit += OnStateExit; + } + private void OnStateExit(string obj) + { + if (IsEntered is false) return; + switch (obj) + { + case BITConstant.Player.Draw: + if (isHolding is false) + { + animator.Play(BITConstant.Player.Throw); + } + break; + case BITConstant.Player.Throw: + _equipSelector.Cancel(); + break; + } + } + + public override void Entry() + { + isHolding = false; + base.Entry(); + animator.Play(BITConstant.Player.Draw); + } + + private void OnThrow(InputAction.CallbackContext obj) + { + switch (obj) + { + case { interaction: HoldInteraction, performed: true }: + isHolding = true; + break; + case { interaction: HoldInteraction, canceled: true }: + if (animator[0].stateName == BITConstant.Player.Idle) + animator.Play(BITConstant.Player.Throw); + break; + } + // if(obj is not {interaction:TapInteraction, performed:true}) return; + // switch (animator[0].stateName) + // { + // case BITConstant.Player.Idle: + // animator.Play(BITConstant.Player.Throw); + // break; + // } + } + + public override void AnimationEvent(string eventName) + { + if (IsEntered is false) return; + if (eventName is not BITConstant.Player.Throw) return; + if (!_equipmentContainer.TryUseEquip()) return; + var instance = _assetableThrow.GetInstance(); + if (!instance.TryGetComponent(out var _rigidbody)) return; + _rigidbody.position = throwPoint.position; + _rigidbody.AddForce(throwPoint.forward * throwForce, ForceMode.VelocityChange); + } + } +} diff --git a/Assets/Artists/Scripts/Equip/UniversalUseController.cs b/Assets/Artists/Scripts/Equip/UniversalUseController.cs index a81c28e3e..d174681f4 100644 --- a/Assets/Artists/Scripts/Equip/UniversalUseController.cs +++ b/Assets/Artists/Scripts/Equip/UniversalUseController.cs @@ -46,6 +46,7 @@ namespace BITFALL.Entities.Equipment.Universal [Inject] private IPlayerInventory _playerInventory; [Inject] private IEntityInventory _inventory; [Inject] private IPlayerEquipSelector _playerEquipSelector; + [Inject] private IEntityEquipmentContainer _equipmentContainer; public bool IClosed { get; set; } public override void OnAwake() { @@ -118,13 +119,17 @@ namespace BITFALL.Entities.Equipment.Universal public override void AnimationEvent(string eventName) { base.AnimationEvent(eventName); - + switch (eventName) { case BITConstant.Player.Use when CurrentState is Use: - if (_inventory.UseItem(Item)) + if (item.TryGetProperty(out var asSlot)) { - + _equipmentContainer.TryUseEquip(asSlot.slot); + } + else + { + _inventory.UseItem(Item); } break; } diff --git a/Assets/Artists/Scripts/Feel/PlayerHandAnimations.cs b/Assets/Artists/Scripts/Feel/PlayerHandAnimations.cs index a940f135e..4dbee451d 100644 --- a/Assets/Artists/Scripts/Feel/PlayerHandAnimations.cs +++ b/Assets/Artists/Scripts/Feel/PlayerHandAnimations.cs @@ -12,7 +12,6 @@ namespace BITFALL.Feel public sealed class PlayerHandAnimations : EntityComponent { [SerializeField] private UnityAnimator animator; - [SerializeField] private LocationAdditive locationAdditive; [Inject] private IPlayerMovement _playerMovement; @@ -25,7 +24,6 @@ namespace BITFALL.Feel _knockdown.OnKnockdown += OnKnockdown; } - private void OnKnockdown() { animator.Play("OnKnockdown"); diff --git a/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs b/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs index 2190fdb01..7a7031518 100644 --- a/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs +++ b/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs @@ -17,7 +17,8 @@ namespace BITKit.Entities.Player.Feel private void OnDamaged(DamageMessage obj) { - var damage = damageBasedMotion.Evaluate(obj.damage); + if (obj.Target != entity) return; + var damage = damageBasedMotion.Evaluate(obj.Damage); spring.value = new Vector3(damage.Random(), damage.Random(), damage.Random()); } diff --git a/Assets/Artists/Scripts/Item/AssetableGun.cs b/Assets/Artists/Scripts/Item/AssetableGun.cs index 6ecb0a8f1..f85b164c0 100644 --- a/Assets/Artists/Scripts/Item/AssetableGun.cs +++ b/Assets/Artists/Scripts/Item/AssetableGun.cs @@ -77,7 +77,12 @@ namespace BITFALL.Guns { [Header(nameof(AssetableGun))] [SerializeReference, SubclassSelector] protected IFireMode fireMode; - public IFireMode FireMode => fireMode; + [SerializeField] private int initialDamage; + + [SerializeField] private int initialBulletForce; + public IFireMode FireMode => fireMode; + public int InitialBulletForce => initialBulletForce; + public int InitialDamage => initialDamage; } } \ No newline at end of file diff --git a/Assets/Artists/Scripts/Item/AssetableItem.cs b/Assets/Artists/Scripts/Item/AssetableItem.cs index 39acffd29..22ed3d4dd 100644 --- a/Assets/Artists/Scripts/Item/AssetableItem.cs +++ b/Assets/Artists/Scripts/Item/AssetableItem.cs @@ -35,7 +35,7 @@ namespace BITFALL [SerializeField] private string displayName; [SerializeField] private string description; [SerializeField] private string addressablePath; - [SerializeField] private WorldableItem prefab; + [SerializeField] private WorldItem prefab; [SerializeField] private Texture2D squareIcon; [SerializeField] private Texture2D rectangleIcon; [SerializeField] private ItemQuality quality; @@ -78,7 +78,7 @@ namespace BITFALL } #endregion #region 本地方法 - public WorldableItem GetPrefab() => prefab; + public WorldItem GetPrefab() => prefab; public Texture2D SquareIcon => squareIcon; public Texture2D RectangleIcon=>rectangleIcon; #endregion diff --git a/Assets/Artists/Scripts/Item/AssetableMelee.cs b/Assets/Artists/Scripts/Item/AssetableMelee.cs index e7c2af3e1..385b0a647 100644 --- a/Assets/Artists/Scripts/Item/AssetableMelee.cs +++ b/Assets/Artists/Scripts/Item/AssetableMelee.cs @@ -6,6 +6,11 @@ namespace BITFALL.Items.Melee { public class AssetableMelee : AssetableEquip { - + [Header(nameof(AssetableMelee))] + [SerializeField] private int blockStaminaCost; + [SerializeField] private int heavyAttackStaminaCost; + + public int BlockStaminaCost => blockStaminaCost; + public int HeavyAttackStaminaCost => heavyAttackStaminaCost; } } diff --git a/Assets/Artists/Scripts/Item/AssetableThrow.cs b/Assets/Artists/Scripts/Item/AssetableThrow.cs new file mode 100644 index 000000000..4f7267233 --- /dev/null +++ b/Assets/Artists/Scripts/Item/AssetableThrow.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace BITFALL.Items +{ + public class AssetableThrow :AssetableItem + { + [SerializeField] private Transform instance; + + public Transform GetInstance() + { + return Instantiate(instance); + } + } +} + diff --git a/Assets/Artists/Scripts/Item/IPlayerSwapItem.cs b/Assets/Artists/Scripts/Item/IPlayerSwapItem.cs new file mode 100644 index 000000000..5f7abe1b5 --- /dev/null +++ b/Assets/Artists/Scripts/Item/IPlayerSwapItem.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using BITKit; +using UnityEngine; +using UnityEngine.Experimental.Audio; + +namespace BITFALL.Items +{ + public interface IEntitySwapItem + { + bool TryGetCurrentContainer(out IBasicItemContainer container); + event Func OpenSwapFactory; + event Action OnSwapOpened; + event Action OnSwapClosed; + public bool Add(IBasicItem item); + public bool Remove(IBasicItem item); + bool Open(IBasicItemContainer container); + bool Close(); + } +} diff --git a/Assets/Artists/Scripts/Item/WorldableItem.cs b/Assets/Artists/Scripts/Item/WorldItem.cs similarity index 94% rename from Assets/Artists/Scripts/Item/WorldableItem.cs rename to Assets/Artists/Scripts/Item/WorldItem.cs index b3f01c07f..db4c1e36b 100644 --- a/Assets/Artists/Scripts/Item/WorldableItem.cs +++ b/Assets/Artists/Scripts/Item/WorldItem.cs @@ -10,7 +10,7 @@ using UnityEngine.AddressableAssets; namespace BITFALL { - public class WorldableItem : MonoBehaviour,IBasicItem,IDescription + public class WorldItem : MonoBehaviour,IBasicItem,IDescription { #region 本地字段 [Header(Constant.Header.Settings)] @@ -88,8 +88,8 @@ namespace BITFALL #endregion } #if UNITY_EDITOR - [UnityEditor.CustomEditor(typeof(WorldableItem))] - public class WorldableInspector:BITInspector + [UnityEditor.CustomEditor(typeof(WorldItem))] + public class WorldItemInspector:BITInspector { public override VisualElement CreateInspectorGUI() { diff --git a/Assets/Artists/Scripts/Item/WorldItemContainer.cs b/Assets/Artists/Scripts/Item/WorldItemContainer.cs new file mode 100644 index 000000000..93c94b38b --- /dev/null +++ b/Assets/Artists/Scripts/Item/WorldItemContainer.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using BITKit; +using UnityEngine; + +namespace BITFALL.Items +{ + public class WorldItemContainer : MonoBehaviour,IBasicItemContainer,IDescription + { + [SerializeField] private string containerName; + public string Name => containerName; + private readonly Dictionary _items = new(); + public int Id => GetInstanceID(); + public bool TryGetItem(Func func, out IBasicItem item) + { + if (_items.Values.TryGetAny(func.Invoke,out item)) + { + return true; + } + item=null; + return false; + } + + public IBasicItem[] GetItems()=>_items.Values.ToArray(); + + public bool Add(IBasicItem item) + { + if (AddFactory.CastAsFunc().Any(x=>x.Invoke(item) is false)) return false; + if (_items.ContainsKey(item.Id)) return false; + _items.Add(item.Id,item); + OnAdd?.Invoke(item); + OnSet?.Invoke(item); + return true; + } + + public bool Remove(IBasicItem item) + { + return Remove(item.Id); + } + public bool Remove(int id) + { + if (RemoveFactory.CastAsFunc().Any(x=>x.Invoke(_items[id]) is false)) return false; + if (!_items.Remove(id)) return false; + OnRemove?.Invoke(_items[id]); + return true; + } + + public bool Remove(Func removeFactory) + { + return _items.Values.TryGetAny(removeFactory.Invoke,out var item) && Remove(item); + } + + public bool Drop(int Id) + { + throw new NotImplementedException(); + } + public bool DropOrSpawn(IBasicItem item) + { + throw new NotImplementedException(); + } + public event Func AddFactory; + public event Func RemoveFactory; + public event Func DropFactory; + public event Action OnAdd; + public event Action OnRemove; + public event Action OnSet; + public event Action OnDrop; + public event Action OnRebuild; + + } +} diff --git a/Assets/Artists/Scripts/MeleeService/BITFALL.Melee.Runtime.asmdef b/Assets/Artists/Scripts/MeleeService/BITFALL.Melee.Runtime.asmdef index 88b6d9a74..8c5ef773f 100644 --- a/Assets/Artists/Scripts/MeleeService/BITFALL.Melee.Runtime.asmdef +++ b/Assets/Artists/Scripts/MeleeService/BITFALL.Melee.Runtime.asmdef @@ -9,7 +9,9 @@ "GUID:d8b63aba1907145bea998dd612889d6b", "GUID:bea3628e8b592ae47ade218cb9ec98db", "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:ea5474181b324dd49a5976cd68f44f18" + "GUID:ea5474181b324dd49a5976cd68f44f18", + "GUID:d525ad6bd40672747bde77962f1c401e", + "GUID:49b49c76ee64f6b41bf28ef951cb0e50" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/MeleeService/MeleeService.cs b/Assets/Artists/Scripts/MeleeService/MeleeService.cs index 41019ed0f..e5a042dc1 100644 --- a/Assets/Artists/Scripts/MeleeService/MeleeService.cs +++ b/Assets/Artists/Scripts/MeleeService/MeleeService.cs @@ -30,6 +30,7 @@ namespace BITFALL.Melee private static readonly Queue Queue = new(); public static void Melee(MeleeCommand command)=>Queue.Enqueue(command); [SerializeField] private LayerMask detectLayer; + [SerializeReference, SubclassSelector] private IDamageService damageService; private void Awake() { Singleton = this; @@ -52,17 +53,24 @@ namespace BITFALL.Melee } damaged.Add(damageable.Entity); - damageable.GiveDamage(new DamageMessage() + var damageMsg = + new DamageMessage() { - initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity, - damageType = new MeleeDamageMessage + Initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity, + DamageType = new MeleeDamageMessage { }, - target = damageable.Entity, - damage = command.Damage is 0 ? 64 : command.Damage, - hit = damageable, - }); + Target = damageable.Entity, + Damage = command.Damage is 0 ? 64 : command.Damage, + Hit = damageable, + }; + if (command.PlayerId !=default) + { + damageMsg.Initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity; + } + damageService.Execute(damageMsg); + damageable.Rigidbody.AddForceAtPositionAsync(command.Force, command.Position, ForceMode.Impulse) .Forget(); diff --git a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs index 1983cac17..1924c3a11 100644 --- a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs +++ b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs @@ -35,6 +35,19 @@ namespace BITFALL.Entities.Player.Movement [SerializeField] private Transform fpvPoint; + public Vector3 Position + { + get => actor.Position; + set=>actor.Position = value; + } + + public Quaternion Rotation + { + get => actor.Rotation; + set => actor.Rotation = value; + } + + public Vector3 Forward => actor.Forward; public Vector3 ViewCenter { get; set; } public Quaternion ViewRotation { get; set; } public Vector3 LocomotionBasedVelocity { get;private set; } @@ -230,6 +243,11 @@ namespace BITFALL.Entities.Player.Movement return; } + if (MovementInput.x is not 0 && MovementInput.z is 0) + { + TransitionState(); + return; + } if (climbClosePoint.TryGetClosePoint(out var closePoint)) { ExpectClimb.shouldBe = closePoint; @@ -345,15 +363,15 @@ namespace BITFALL.Entities.Player.Movement case < -16: entity.Invoke(new DamageMessage() { - damage = value < -30 ? int.MaxValue : (int)math.abs(value) * 2 , - damageType = new GravityDamage(), - location = new Location() + Damage = value < -30 ? int.MaxValue : (int)math.abs(value) * 2 , + DamageType = new GravityDamage(), + Location = new Location() { position = actor.Position, rotation = actor.Rotation }, - initiator = entity, - target = entity, + Initiator = entity, + Target = entity, }); break; } @@ -393,7 +411,8 @@ namespace BITFALL.Entities.Player.Movement ViewRotation = rotation; - ViewCenter = additiveTransform.position + additiveTransform.forward; + //ViewCenter = additiveTransform.position + additiveTransform.forward; + ViewCenter = additiveTransform.position + Quaternion.Euler(LookInput) * Vector3.forward; } private float _stamina = 100; public float Stamina diff --git a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerChatacterMotionBasedStates.cs b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerChatacterMotionBasedStates.cs index 4b46fc676..51126536e 100644 --- a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerChatacterMotionBasedStates.cs +++ b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerChatacterMotionBasedStates.cs @@ -212,6 +212,55 @@ namespace BITFALL.Entities.Player.Movement.States characterController.CurrentCameraPosition.shouldBe = characterController.FpvLocalPosition; } } + + [Serializable] + public sealed class Dodge : PlayerCharacterState,IPlayerDodgeState + { + [SerializeField] private int costStamina = 10; + [SerializeField] private AnimationCurve curve; + [SerializeField] private float duration = 0.32f; + private int direction; + private float process; + + [Inject] private IHealth _health; + public override void Initialize() + { + base.Initialize(); + _health.OnDamageFactory += OnDamageFactory; + } + + public override void OnStateEntry(IState old) + { + base.OnStateEntry(old); + direction = characterController.MovementInput.x > 0 ? 1 : -1; + process = 0; + characterController.Stamina-= costStamina; + + + } + + public override void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime) + { + currentVelocity = actor.transform.right * (direction * curve.Evaluate(process+=deltaTime / duration)); + } + + public override void AfterUpdateMovement(float deltaTime) + { + if(process>=1) + Exit(); + } + + private int OnDamageFactory(DamageMessage msg, int currentDamage) + { + if (characterController.CurrentState is not IPlayerDodgeState || msg.Initiator is not Entity initiator) + return currentDamage; + var _direction = characterController.Position - initiator.transform.position; + var verticalAngle = Vector3.Angle(initiator.transform.forward, _direction) - 90.0f; + Debug.Log(verticalAngle); + return 0; + + } + } [Serializable] public sealed class Fixed:PlayerCharacterState,IPlayerFixedState { diff --git a/Assets/Artists/Scripts/Player/PlayerAnimationController/PlayerAnimateStates.cs b/Assets/Artists/Scripts/Player/PlayerAnimationController/PlayerAnimateStates.cs index b01614913..000633afa 100644 --- a/Assets/Artists/Scripts/Player/PlayerAnimationController/PlayerAnimateStates.cs +++ b/Assets/Artists/Scripts/Player/PlayerAnimationController/PlayerAnimateStates.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using BITFALL.Player.Movement; using BITKit.Entities; using BITKit.StateMachine; -using Unity.SharpZipLib.Zip; using UnityEngine; // ReSharper disable UnassignedField.Global @@ -51,6 +50,9 @@ namespace BITFALL.Player.Animation.States case IPlayerSprintState: animationController.TransitionState(); break; + default: + animationController.TransitionState(); + break; } } } diff --git a/Assets/Artists/Scripts/Player/Survival/BITFALL.Player.Survival.Runtime.asmdef b/Assets/Artists/Scripts/Player/Survival/BITFALL.Player.Survival.Runtime.asmdef index 285c9bf22..15ccae942 100644 --- a/Assets/Artists/Scripts/Player/Survival/BITFALL.Player.Survival.Runtime.asmdef +++ b/Assets/Artists/Scripts/Player/Survival/BITFALL.Player.Survival.Runtime.asmdef @@ -11,7 +11,8 @@ "GUID:ef0bb553b58b90b488bdbe8672e3be0b", "GUID:677cd05ca06c46b4395470200b1acdad", "GUID:30cdc242b1ac6a944a460f4ab0b77b88", - "GUID:7efac18f239530141802fb139776f333" + "GUID:7efac18f239530141802fb139776f333", + "GUID:48ef04d98836e2640bf90b524bdff904" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/Player/Survival/PlayerEatService.cs b/Assets/Artists/Scripts/Player/Survival/PlayerEatService.cs index 22668fe2b..1906148a6 100644 --- a/Assets/Artists/Scripts/Player/Survival/PlayerEatService.cs +++ b/Assets/Artists/Scripts/Player/Survival/PlayerEatService.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using BITFALL.Entities.Inventory; using BITFALL.Player.Inventory; using BITKit; using BITKit.Entities; @@ -10,34 +11,27 @@ namespace BITFALL.Player.Survival { public class PlayerEatService : EntityComponent { - private IPlayerSurvivalService _survival; - private IPlayerInventory _inventory; + [Inject] private IPlayerSurvivalService _survival; + [Inject] private IEntityInventory _inventory; + public override void OnStart() { - base.OnStart(); - _inventory = entity.Get(); - _inventory.OnUseItem += OnUseItem; - _survival = entity.Get(); + _inventory.OnUsedItem += OnUseItem; } - private bool OnUseItem(IBasicItem arg) + private void OnUseItem(IBasicItem arg) { - var used = false; + if (arg.GetAssetable().TryGetProperty(out var addHunger) && + _survival.Elements.TryGetAny(x => x is PlayerSurvivalHunger, out var element)) { - if (arg.GetAssetable().TryGetProperty(out var addHunger) && - _survival.Elements.TryGetAny(x => x is PlayerSurvivalHunger, out var element)) - { - element.Value += addHunger.Value; - used = true; - } - if (arg.GetAssetable().TryGetProperty(out var addThirst) && - _survival.Elements.TryGetAny(x => x is PlayerSurvivalThirst, out element)) - { - element.Value += addThirst.Value; - used = true; - } + element.Value += addHunger.Value; + } + + if (arg.GetAssetable().TryGetProperty(out var addThirst) && + _survival.Elements.TryGetAny(x => x is PlayerSurvivalThirst, out element)) + { + element.Value += addThirst.Value; } - return used; } } diff --git a/Assets/Artists/Scripts/Player/Survival/PlayerSurvivalService.cs b/Assets/Artists/Scripts/Player/Survival/PlayerSurvivalService.cs index df5946ef1..5c11d80b9 100644 --- a/Assets/Artists/Scripts/Player/Survival/PlayerSurvivalService.cs +++ b/Assets/Artists/Scripts/Player/Survival/PlayerSurvivalService.cs @@ -26,11 +26,24 @@ namespace BITFALL.Player.Survival public override void OnAwake() { Elements = initialElements; + _health.OnSetAlive += OnSetAlive; + } + + private void OnSetAlive(bool obj) + { + if (obj) + { + foreach (var VARIABLE in Elements) + { + VARIABLE.Value = 100; + } + } } public override void OnUpdate(float deltaTime) { if (_interval.AllowUpdate is false) return; + if (_health.IsAlive is false) return; foreach (var x in Elements) { x.Value -= 1; @@ -38,12 +51,12 @@ namespace BITFALL.Player.Survival { _damageService.Execute(new DamageMessage() { - damageType = new SurvivalDamage() + DamageType = new SurvivalDamage() { element = x, }, - target = entity, - damage = 1, + Target = entity, + Damage = 1, }); } } diff --git a/Assets/Artists/Scripts/Props/BITFALL.Props.Runtime.asmdef b/Assets/Artists/Scripts/Props/BITFALL.Props.Runtime.asmdef new file mode 100644 index 000000000..1daf81cf2 --- /dev/null +++ b/Assets/Artists/Scripts/Props/BITFALL.Props.Runtime.asmdef @@ -0,0 +1,24 @@ +{ + "name": "BITFALL.Props.Runtime", + "rootNamespace": "", + "references": [ + "GUID:14fe60d984bf9f84eac55c6ea033a8f4", + "GUID:709caf8d7fb6ef24bbba0ab9962a3ad0", + "GUID:d525ad6bd40672747bde77962f1c401e", + "GUID:49b49c76ee64f6b41bf28ef951cb0e50", + "GUID:508392158bd966c4d9c21e19661a441d", + "GUID:7efac18f239530141802fb139776f333", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:ea5474181b324dd49a5976cd68f44f18", + "GUID:bea3628e8b592ae47ade218cb9ec98db" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Artists/Scripts/Props/Prop_BouncingBetty.cs b/Assets/Artists/Scripts/Props/Prop_BouncingBetty.cs new file mode 100644 index 000000000..21ed98bd3 --- /dev/null +++ b/Assets/Artists/Scripts/Props/Prop_BouncingBetty.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using BITKit; +using BITKit.Entities; +using BITKit.Sensors; +using UnityEngine; + +namespace BITFALL.Props +{ + public class Prop_BouncingBetty : MonoBehaviour + { + [SerializeReference,SubclassSelector] private ISensor rangeSensor; + [SerializeReference, SubclassSelector] private IReference[] vfxTags; + [SerializeField] private AnimationCurve damageCurve; + [SerializeField] private LayerMask physicsLayer; + [SerializeField] private float explosionRadius; + [SerializeField] private float jumpForce; + [SerializeField] private new Rigidbody rigidbody; + private bool isTriggered; + public async void OnDetected(Collider _collider) + { + if (isTriggered) return; + isTriggered = true; + var damaged = new List() ; + rigidbody.AddForce(Vector3.up * jumpForce, ForceMode.Impulse); + try + { + await Task.Delay(1000,destroyCancellationToken); + } + catch (OperationCanceledException) + { + return; + } + DI.Get().Spawn(new Location(transform), vfxTags.Select(x=>x.Value).ToArray()); + foreach (var x in rangeSensor.Get()) + { + if (!x.TryGetComponent(out var entity)) continue; + if(damaged.Contains(entity.Id))continue; + entity.Invoke(new DamageMessage() + { + Target = entity, + Damage = (int)damageCurve.Evaluate(Vector3.Distance(transform.position, entity.transform.position)) + }); + damaged.Add(entity.Id); + } + PhysicsHelper.Explosion(transform.position,explosionRadius,physicsLayer,1024*8); + damaged.Clear(); + Destroy(gameObject); + } + } + +} diff --git a/Assets/Artists/Scripts/Props/Prop_Grenade.cs b/Assets/Artists/Scripts/Props/Prop_Grenade.cs new file mode 100644 index 000000000..bdcb36be0 --- /dev/null +++ b/Assets/Artists/Scripts/Props/Prop_Grenade.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using BITKit; +using BITKit.Entities; +using BITKit.Sensors; +using UnityEngine; + +public class Prop_Grenade : MonoBehaviour +{ + [SerializeReference, SubclassSelector] private ISensor rangeSensor; + [SerializeReference, SubclassSelector] private IReference[] vfxTags; + [SerializeField] private LayerMask physicsLayer; + [SerializeField] private float explosionRadius; + [SerializeField] private float fuse; + [SerializeField] private AnimationCurve damageCurve; + + private async void Start() + { + try + { + await Task.Delay(TimeSpan.FromSeconds(fuse), destroyCancellationToken); + } + catch (OperationCanceledException) + { + return; + } + DI.Get().Spawn(new Location(transform), vfxTags.Select(x => x.Value).ToArray()); + foreach (var x in rangeSensor.Get()) + { + if (x.TryGetComponent(out var entity) is false)continue; + entity.Invoke(new DamageMessage() + { + Target = entity, + Damage = (int)damageCurve.Evaluate(Vector3.Distance(transform.position, entity.transform.position)) + }); + } + PhysicsHelper.Explosion(transform.position,explosionRadius,physicsLayer,1024*8); + Destroy(gameObject); + } +} diff --git a/Assets/Artists/Scripts/Scenes/SceneDamageArea.cs b/Assets/Artists/Scripts/Scenes/SceneDamageArea.cs index 0545754f9..0b38517d0 100644 --- a/Assets/Artists/Scripts/Scenes/SceneDamageArea.cs +++ b/Assets/Artists/Scripts/Scenes/SceneDamageArea.cs @@ -19,9 +19,9 @@ namespace BITFALL.Scenes { entity.Invoke(new DamageMessage() { - damage = damage, - damageType = new SceneAreaDamage(), - target = entity + Damage = damage, + DamageType = new SceneAreaDamage(), + Target = entity }); } } diff --git a/Assets/Artists/Scripts/UX/BITFALL.UX.asmdef b/Assets/Artists/Scripts/UX/BITFALL.UX.asmdef index b54ba9b0d..8a9cbc2b5 100644 --- a/Assets/Artists/Scripts/UX/BITFALL.UX.asmdef +++ b/Assets/Artists/Scripts/UX/BITFALL.UX.asmdef @@ -28,7 +28,8 @@ "GUID:ef0bb553b58b90b488bdbe8672e3be0b", "GUID:045a42f233e479d41adc32d02b99631e", "GUID:1235ca61e7f433b408ed5a68767e7123", - "GUID:c0b9c98c59e49554c8f4ca6dc4998d79" + "GUID:c0b9c98c59e49554c8f4ca6dc4998d79", + "GUID:48ef04d98836e2640bf90b524bdff904" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Artists/Scripts/UX/UXHud.cs b/Assets/Artists/Scripts/UX/UXHud.cs index f2d26dc20..91c148470 100644 --- a/Assets/Artists/Scripts/UX/UXHud.cs +++ b/Assets/Artists/Scripts/UX/UXHud.cs @@ -15,6 +15,7 @@ using BITKit.SceneManagement; using BITKit.Selection; using BITKit.Steamwork; using UnityEditor; +using UnityEngine.InputSystem.Interactions; namespace BITFALL.UX { @@ -38,9 +39,8 @@ namespace BITFALL.UX [SerializeField] private UXBar armorBar; [Header(Constant.Header.Input)] - public InputActionReference inventoryAction; - public InputActionReference returnAction; - public InputActionGroup inputActionGroup = new(); + [SerializeField] private InputActionReference inventoryAction; + [SerializeField] private InputActionReference returnAction; [Inject] private IHealth _health; @@ -71,11 +71,6 @@ namespace BITFALL.UX { playerService.OnPlayerInitialized -= OnPlayerInitializedLocalPlayer; } - protected override void OnEntryOrExit(bool isEntry) - { - inputActionGroup.RegisterCallback(inventoryAction, OnInventory); - inputActionGroup.allowInput.SetElements(this, isEntry); - } public void OnActive(ISelectable selectable) { seleableLabel.SetActive(false); @@ -131,7 +126,7 @@ namespace BITFALL.UX { if(playerService.LocalPlayer is null) return; if(_health.IsAlive is false) return; - if(context.JustPressed()) + if(context is {interaction:PressInteraction,performed:true}) UXService.Entry(); } diff --git a/Assets/Artists/Scripts/UX/UXInventory.cs b/Assets/Artists/Scripts/UX/UXInventory.cs index 916371709..16bf872dd 100644 --- a/Assets/Artists/Scripts/UX/UXInventory.cs +++ b/Assets/Artists/Scripts/UX/UXInventory.cs @@ -1,9 +1,11 @@ using System.Collections.Generic; using BITFALL.Entities.Equipment; +using BITFALL.Entities.Inventory; using BITFALL.Player.Inventory; using UnityEngine; using UnityEngine.UIElements; using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Interactions; using BITKit; using BITKit.UX; using BITKit.Entities; @@ -17,7 +19,7 @@ namespace BITFALL.UX [Header(Constant.Header.Input)] public InputActionReference inventoryAction; public InputActionReference returnAction; - public InputActionGroup inputActionGroup = new(); + [Header(Constant.Header.Components)] public UXBar weightBar; @@ -31,11 +33,8 @@ namespace BITFALL.UX [Header(Constant.Header.InternalVariables)] private readonly Dictionary itemContainers = new(); private readonly Dictionary equipContainers = new(); - private readonly IntervalUpdate returnInterval = new(0.1f); [Inject] - private IBasicItemContainer inventory; - [Inject] - private IPlayerInventory _playerInventory; + private IEntityInventory inventory; [Inject] private IEntityEquipmentContainer equipContainer; private IEntity _entity; @@ -65,11 +64,6 @@ namespace BITFALL.UX }); } } - protected override void OnEntryOrExit(bool isEntry) - { - inputActionGroup.allowInput.SetElements(this, isEntry); - returnInterval.Reset(); - } protected override void OnEnable() { base.OnEnable(); @@ -81,7 +75,6 @@ namespace BITFALL.UX { inventory = null; equipContainer = null; - _playerInventory = null; } protected override void OnDisable() @@ -94,7 +87,6 @@ namespace BITFALL.UX { entity.Inject(this); itemContainers.Clear(); - equipContainers.Clear(); builder.Clear(); var weighted = entity.Get(); @@ -107,7 +99,7 @@ namespace BITFALL.UX inventory.OnAdd += OnAdd; inventory.OnRemove += OnRemove; - inventory.OnUsed += OnRemove; + inventory.OnUsedItem += OnRemove; inventory.OnSet += OnSet; _entity = entity; @@ -116,7 +108,7 @@ namespace BITFALL.UX } private void OnInventory(InputAction.CallbackContext context) { - if (context.JustPressed()) + if(context is {interaction:PressInteraction,performed:true}) UXService.Entry(); } private static void OnReturn(InputAction.CallbackContext context) @@ -132,10 +124,11 @@ namespace BITFALL.UX } private void OnAdd(IBasicItem item) { - var asset = Addressables.LoadAssetAsync(item.AddressablePath).WaitForCompletion(); - var uxContainer = builder.BuildAsContainer(); - uxContainer.icon.style.backgroundImage = asset.SquareIcon; - uxContainer.contextLabel.text = asset.Name; + // var asset = Addressables.LoadAssetAsync(item.AddressablePath).WaitForCompletion(); + // var uxContainer = builder.BuildAsContainer(); + // uxContainer.icon.style.backgroundImage = asset.SquareIcon; + // uxContainer.contextLabel.text = asset.Name; + var uxContainer = UXUtils.CreateItemContainer(builder.BuildAsContainer(), item); uxContainer.button.clicked += () => { UseItem(item); @@ -170,14 +163,7 @@ namespace BITFALL.UX private void UseItem(IBasicItem item) { - if (_playerInventory.TryUseItem(item)) - { - - } - else if (_playerInventory.TryUseItemCustom(item)) - { - - } + inventory.TryUseItem(item); } private void DropItem(IBasicItem item) @@ -189,7 +175,7 @@ namespace BITFALL.UX var asset = item.GetAssetable(); if (!equipContainers.TryGetValue(slot.GetType().Name, out var container)) return; container.icon.style.backgroundImage = asset.SquareIcon; - BIT4Log.Log($"已装备:{item.Name}@{slot.GetType().Name}"); + //BIT4Log.Log($"已装备:{item.Name}@{slot.GetType().Name}"); } private void DeEquip(IEquipmentSlot slot, IBasicItem item) { diff --git a/Assets/Artists/Scripts/UX/UXInventorySwap.cs b/Assets/Artists/Scripts/UX/UXInventorySwap.cs new file mode 100644 index 000000000..e42af3d57 --- /dev/null +++ b/Assets/Artists/Scripts/UX/UXInventorySwap.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Xml.Linq; +using BITFALL.Entities.Inventory; +using BITFALL.UX; +using BITKit; +using BITKit.Entities; +using BITKit.Entities.Player; +using BITKit.UX; +using Cysharp.Threading.Tasks; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.Interactions; +using UnityEngine.UIElements; + +namespace BITFALL.Items +{ + public sealed class UXInventorySwap : UIToolKitPanel + { + [Header(Constant.Header.Input)] + [SerializeField] private InputActionReference escapeAction; + [SerializeField] private InputActionReference inventoryAction; + + [Header(Constant.Header.Services)] + [SerializeReference,SubclassSelector] private IPlayerService playerService; + + [Header(Constant.Header.Prefabs)] + [SerializeField] private VisualTreeAsset itemPrefab; + + [Inject] + private IEntitySwapItem swapItem; + [Inject] + private IEntityInventory inventory; + + private VisualElement selfContainer; + private VisualElement otherContainer; + protected override void Start() + { + base.Start(); + inputActionGroup.RegisterCallback(escapeAction, OnEscape); + inputActionGroup.RegisterCallback(inventoryAction, OnInventory); + + selfContainer = document.rootVisualElement.Q("self-container"); + otherContainer = document.rootVisualElement.Q("other-container"); + } + + protected override void OnEnable() + { + base.OnEnable(); + playerService.OnPlayerInitialized += OnPlayerInitialized; + } + + protected override void OnDisable() + { + base.OnDisable(); + playerService.OnPlayerInitialized -= OnPlayerInitialized; + } + + private void OnPlayerInitialized(Entity obj) + { + obj.Inject(this); + swapItem.OnSwapOpened += OnSwapOpened; + + swapItem.OnSwapClosed += OnSwapClosed; + + inventory.OnAdd+=_=>ReBuild(); + inventory.OnRemove+=_=>ReBuild(); + inventory.OnRebuild+=_=>ReBuild(); + } + + private void OnSwapClosed(IBasicItemContainer obj) + { + UXService.Entry(); + } + + private void OnSwapOpened(IBasicItemContainer obj) + { + UXService.Entry(); + + ReBuild(obj); + } + + private void OnInventory(InputAction.CallbackContext obj) + { + if(obj is not {interaction:PressInteraction,performed:true}) return; + UXService.Entry(); + swapItem.Close(); + } + + private void OnEscape(InputAction.CallbackContext obj) + { + if (obj.performed) + UXService.Entry(); + swapItem.Close(); + } + + private async void ReBuild() + { + await UniTask.NextFrame(); + if(swapItem.TryGetCurrentContainer(out var container)) + ReBuild(container); + } + private void ReBuild(IBasicItemContainer other) + { + otherContainer.Clear(); + selfContainer.Clear(); + foreach (var item in other.GetItems()) + { + var container = otherContainer.Create(itemPrefab); + UXUtils.CreateItemContainer(container, item); + container.Q