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

change: scene and prefab changes related to recent changes

Browse Source
This commit is contained in:
Chris
2025-10-08 22:57:59 -04:00
parent 17cba13db5
commit 507a735253
3 changed files with 133 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Player/Graphs/PlayerBaseFSM.asset
View File

File diff suppressed because one or more lines are too long

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

@@ -136,6 +136,7 @@ GameObject:
- component: {fileID: 8583102325603564116}
- component: {fileID: 5070944620793365545}
- component: {fileID: 4227131494895359615}
- component: {fileID: 4020293503545581060}
m_Layer: 7
m_Name: Player
m_TagString: Untagged
@@ -655,6 +656,7 @@ MonoBehaviour:
Weight: 1
Radius: 0.5
targetGroup: {fileID: 0}
acceptedTargets: []
lockOnDocument: {fileID: 0}
--- !u!114 &6067609290387865387
MonoBehaviour:
@@ -833,6 +835,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7719da98d07bb4848a78904f6da4c355, type: 3}
m_Name:
m_EditorClassIdentifier: Core::UnitCombat
ShowTopMostFoldoutHeaderGroup: 1
draggedUnits: []
--- !u!114 &4227131494895359615
MonoBehaviour:
@@ -847,6 +850,98 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Core::PlayerMeter
inGoHard: 0
--- !u!114 &4020293503545581060
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2757828562731694833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.Components.NetworkAnimator
ShowTopMostFoldoutHeaderGroup: 1
TransitionStateInfoList:
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -50309357
DestinationState: 254756060
TransitionDuration: 0.09777129
TriggerNameHash: 237393061
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -50309357
DestinationState: -1775889050
TransitionDuration: 0.10679543
TriggerNameHash: 237393061
TransitionIndex: 1
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -50309357
DestinationState: 1345941684
TransitionDuration: 0.059500255
TriggerNameHash: -309998415
TransitionIndex: 2
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -50309357
DestinationState: 1380104391
TransitionDuration: 0.09959364
TriggerNameHash: -1569153036
TransitionIndex: 3
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 254756060
DestinationState: -1775889050
TransitionDuration: 0.07508963
TriggerNameHash: 237393061
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -1775889050
DestinationState: 254756060
TransitionDuration: 0.07838708
TriggerNameHash: 237393061
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 1345941684
DestinationState: 625313873
TransitionDuration: 0.048083633
TriggerNameHash: -309998415
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 573066312
DestinationState: -869913244
TransitionDuration: 0.05516836
TriggerNameHash: -309998415
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 1429175518
DestinationState: 573066312
TransitionDuration: 0.030371755
TriggerNameHash: -309998415
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: -869913244
DestinationState: -1155457550
TransitionDuration: 0.053584673
TriggerNameHash: -309998415
TransitionIndex: 0
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 625313873
DestinationState: 1429175518
TransitionDuration: 0.08350754
TriggerNameHash: -309998415
TransitionIndex: 0
m_Animator: {fileID: 6535719103590072454}
--- !u!1 &9138484595871696647
GameObject:
m_ObjectHideFlags: 0

37
Assets/Scenes/CombatTest.unity
View File

@@ -1670,7 +1670,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2757828562731694833, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3615223736993955799, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -3380,7 +3380,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1412997143}
m_TargetAssemblyTypeName: SessionManager, Core
m_MethodName: StartOfflineSession
m_MethodName: StartSession
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -3534,7 +3534,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2757828562731694833, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4712401716102697018, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Enabled
@@ -5088,6 +5088,28 @@ MonoBehaviour:
_serializedBlackboard: '{"_variables":{}}'
_objectReferences: []
_serializedVariables: []
--- !u!114 &1183988436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1183988415}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.Components.NetworkAnimator
ShowTopMostFoldoutHeaderGroup: 1
TransitionStateInfoList:
- IsCrossFadeExit: 0
Layer: 0
OriginatingState: 1815278964
DestinationState: 2133702664
TransitionDuration: 0.02
TriggerNameHash: 1654612129
TransitionIndex: 0
m_Animator: {fileID: 4518178797721885225}
--- !u!43 &1232968165
Mesh:
m_ObjectHideFlags: 0
@@ -6222,7 +6244,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2757828562731694833, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2859366553890850292, guid: 091cfac8be4c5a144a0b8997a9f1ff28, type: 3}
propertyPath: m_Layer
@@ -8428,6 +8450,10 @@ PrefabInstance:
propertyPath: m_Name
value: TestMonster
objectReference: {fileID: 0}
- target: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -8447,6 +8473,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
insertIndex: -1
addedObject: {fileID: 1183988431}
- targetCorrespondingSourceObject: {fileID: 9098724353270996650, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
insertIndex: -1
addedObject: {fileID: 1183988436}
- targetCorrespondingSourceObject: {fileID: 8573086128984434046, guid: 7dca717b905799e4cb7f64180d31be25, type: 3}
insertIndex: -1
addedObject: {fileID: 4518178797721885225}