thunderstargames/project-reset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: make weapons switchable

Browse Source
This commit is contained in:
Chris
2026-01-16 17:40:32 -05:00
parent 6c3317014a
commit ca54b5b960
7 changed files with 110 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Player/Attacks/TestMelee/TestMeleeAttack.asset
View File

File diff suppressed because one or more lines are too long

58
Assets/Player/Models/BlankTestPlayer/PlayerTestAnimator.controller
View File

@@ -100,7 +100,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5807180696605908168}
m_Position: {x: 280, y: 240, z: 0}
m_Position: {x: 110, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -5118064861454726822}
m_Position: {x: 380, y: 110, z: 0}
@@ -126,10 +126,35 @@ AnimatorStateMachine:
second: []
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 790, y: 240, z: 0}
m_EntryPosition: {x: 30, y: 250, z: 0}
m_EntryPosition: {x: -140, y: 250, z: 0}
m_ExitPosition: {x: 1000, y: 380, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -5807180696605908168}
--- !u!1101 &-7643812424950176358
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: Ranged Combat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6805044894854728404}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.7457627
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-7517949062573905506
AnimatorState:
serializedVersion: 6
@@ -301,6 +326,7 @@ AnimatorState:
m_Transitions:
- {fileID: -3039493824836840586}
- {fileID: -2657416407466679892}
- {fileID: -7643812424950176358}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -368,6 +394,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4083647245948460410
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: Melee Combat
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5118064861454726822}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.7457627
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3672400458932457120
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -544,7 +595,7 @@ AnimatorStateTransition:
m_DstStateMachine: {fileID: -1683434005185618408}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
@@ -1018,6 +1069,7 @@ AnimatorState:
m_Transitions:
- {fileID: -4127415286275366694}
- {fileID: 2734374599067492937}
- {fileID: -4083647245948460410}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0

12
Assets/Player/Objects/Player.prefab
View File

@@ -399,6 +399,7 @@ MonoBehaviour:
- label: left-wallstick
castType: 4
active: 0
castOrigin: 0
length: 1.23
direction: {x: -1.18, y: 0, z: 0.95}
offset: {x: 0.57, y: 1.28, z: -0.38}
@@ -426,6 +427,7 @@ MonoBehaviour:
- label: right-wallstick
castType: 4
active: 0
castOrigin: 0
length: 1.23
direction: {x: 1.18, y: 0, z: 0.95}
offset: {x: -0.57, y: 1.28, z: -0.38}
@@ -453,6 +455,7 @@ MonoBehaviour:
- label: left-walljump
castType: 4
active: 0
castOrigin: 0
length: 1.66
direction: {x: -1, y: 0, z: 0}
offset: {x: 0, y: 0.5, z: 0}
@@ -480,6 +483,7 @@ MonoBehaviour:
- label: right-walljump
castType: 4
active: 0
castOrigin: 0
length: 1.66
direction: {x: 1, y: 0, z: 0}
offset: {x: 0, y: 0.5, z: 0}
@@ -507,6 +511,7 @@ MonoBehaviour:
- label: grapple
castType: 4
active: 0
castOrigin: 0
length: 10
direction: {x: 0, y: 0, z: 0}
offset: {x: 0, y: 0, z: 0}
@@ -534,6 +539,7 @@ MonoBehaviour:
- label: wallclimb
castType: 3
active: 0
castOrigin: 0
length: 1
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 1, z: 0}
@@ -561,6 +567,7 @@ MonoBehaviour:
- label: itemdrop
castType: 3
active: 1
castOrigin: 0
length: 2.25
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 0.8, z: 0}
@@ -588,6 +595,7 @@ MonoBehaviour:
- label: player
castType: 4
active: 1
castOrigin: 0
length: 2
direction: {x: 0, y: 0, z: 1}
offset: {x: 0, y: 0.75, z: -0.5}
@@ -868,8 +876,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Core::Reset.Units.Inventory
ShowTopMostFoldoutHeaderGroup: 1
rangedWeapon: {fileID: 0}
meleeWeapon: {fileID: 11400000, guid: f04acfb543d2d634781b55c9081fcffa, type: 2}
rangedWeapon: {fileID: 11400000, guid: f04acfb543d2d634781b55c9081fcffa, type: 2}
meleeWeapon: {fileID: 11400000, guid: 18020bf6266740d4dab9dbcae8073424, type: 2}
spellAbility1: {fileID: 0}
spellAbility2: {fileID: 0}
toolAbility1: {fileID: 0}