This commit is contained in:
CortexCore
parent
add6d0cab3
commit
18f664a545
|
|
@ -143,6 +143,11 @@ MonoBehaviour:
|
|||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 1f69b8202d0d9fc4aa50a06f24e46266
|
||||
m_Address: Assets/RiotShield
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
m_ReadOnly: 0
|
||||
m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2}
|
||||
m_SchemaSet:
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 767 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.7 MiB |
|
|
@ -1122,6 +1122,33 @@ AnimatorState:
|
|||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1102 &3201584521287022950
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Melee
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions:
|
||||
- {fileID: 6159926314366528786}
|
||||
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:
|
||||
--- !u!1102 &3742132620338186396
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -1346,6 +1373,28 @@ MonoBehaviour:
|
|||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Walk.Move
|
||||
--- !u!1101 &6159926314366528786
|
||||
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: -1045047923388160873}
|
||||
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 &6246449838327955986
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
|
|
@ -1461,6 +1510,12 @@ AnimatorStateMachine:
|
|||
- serializedVersion: 1
|
||||
m_State: {fileID: 2857387101801118781}
|
||||
m_Position: {x: 310, y: 180, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 3201584521287022950}
|
||||
m_Position: {x: 310, y: 120, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 8343565400552565661}
|
||||
m_Position: {x: 310, y: 60, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
|
|
@ -1471,6 +1526,55 @@ AnimatorStateMachine:
|
|||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: -1045047923388160873}
|
||||
--- !u!1101 &8079901123119198209
|
||||
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: -1045047923388160873}
|
||||
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 &8343565400552565661
|
||||
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: 8079901123119198209}
|
||||
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: e9a482e76374d514b85c18777e90a9c7, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1101 &8378041146737502484
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
%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: EntityKnife
|
||||
m_Controller: {fileID: 9100000, guid: cb43cb1bf42184e45b920b0bb77554f9, type: 2}
|
||||
m_Clips:
|
||||
- m_OriginalClip: {fileID: 7400000, guid: ad24d1ce30ed48945a9b68be9827bc90, type: 2}
|
||||
m_OverrideClip: {fileID: 8816525237524189043, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 01214145ea75a2d4b80363bba2f1a65e, type: 2}
|
||||
m_OverrideClip: {fileID: -5858036045953447646, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 451f983af0dd44c419406ca1d1a0b591, type: 2}
|
||||
m_OverrideClip: {fileID: 7433315730774535304, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 9bc28f4633c671a428bc05bc4b6e6a8c, type: 2}
|
||||
m_OverrideClip: {fileID: 197974373799447605, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2}
|
||||
m_OverrideClip: {fileID: 6183211152343637703, guid: da3cec3baa28ec04cac279268c6ef539,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f88d8dea74ca02e43b56b5a42fd0da74, type: 2}
|
||||
m_OverrideClip: {fileID: -1310521523949388987, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 020d1c1ecabec614d8b651753ffc9170, type: 2}
|
||||
m_OverrideClip: {fileID: 7889747393601030778, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 61b264f0423eb574eb04052b00876d3b, type: 2}
|
||||
m_OverrideClip: {fileID: -4610952415324987419, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 7931b0c3373dbee4cba771022d874587, type: 2}
|
||||
m_OverrideClip: {fileID: -1310521523949388987, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 2a2012ea7f7e0e042ac7ede06063b02b, type: 2}
|
||||
m_OverrideClip: {fileID: -1225430849258194476, guid: 75fec23d5aab28145865b0c66050c27d,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 7343dade3869ad849987e58a41f83525, type: 2}
|
||||
m_OverrideClip: {fileID: 8168699922495294216, guid: 2b2f07128b39cba4c92abb4345a32f06,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b52cacd4e2a60ec46937f22be7836395, type: 2}
|
||||
m_OverrideClip: {fileID: -1083544072533941823, guid: 60ce135d33b207a49b606aedcc0f1854,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b8e76ef5af8510645b2c4dbc7bcaf794, type: 2}
|
||||
m_OverrideClip: {fileID: -5052955053199334208, guid: fd05b77d716f77f469af10c0e806deba,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f9e14dc9abbbd9c4189dd4a2098b8453, type: 2}
|
||||
m_OverrideClip: {fileID: 5946662650953601361, guid: 83c4f2ad93f42a542a84bd742f0b972f,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 917b946e43d9a4641b9fdd98f166054d, type: 2}
|
||||
m_OverrideClip: {fileID: -6125803487475971785, guid: b5bad85324d27944daff4ad2f0a4bd08,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 1d074b7dc9160cb48a7556138159b8d7, type: 2}
|
||||
m_OverrideClip: {fileID: -1095421310871173937, guid: e8f9974eb768be4479413b261e3bc2c7,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: ccc3ebda65dcc1a41b5919701bbe7ec0, type: 2}
|
||||
m_OverrideClip: {fileID: -1181532003767956096, guid: 9d2f7d233a913ac4cb9717696cc34bc1,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: e77502caa6a17c642ba09f586f3b45bb, type: 2}
|
||||
m_OverrideClip: {fileID: 6975854333129897964, guid: 98f61866ec8b8204f921cc66f442e18a,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 5e720394982277e4fa97be855ac63790, type: 2}
|
||||
m_OverrideClip: {fileID: -6856922032139373723, guid: 52dc2e185dc11e24d8c1c5624af3c6b5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 77284660b64f8b747a959381bd306474, type: 2}
|
||||
m_OverrideClip: {fileID: 6556334952719929740, guid: 9bf394777061cc54d81cde403a0403fb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 132af0a352a91b445b1c2b9421a33ad2, type: 2}
|
||||
m_OverrideClip: {fileID: 3434409490235861809, guid: a2215ac2093908143ab90243e34a84ab,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f2371e65832a2764583cb07093b1b8e3, type: 2}
|
||||
m_OverrideClip: {fileID: 8816512968436616041, guid: 8d7811dbe55d38a4599645b01376ccf5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: fc4545c9c30e352498b9fdae518c494c, type: 2}
|
||||
m_OverrideClip: {fileID: 9098646296615732399, guid: c15f2617665cdea4a8d622562bb8fc4d,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 48b588cdfb696b84fbc64a655f8679d4, type: 2}
|
||||
m_OverrideClip: {fileID: -8893850683258528007, guid: 819faaa415671a44ab62b3571bea9747,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: a2cdf29fad5621549a03be55655631d6, type: 2}
|
||||
m_OverrideClip: {fileID: -8213736612684763305, guid: 7a44dd35952925148891201602618577,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 140792d575aadb045948fa56a2fbf317, type: 2}
|
||||
m_OverrideClip: {fileID: 7216636553824065067, guid: 11e5366ded81d9346ab177adfdc5d12a,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b14e3fdf274991c4796984ae1765eed1, type: 2}
|
||||
m_OverrideClip: {fileID: 4251362255343452841, guid: 8ed75e08282001d4babe492f7dad3a07,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: c7cf8a24ccd38f14d9c90aff6869cedf, type: 2}
|
||||
m_OverrideClip: {fileID: 5109977346001602528, guid: 70dcc12584f5ccf49bbbe45b091db804,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: d309aa534749433468272473d5b65010, type: 2}
|
||||
m_OverrideClip: {fileID: 6993030432383370618, guid: f8999c71a27cafc4d80eec16f552b842,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 4c9e9f549481a1e48bff1e9bbfa4eaa2, type: 2}
|
||||
m_OverrideClip: {fileID: 2532806716085130415, guid: e3fbe511af9ffc7448580c98f059e42d,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 15a76fda2edc7f546ba25b31b5ef83df, type: 2}
|
||||
m_OverrideClip: {fileID: -3507144807383977469, guid: 99688f58112ceff49a7d2347c39e0ce5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2}
|
||||
m_OverrideClip: {fileID: -5452655278776625361, guid: 603b4b4637b61594788be78039151efb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: e9a482e76374d514b85c18777e90a9c7, type: 2}
|
||||
m_OverrideClip: {fileID: -5452655278776625361, guid: 603b4b4637b61594788be78039151efb,
|
||||
type: 3}
|
||||
|
|
@ -102,3 +102,9 @@ AnimatorOverrideController:
|
|||
- m_OriginalClip: {fileID: 7400000, guid: 15a76fda2edc7f546ba25b31b5ef83df, type: 2}
|
||||
m_OverrideClip: {fileID: -3507144807383977469, guid: 99688f58112ceff49a7d2347c39e0ce5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 00d8a0f68533b9b4192a7c6d473d591f, type: 2}
|
||||
m_OverrideClip: {fileID: 6084064612645856096, guid: e8f9974eb768be4479413b261e3bc2c7,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: e9a482e76374d514b85c18777e90a9c7, type: 2}
|
||||
m_OverrideClip: {fileID: 6084064612645856096, guid: e8f9974eb768be4479413b261e3bc2c7,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,98 @@
|
|||
%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: EntityShield
|
||||
m_Controller: {fileID: 9100000, guid: cb43cb1bf42184e45b920b0bb77554f9, type: 2}
|
||||
m_Clips:
|
||||
- m_OriginalClip: {fileID: 7400000, guid: ad24d1ce30ed48945a9b68be9827bc90, type: 2}
|
||||
m_OverrideClip: {fileID: 8816525237524189043, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 01214145ea75a2d4b80363bba2f1a65e, type: 2}
|
||||
m_OverrideClip: {fileID: -5858036045953447646, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 451f983af0dd44c419406ca1d1a0b591, type: 2}
|
||||
m_OverrideClip: {fileID: 7433315730774535304, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 9bc28f4633c671a428bc05bc4b6e6a8c, type: 2}
|
||||
m_OverrideClip: {fileID: 197974373799447605, guid: 8458c01c2fdae5447bf770e0341e9ccb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2}
|
||||
m_OverrideClip: {fileID: 5630858584768485140, guid: 868a212d1c6a96c4580bb18152676cfa,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f88d8dea74ca02e43b56b5a42fd0da74, type: 2}
|
||||
m_OverrideClip: {fileID: -1310521523949388987, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 020d1c1ecabec614d8b651753ffc9170, type: 2}
|
||||
m_OverrideClip: {fileID: 7889747393601030778, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 61b264f0423eb574eb04052b00876d3b, type: 2}
|
||||
m_OverrideClip: {fileID: -4610952415324987419, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 7931b0c3373dbee4cba771022d874587, type: 2}
|
||||
m_OverrideClip: {fileID: -1310521523949388987, guid: 74316b6025926e34285406181949885b,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 2a2012ea7f7e0e042ac7ede06063b02b, type: 2}
|
||||
m_OverrideClip: {fileID: -1225430849258194476, guid: 75fec23d5aab28145865b0c66050c27d,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 7343dade3869ad849987e58a41f83525, type: 2}
|
||||
m_OverrideClip: {fileID: -5038410976997305043, guid: 13f411b7505461047800567aa123ac34,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b52cacd4e2a60ec46937f22be7836395, type: 2}
|
||||
m_OverrideClip: {fileID: -1083544072533941823, guid: 60ce135d33b207a49b606aedcc0f1854,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b8e76ef5af8510645b2c4dbc7bcaf794, type: 2}
|
||||
m_OverrideClip: {fileID: -5052955053199334208, guid: fd05b77d716f77f469af10c0e806deba,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f9e14dc9abbbd9c4189dd4a2098b8453, type: 2}
|
||||
m_OverrideClip: {fileID: 5946662650953601361, guid: 83c4f2ad93f42a542a84bd742f0b972f,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 917b946e43d9a4641b9fdd98f166054d, type: 2}
|
||||
m_OverrideClip: {fileID: -6125803487475971785, guid: b5bad85324d27944daff4ad2f0a4bd08,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 1d074b7dc9160cb48a7556138159b8d7, type: 2}
|
||||
m_OverrideClip: {fileID: -1095421310871173937, guid: e8f9974eb768be4479413b261e3bc2c7,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: ccc3ebda65dcc1a41b5919701bbe7ec0, type: 2}
|
||||
m_OverrideClip: {fileID: -1181532003767956096, guid: 9d2f7d233a913ac4cb9717696cc34bc1,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: e77502caa6a17c642ba09f586f3b45bb, type: 2}
|
||||
m_OverrideClip: {fileID: 6975854333129897964, guid: 98f61866ec8b8204f921cc66f442e18a,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 5e720394982277e4fa97be855ac63790, type: 2}
|
||||
m_OverrideClip: {fileID: -6856922032139373723, guid: 52dc2e185dc11e24d8c1c5624af3c6b5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 77284660b64f8b747a959381bd306474, type: 2}
|
||||
m_OverrideClip: {fileID: 6556334952719929740, guid: 9bf394777061cc54d81cde403a0403fb,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 132af0a352a91b445b1c2b9421a33ad2, type: 2}
|
||||
m_OverrideClip: {fileID: 3434409490235861809, guid: a2215ac2093908143ab90243e34a84ab,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: f2371e65832a2764583cb07093b1b8e3, type: 2}
|
||||
m_OverrideClip: {fileID: 8816512968436616041, guid: 8d7811dbe55d38a4599645b01376ccf5,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: fc4545c9c30e352498b9fdae518c494c, type: 2}
|
||||
m_OverrideClip: {fileID: 9098646296615732399, guid: c15f2617665cdea4a8d622562bb8fc4d,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 48b588cdfb696b84fbc64a655f8679d4, type: 2}
|
||||
m_OverrideClip: {fileID: -8893850683258528007, guid: 819faaa415671a44ab62b3571bea9747,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: a2cdf29fad5621549a03be55655631d6, type: 2}
|
||||
m_OverrideClip: {fileID: -8213736612684763305, guid: 7a44dd35952925148891201602618577,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: 140792d575aadb045948fa56a2fbf317, type: 2}
|
||||
m_OverrideClip: {fileID: 7216636553824065067, guid: 11e5366ded81d9346ab177adfdc5d12a,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: b14e3fdf274991c4796984ae1765eed1, type: 2}
|
||||
m_OverrideClip: {fileID: 4251362255343452841, guid: 8ed75e08282001d4babe492f7dad3a07,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: c7cf8a24ccd38f14d9c90aff6869cedf, type: 2}
|
||||
m_OverrideClip: {fileID: 5109977346001602528, guid: 70dcc12584f5ccf49bbbe45b091db804,
|
||||
type: 3}
|
||||
- m_OriginalClip: {fileID: 7400000, guid: d309aa534749433468272473d5b65010, type: 2}
|
||||
m_OverrideClip: {fileID: 6993030432383370618, guid: f8999c71a27cafc4d80eec16f552b842,
|
||||
type: 3}
|
||||
|
|
@ -49,6 +49,28 @@ MonoBehaviour:
|
|||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Aim
|
||||
--- !u!1101 &-8584403444649708987
|
||||
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: 4995920671595690745}
|
||||
m_Solo: 0
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0.25
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.6
|
||||
m_HasExitTime: 1
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 2
|
||||
m_OrderedInterruption: 1
|
||||
m_CanTransitionToSelf: 1
|
||||
--- !u!1101 &-8382536009140700843
|
||||
AnimatorStateTransition:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ AvatarMask:
|
|||
- m_Path: ArmaTure/Hips/Spine/Chest
|
||||
m_Weight: 0
|
||||
- m_Path: ArmaTure/Hips/Spine/Chest/UpperChest
|
||||
m_Weight: 0
|
||||
m_Weight: 1
|
||||
- m_Path: ArmaTure/Hips/Spine/Chest/UpperChest/FPVScale
|
||||
m_Weight: 0
|
||||
- m_Path: ArmaTure/Hips/Spine/Chest/UpperChest/Left_Shoulder
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
%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: RiotShield
|
||||
m_EditorClassIdentifier:
|
||||
displayName: Riot Shield
|
||||
description: "\u9632\u7206\u76FE,\u653E\u7F6E\u578B"
|
||||
addressablePath: Assets/RiotShield
|
||||
prefab: {fileID: 2027336886778514549, guid: 1141ffce7f7806d46ac71d8b7d7e4d9b, type: 3}
|
||||
squareIcon: {fileID: 2800000, guid: a169f34deadd53141bba58c9493c9e20, type: 3}
|
||||
rectangleIcon: {fileID: 0}
|
||||
quality: 3
|
||||
isImprovised: 1
|
||||
factoryProperties: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds: []
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
%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: 69820685192a7b140b6034ec1d0e585e, type: 3}
|
||||
m_Name: Attack
|
||||
m_EditorClassIdentifier:
|
||||
value: Attack
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
%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: 69820685192a7b140b6034ec1d0e585e, type: 3}
|
||||
m_Name: Blocking
|
||||
m_EditorClassIdentifier:
|
||||
value: Blocking
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
%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: 69820685192a7b140b6034ec1d0e585e, type: 3}
|
||||
m_Name: Charging
|
||||
m_EditorClassIdentifier:
|
||||
value: Charging
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
%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: 69820685192a7b140b6034ec1d0e585e, type: 3}
|
||||
m_Name: HeavyAttack
|
||||
m_EditorClassIdentifier:
|
||||
value: HeavyAttack
|
||||
|
|
@ -29,7 +29,7 @@ MonoBehaviour:
|
|||
overrideMode: 0
|
||||
overrideDepthState: 0
|
||||
depthCompareFunction: 0
|
||||
enableWrite: 0
|
||||
enableWrite: 1
|
||||
stencilSettings:
|
||||
overrideStencilState: 0
|
||||
stencilReference: 0
|
||||
|
|
@ -158,10 +158,10 @@ MonoBehaviour:
|
|||
m_AssetVersion: 2
|
||||
m_OpaqueLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 2147578999
|
||||
m_Bits: 2147579511
|
||||
m_TransparentLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 2147578999
|
||||
m_Bits: 2147579511
|
||||
m_DefaultStencilState:
|
||||
overrideStencilState: 0
|
||||
stencilReference: 0
|
||||
|
|
@ -210,9 +210,9 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3}
|
||||
m_Name: Overlay Opaque Depth
|
||||
m_EditorClassIdentifier:
|
||||
m_Active: 1
|
||||
m_Active: 0
|
||||
settings:
|
||||
passTag: Overlay Opaque Deaph
|
||||
passTag: Overlay Opaque Depth
|
||||
Event: 300
|
||||
filterSettings:
|
||||
RenderQueueType: 0
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ MonoBehaviour:
|
|||
_version: 3.29
|
||||
_category:
|
||||
_comments:
|
||||
_translation: {x: 26, y: -440}
|
||||
_zoomFactor: 0.77677226
|
||||
_translation: {x: -44.69295, y: -513.9305}
|
||||
_zoomFactor: 0.826561
|
||||
_haltSerialization: 0
|
||||
_externalSerializationFile: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -25,12 +25,13 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 970665078024910077}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.70710665, y: 0.70710695, z: 0.00000033102063, w: -0.0000001986123}
|
||||
m_LocalPosition: {x: 0.79999924, y: 1.099999, z: 0}
|
||||
m_LocalRotation: {x: 0.70710665, y: 0.70710695, z: 0.0000004634289, w: -0.00000033102052}
|
||||
m_LocalPosition: {x: 0.79999924, y: 1.099999, z: 0.000000059604645}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 6029696352194033636}
|
||||
- {fileID: 4797490251734649545}
|
||||
m_Father: {fileID: 4901961216034443422}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1773428102 &5824710815579493272
|
||||
|
|
@ -109,6 +110,13 @@ MonoBehaviour:
|
|||
bulletService:
|
||||
rid: 806583666069995709
|
||||
forceFire: 1
|
||||
customFireRate:
|
||||
allow: 0
|
||||
value: 0
|
||||
customFireInterval:
|
||||
allow: 1
|
||||
value:
|
||||
Interval: 0.33
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
|
|
@ -145,8 +153,63 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 3012280595721412550}
|
||||
- {fileID: 5609392694739390769}
|
||||
m_Father: {fileID: 5088247503209915273}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3289202390847085065
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5609392694739390769}
|
||||
- component: {fileID: 8642433610776518886}
|
||||
m_Layer: 6
|
||||
m_Name: Melee
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &5609392694739390769
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3289202390847085065}
|
||||
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: 6917515382106340287}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8642433610776518886
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3289202390847085065}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b8ae78f9122e0b647b904a21d1c23783, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetableItem: {fileID: 11400000, guid: 9bba7152a5d65c049b17a8461ad4e844, type: 2}
|
||||
meleeService:
|
||||
rid: 806583703969988608
|
||||
forceAttack: 1
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 806583703969988608
|
||||
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
|
||||
data:
|
||||
--- !u!1 &4066453597750257159
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -158,6 +221,7 @@ GameObject:
|
|||
- component: {fileID: 5088247503209915273}
|
||||
- component: {fileID: 8190192540717976532}
|
||||
- component: {fileID: 5264291518813283261}
|
||||
- component: {fileID: 6439753104892075433}
|
||||
- component: {fileID: 1018360192333519112}
|
||||
- component: {fileID: 839526996089019602}
|
||||
- component: {fileID: 3488683244084915478}
|
||||
|
|
@ -165,7 +229,7 @@ GameObject:
|
|||
- component: {fileID: 2652217143784426575}
|
||||
- component: {fileID: 7328560627112153540}
|
||||
- component: {fileID: 4900988971439423463}
|
||||
- component: {fileID: 6439753104892075433}
|
||||
- component: {fileID: 8972146289825889747}
|
||||
m_Layer: 6
|
||||
m_Name: EntityProxy
|
||||
m_TagString: Untagged
|
||||
|
|
@ -225,6 +289,47 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 73333e0a8f0bc4a4b82c06db4c35a21f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &6439753104892075433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4066453597750257159}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ac2d465b526bc94fa8ecba1c434c884, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animators:
|
||||
- {fileID: 839526996089019602}
|
||||
animationKeyWords:
|
||||
- rid: 806583703969988609
|
||||
- rid: 806583703969988610
|
||||
- rid: 806583703969988611
|
||||
_rootVelocity:
|
||||
rid: 806583666069995737
|
||||
boolParameters: []
|
||||
floatParameters: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 806583666069995737
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 16255d9c98b4db546ba0977b92d291e0, type: 2}
|
||||
- rid: 806583703969988609
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: b7664d3b6512cb042bd9716363153bc1, type: 2}
|
||||
- rid: 806583703969988610
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
|
||||
- rid: 806583703969988611
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
|
||||
--- !u!114 &1018360192333519112
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -383,11 +488,13 @@ MonoBehaviour:
|
|||
_serializedList:
|
||||
- Key: Assets/Weapon_M4A1
|
||||
Value: {fileID: 6029696352193735620}
|
||||
- Key: Assets/TacticalKnife
|
||||
Value: {fileID: 4797490251734750953}
|
||||
bodyEquips:
|
||||
_serializedList: []
|
||||
holsteredEquips:
|
||||
_serializedList: []
|
||||
--- !u!114 &6439753104892075433
|
||||
--- !u!114 &8972146289825889747
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -396,28 +503,14 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4066453597750257159}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ac2d465b526bc94fa8ecba1c434c884, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 315608923f4594746a61782d9fb2d982, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animators:
|
||||
- {fileID: 839526996089019602}
|
||||
animationKeyWords:
|
||||
- rid: 806583666069995739
|
||||
_rootVelocity:
|
||||
rid: 806583666069995737
|
||||
boolParameters: []
|
||||
floatParameters: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 806583666069995737
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 16255d9c98b4db546ba0977b92d291e0, type: 2}
|
||||
- rid: 806583666069995739
|
||||
type: {class: Reference, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
value: Fire
|
||||
unityAnimator: {fileID: 839526996089019602}
|
||||
animatorControllers:
|
||||
_serializedList:
|
||||
- Key: Assets/TacticalKnife
|
||||
Value: {fileID: 22100000, guid: 3518d002db077a44ab2866a3cec5f060, type: 2}
|
||||
--- !u!1 &4080309079167589688
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -482,6 +575,87 @@ Transform:
|
|||
- {fileID: 3628348256900614807}
|
||||
m_Father: {fileID: 5088247503209915273}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &375948692419994529
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3628348256900614807}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5162172660552824136, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Knife_02
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.50000054
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.5000003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.49999923
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.49999994
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents:
|
||||
- {fileID: 5871222322048502558, guid: c6747b7c156afa84fab63fe8a9bb3939, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c6747b7c156afa84fab63fe8a9bb3939, type: 3}
|
||||
--- !u!4 &4797490251734649545 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5162172660552853864, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 375948692419994529}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4797490251734750953 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5162172660552824136, guid: c6747b7c156afa84fab63fe8a9bb3939,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 375948692419994529}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3011392489163623404
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -649,27 +823,27 @@ PrefabInstance:
|
|||
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: 0.000000029802322
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.00000013240823
|
||||
value: -0.00000013240823
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.70710677
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 421487889729838279, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.00000013240822
|
||||
value: 0.00000013240823
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 913909496426237269, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -689,7 +863,7 @@ PrefabInstance:
|
|||
- target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: -0.000000007450581
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1286267001055454466, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -846,25 +1020,30 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.y
|
||||
value: 1.0999987
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.000000029802322
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.00000013240823
|
||||
value: 0.00000046342882
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
value: -0.70710677
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.7071068
|
||||
value: 0.70710677
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5977324375018029203, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.00000013240823
|
||||
value: 0.000000066204116
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5997892003019056750, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -886,50 +1065,60 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.x
|
||||
value: -0.29999924
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.000000029802322
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.00000013240823
|
||||
value: 0.0000004634288
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6658073127811331136, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.00000013240823
|
||||
value: 0.0000000662041
|
||||
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_LocalPosition.z
|
||||
value: 0.000000029802322
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.00000013240823
|
||||
value: -0.00000013240823
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.70710677
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7136674892077359098, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.00000013240822
|
||||
value: 0.00000013240823
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7520077443289668456, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -946,10 +1135,15 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.y
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.000000007450581
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 8.7659685e-15
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -964,7 +1158,7 @@ PrefabInstance:
|
|||
- target: {fileID: 7875696957335602972, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.00000009362675
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -976,6 +1170,11 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.y
|
||||
value: 0.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.000000007450581
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
|
|
@ -984,12 +1183,12 @@ PrefabInstance:
|
|||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 1
|
||||
value: -1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.00000009362675
|
||||
value: 0.00000009362675
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8632246090726818035, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
@ -1034,7 +1233,7 @@ PrefabInstance:
|
|||
- target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: 0.000000007450581
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9002121479163606272, guid: d6020a576e13b6d43bd1143a33ff7f8e,
|
||||
type: 3}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,16 @@ PrefabInstance:
|
|||
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_Icon
|
||||
|
|
@ -221,5 +231,5 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.4, y: 0.19999997, z: 0.5999999}
|
||||
m_Size: {x: 0.41, y: 0.21, z: 0.62}
|
||||
m_Center: {x: 0, y: -4.263256e-15, z: -0.099999934}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,356 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &971635249231997216
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4817473507702305727}
|
||||
- component: {fileID: 3852076261968500458}
|
||||
- component: {fileID: 6725516782954098770}
|
||||
- component: {fileID: 4300087446821052395}
|
||||
m_Layer: 9
|
||||
m_Name: Hitbox
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4817473507702305727
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 971635249231997216}
|
||||
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: 2825226578878516341}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!65 &3852076261968500458
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 971635249231997216}
|
||||
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.87200165, y: 1.3908696, z: 0.17732298}
|
||||
m_Center: {x: 0.0011138916, y: 0.68981385, z: 0.040806234}
|
||||
--- !u!114 &6725516782954098770
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 971635249231997216}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0b5dd32aae6c2084db4b79343a0bdc65, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
spring:
|
||||
damp: 20
|
||||
frequence: 15
|
||||
value: {x: 0, y: 0, z: 0}
|
||||
maxSpring:
|
||||
allow: 1
|
||||
value: 4
|
||||
--- !u!54 &4300087446821052395
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 971635249231997216}
|
||||
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 &1931708115634311388
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2825226579453126932}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Wep_RiotShield_01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.7739999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_ConstrainProportionsScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4831495579662805881}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
--- !u!1 &1930829663242413054 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1931708115634311388}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1773428102 &4831495579662805881
|
||||
ParentConstraint:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1930829663242413054}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Weight: 1
|
||||
m_TranslationAtRest: {x: 0, y: 0.774, z: 0}
|
||||
m_RotationAtRest: {x: 0, y: 0, z: 0}
|
||||
m_TranslationOffsets:
|
||||
- {x: 0, y: 0.7739999, z: 0}
|
||||
m_RotationOffsets:
|
||||
- {x: 0, y: 0, z: 0}
|
||||
m_AffectTranslationX: 1
|
||||
m_AffectTranslationY: 1
|
||||
m_AffectTranslationZ: 1
|
||||
m_AffectRotationX: 1
|
||||
m_AffectRotationY: 1
|
||||
m_AffectRotationZ: 1
|
||||
m_Active: 1
|
||||
m_IsLocked: 1
|
||||
m_Sources:
|
||||
- sourceTransform: {fileID: 4817473507702305727}
|
||||
weight: 1
|
||||
--- !u!4 &1936254475798378608 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1931708115634311388}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2027336886707211890
|
||||
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: 1f69b8202d0d9fc4aa50a06f24e46266,
|
||||
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
|
||||
value:
|
||||
objectReference: {fileID: 2800000, guid: a169f34deadd53141bba58c9493c9e20, type: 3}
|
||||
- target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RiotShield Variant
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_Drag
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_Mass
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_AngularDrag
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_Constraints
|
||||
value: 122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 26.375883
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -32.771324
|
||||
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: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4817473507702305727}
|
||||
- targetCorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1936254475798378608}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3}
|
||||
--- !u!4 &2825226578878516341 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2027336886707211890}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2825226579453126932 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2027336886707211890}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -240,7 +240,7 @@ MonoBehaviour:
|
|||
draggable: 1
|
||||
expandable: 1
|
||||
multipleSelection: 1
|
||||
isExpanded: 1
|
||||
isExpanded: 0
|
||||
label:
|
||||
m_Text: Keys
|
||||
m_Image: {fileID: 0}
|
||||
|
|
@ -255,7 +255,7 @@ MonoBehaviour:
|
|||
elementNameOverride:
|
||||
elementIcon: {fileID: 0}
|
||||
reqReferences: {fileID: 0}
|
||||
isExpanded: 1
|
||||
isExpanded: 0
|
||||
_keyValues:
|
||||
- Assets/Improvised_AmmoBox
|
||||
_keys:
|
||||
|
|
@ -577,6 +577,7 @@ Transform:
|
|||
- {fileID: 974388490910736766}
|
||||
- {fileID: 6504162899667296546}
|
||||
- {fileID: 6778784877586059904}
|
||||
- {fileID: 3139903432182894523}
|
||||
m_Father: {fileID: 5592345712141467330}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1773428102 &2224691859326090984
|
||||
|
|
@ -1244,6 +1245,8 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
dictionary:
|
||||
_serializedList:
|
||||
- Key: Assets/RiotShield
|
||||
Value: {fileID: 1336640300666574394}
|
||||
- Key: Assets/Weapon_M4A1
|
||||
Value: {fileID: 974388490910736766}
|
||||
- Key: Assets/Improvised_AmmoBox
|
||||
|
|
@ -1279,6 +1282,8 @@ MonoBehaviour:
|
|||
animationKeyWords:
|
||||
- rid: 806583666069995745
|
||||
- rid: 806583666069995746
|
||||
- rid: 806583703969988612
|
||||
- rid: 806583703969988622
|
||||
_rootVelocity:
|
||||
rid: -2
|
||||
boolParameters: []
|
||||
|
|
@ -1296,6 +1301,14 @@ MonoBehaviour:
|
|||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
|
||||
- rid: 806583703969988612
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
|
||||
- rid: 806583703969988622
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 4a847097a446a4c42b582c2a2f878b11, type: 2}
|
||||
--- !u!114 &6438031452483613087
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1350,6 +1363,10 @@ MonoBehaviour:
|
|||
unityAnimator: {fileID: 6002452162850529175}
|
||||
animatorControllers:
|
||||
_serializedList:
|
||||
- Key: Assets/RiotShield
|
||||
Value: {fileID: 22100000, guid: 465fc0e3c3db4e94182db050d2809aea, type: 2}
|
||||
- Key: Assets/TacticalKnife
|
||||
Value: {fileID: 22100000, guid: 3518d002db077a44ab2866a3cec5f060, type: 2}
|
||||
- Key: Assets/Weapon_M4A1
|
||||
Value: {fileID: 22100000, guid: ac08606b82ce5894b912a062bc236fa3, type: 2}
|
||||
- Key: Assets/Weapon_Glock
|
||||
|
|
@ -1584,6 +1601,8 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
equipped:
|
||||
_serializedList:
|
||||
- Key: Assets/RiotShield
|
||||
Value: {fileID: 3136326129886663733}
|
||||
- Key: Assets/TacticalKnife
|
||||
Value: {fileID: 6778784877585698464}
|
||||
- Key: Assets/Weapon_Glock
|
||||
|
|
@ -2558,6 +2577,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7999429370730056110}
|
||||
- {fileID: 3277717096784339497}
|
||||
- {fileID: 7681178683086533546}
|
||||
- {fileID: 1428674107237432471}
|
||||
|
|
@ -2633,6 +2653,68 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 4826102346843731735}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &5534769563475854462
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7999429370730056110}
|
||||
- component: {fileID: 55057610730573739}
|
||||
m_Layer: 7
|
||||
m_Name: EmptyController
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7999429370730056110
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5534769563475854462}
|
||||
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: 2019605867538852436}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &55057610730573739
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5534769563475854462}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ed423df83f75aa141b9c427c163769e8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
stateMachine:
|
||||
_currentStateName:
|
||||
debug: 0
|
||||
transitionOnNextFrame: 0
|
||||
item: {fileID: 11400000, guid: 1f69b8202d0d9fc4aa50a06f24e46266, type: 2}
|
||||
animator: {fileID: 0}
|
||||
vfxPlayer: {fileID: 0}
|
||||
entityAnimator: {fileID: 0}
|
||||
renderers: []
|
||||
cameraTransform: {fileID: 7999429370730056110}
|
||||
meleeService:
|
||||
rid: 806583703969988652
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 806583703969988652
|
||||
type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime}
|
||||
data:
|
||||
--- !u!1 &5633551467716821190
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3084,6 +3166,37 @@ ParentConstraint:
|
|||
m_Sources:
|
||||
- sourceTransform: {fileID: 3905569252357375247}
|
||||
weight: 1
|
||||
--- !u!1 &7183123841516261596
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1336640300666574394}
|
||||
m_Layer: 9
|
||||
m_Name: Drop
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1336640300666574394
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7183123841516261596}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -0.615, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3139903432182894523}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &7598281767233133373
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3976,6 +4089,10 @@ PrefabInstance:
|
|||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2426015728857496741}
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8ce64bfbf2bb80840af381346bccb782,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2513368842649961580}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 8ce64bfbf2bb80840af381346bccb782, type: 3}
|
||||
--- !u!137 &735532174701725946 stripped
|
||||
SkinnedMeshRenderer:
|
||||
|
|
@ -4042,7 +4159,7 @@ MonoBehaviour:
|
|||
item: {fileID: 11400000, guid: 9bba7152a5d65c049b17a8461ad4e844, type: 2}
|
||||
animator: {fileID: 4834117868670403678}
|
||||
vfxPlayer: {fileID: 0}
|
||||
entityAnimator: {fileID: 0}
|
||||
entityAnimator: {fileID: 2513368842649961580}
|
||||
renderers:
|
||||
- {fileID: 1221488407187310397}
|
||||
- {fileID: 735532174701725946}
|
||||
|
|
@ -4085,6 +4202,55 @@ MonoBehaviour:
|
|||
type: {class: Blocking, ns: BITFALL.Entities.Equipment.Melee, asm: BITFALL.Equip}
|
||||
data:
|
||||
meleeController: {fileID: 2426015728857496741}
|
||||
--- !u!114 &2513368842649961580
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1772301879848412717}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ac2d465b526bc94fa8ecba1c434c884, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animators:
|
||||
- {fileID: 4834117868670403678}
|
||||
animationKeyWords:
|
||||
- rid: 806583703969988615
|
||||
- rid: 806583703969988616
|
||||
- rid: 806583703969988617
|
||||
- rid: 806583703969988618
|
||||
- rid: 806583703969988619
|
||||
_rootVelocity:
|
||||
rid: -2
|
||||
boolParameters: []
|
||||
floatParameters: []
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: -2
|
||||
type: {class: , ns: , asm: }
|
||||
- rid: 806583703969988615
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
|
||||
- rid: 806583703969988616
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: d8b9663a2f4fd4b408b9db8ce2aa859c, type: 2}
|
||||
- rid: 806583703969988617
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 8a53085143a39744ebe0f755e7d1c1fe, type: 2}
|
||||
- rid: 806583703969988618
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 0f127b679db2ca5478ac73cfbf407cc8, type: 2}
|
||||
- rid: 806583703969988619
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 4a847097a446a4c42b582c2a2f878b11, type: 2}
|
||||
--- !u!4 &2437386659687487010 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3857971597623217502, guid: 8ce64bfbf2bb80840af381346bccb782,
|
||||
|
|
@ -5220,6 +5386,7 @@ MonoBehaviour:
|
|||
- rid: 749939664269606914
|
||||
- rid: 806583666069995741
|
||||
- rid: 806583666069995742
|
||||
- rid: 806583703969988623
|
||||
_rootVelocity:
|
||||
rid: 750605193046130692
|
||||
boolParameters:
|
||||
|
|
@ -5261,6 +5428,10 @@ MonoBehaviour:
|
|||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
|
||||
- rid: 806583703969988623
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
|
||||
--- !u!114 &4676489320873285128
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5440,6 +5611,147 @@ Animator:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3095788410081854914}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3135374973463242519
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2367504132869257504}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Wep_RiotShield_01
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
propertyPath: m_ConstrainProportionsScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
propertyPath: m_Size.x
|
||||
value: 0.7936606
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 1.2573875
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
propertyPath: m_Center.x
|
||||
value: -0.01157405
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
propertyPath: m_Center.y
|
||||
value: -0.0967747
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3427397171741855145, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
propertyPath: m_Center.z
|
||||
value: 0.040806536
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1336640300666574394}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2259428400979183358}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6d681d8c0b8ff204ea958a229a248b39, type: 3}
|
||||
--- !u!1 &3136326129886663733 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1514107727950626, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3135374973463242519}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2259428400979183358
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3136326129886663733}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0b5dd32aae6c2084db4b79343a0bdc65, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
spring:
|
||||
damp: 20
|
||||
frequence: 15
|
||||
value: {x: 0, y: 0, z: 0}
|
||||
maxSpring:
|
||||
allow: 1
|
||||
value: 8
|
||||
--- !u!4 &3139903432182894523 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4568900488898732, guid: 6d681d8c0b8ff204ea958a229a248b39,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3135374973463242519}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3451855730188380086
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7989,6 +8301,7 @@ MonoBehaviour:
|
|||
- rid: 749939664269606914
|
||||
- rid: 806583666069995743
|
||||
- rid: 806583666069995744
|
||||
- rid: 806583703969988624
|
||||
_rootVelocity:
|
||||
rid: 750605193046130692
|
||||
boolParameters:
|
||||
|
|
@ -8030,6 +8343,10 @@ MonoBehaviour:
|
|||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: f911910b02fa2ec4298285cde8a2faa2, type: 2}
|
||||
- rid: 806583703969988624
|
||||
type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit}
|
||||
data:
|
||||
so: {fileID: 11400000, guid: 914f1f659f5ad5e459dfffd44826e842, type: 2}
|
||||
--- !u!114 &4384885775763546391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,7 +5,6 @@ using System.Text;
|
|||
using BITFALL.Bullet;
|
||||
using UnityEngine;
|
||||
using BITKit;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEditor;
|
||||
|
|
@ -121,15 +120,23 @@ namespace BITFALL
|
|||
var force = (raycastHit.point - (Vector3)bullet.pos).normalized * (physicsInfo?.AddForceMultiple ?? 64);
|
||||
if (raycastHit.collider.TryGetComponent<IDamagable>(out var damagable))
|
||||
{
|
||||
if (damagable.Entity.Id == bullet.initiator) return false;
|
||||
if (damagable.UnityEntity?.Id == bullet.initiator) return false;
|
||||
if (layerMask.Includes(raycastHit.collider.gameObject.layer) is false) return false;
|
||||
var msg = new DamageMessage()
|
||||
{
|
||||
Target = damagable.Entity,
|
||||
Target = damagable.UnityEntity,
|
||||
Hit = damagable,
|
||||
Damage = bullet.initialDamage,
|
||||
};
|
||||
damageService.Execute(msg);
|
||||
if (damagable is IEntityComponent)
|
||||
{
|
||||
damageService.Execute(msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
damagable.GiveDamage(msg);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var _rigidbody = (raycastHit.rigidbody,damagable?.Rigidbody) switch
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit.Entities.Animation
|
||||
{
|
||||
public sealed class EntitiesAnimationController : EntityComponent
|
||||
public sealed class EntitiesAnimationController : EntityBehavior
|
||||
{
|
||||
[SerializeField] private UnityAnimator unityAnimator;
|
||||
[SerializeField] private SerializedDictionary<string, RuntimeAnimatorController> animatorControllers;
|
||||
|
|
@ -20,7 +20,7 @@ namespace BITKit.Entities.Animation
|
|||
public override void OnAwake()
|
||||
{
|
||||
base.OnAwake();
|
||||
_entityEquipment.OnEquip += OnEquip;
|
||||
_entityEquipment.OnEquipAddressable += OnEquip;
|
||||
_initialRuntimeAnimatorController = unityAnimator.animator.runtimeAnimatorController;
|
||||
}
|
||||
|
||||
|
|
@ -32,16 +32,11 @@ namespace BITKit.Entities.Animation
|
|||
}
|
||||
}
|
||||
|
||||
private void OnEquip(IBasicItem obj)
|
||||
private void OnEquip(string equipName)
|
||||
{
|
||||
if(animatorControllers.TryGetValue(obj.AddressablePath, out var controller))
|
||||
{
|
||||
_runtimeAnimatorControllerBuffer.Release(controller);
|
||||
}
|
||||
else
|
||||
{
|
||||
_runtimeAnimatorControllerBuffer.Release(_initialRuntimeAnimatorController);
|
||||
}
|
||||
_runtimeAnimatorControllerBuffer.Release(animatorControllers.TryGetValue(equipName, out var controller)
|
||||
? controller
|
||||
: _initialRuntimeAnimatorController);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ using UnityEngine;
|
|||
namespace BITFALL.Entities.Armor
|
||||
{
|
||||
[CustomType(typeof(IArmor))]
|
||||
public class EntityArmor : EntityComponent,IArmor
|
||||
public class EntityArmor : EntityBehavior,IArmor
|
||||
{
|
||||
private int _armor;
|
||||
public int Armor
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using BITKit.Physics;
|
|||
|
||||
namespace BITFALL.Entites
|
||||
{
|
||||
public class EntityProxyCharacter : EntityComponent
|
||||
public class EntityProxyCharacter : EntityBehavior
|
||||
{
|
||||
[SerializeField] private UnityAnimator animator;
|
||||
[SerializeReference, SubclassSelector] public References _getDamage;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ using Debug = UnityEngine.Debug;
|
|||
namespace BITFALL.Entities.Equipment
|
||||
{
|
||||
[CustomType(typeof(IPlayerEquipSelector))]
|
||||
public class PlayerEquipSelector : EntityComponent,IPlayerEquipSelector
|
||||
public class PlayerEquipSelector : EntityBehavior,IPlayerEquipSelector
|
||||
{
|
||||
[Header(Constant.Header.InternalVariables)]
|
||||
private readonly Dictionary<int, IBasicItem> equips=new();
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace BITKit.Entities
|
|||
[Header(Constant.Header.Services)]
|
||||
[SerializeReference,SubclassSelector] protected IMeleeService meleeService;
|
||||
|
||||
public Core.Entites.IEntity Entity { get; set; }
|
||||
public Entities.IEntity Entity { get; set; }
|
||||
public Entity UnityEntity=>Entity as Entity;
|
||||
public IBasicItem Item { get; set; }
|
||||
|
||||
|
|
@ -57,8 +57,11 @@ namespace BITKit.Entities
|
|||
if (vfxPlayer)
|
||||
vfxPlayer.enabled = true;
|
||||
|
||||
var animName = animator.animator.GetCurrentAnimatorStateInfo(0).shortNameHash;
|
||||
animator.animator.Play(animName, -1, 0);
|
||||
if (animator)
|
||||
{
|
||||
var animName = animator.animator.GetCurrentAnimatorStateInfo(0).shortNameHash;
|
||||
animator.animator.Play(animName, -1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual UniTask EntryAsync()
|
||||
|
|
@ -126,7 +129,8 @@ namespace BITKit.Entities
|
|||
Position = Transform.position,
|
||||
Force = meleeForce * equip.MeleeForce,
|
||||
Range = equip.MeleeRange,
|
||||
Damage = equip.MeleeDamage
|
||||
Damage = equip.MeleeDamage,
|
||||
Forward = UnityEntity.transform.forward
|
||||
});
|
||||
break;
|
||||
case "HeavyAttack":
|
||||
|
|
@ -137,6 +141,7 @@ namespace BITKit.Entities
|
|||
Force = meleeForce * equip.HeavyMeleeForce,
|
||||
Range = equip.HeavyMeleeRange,
|
||||
Damage = equip.HeavyMeleeDamage,
|
||||
Forward = UnityEntity.transform.forward
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
|
@ -144,7 +149,7 @@ namespace BITKit.Entities
|
|||
}
|
||||
[CustomType(typeof(IEquipService))]
|
||||
[CustomType(typeof(IEntityEquipment))]
|
||||
public class EntityEquipment : EntityComponent,IEquipService,IEntityEquipment
|
||||
public class EntityEquipment : EntityBehavior,IEquipService,IEntityEquipment
|
||||
{
|
||||
public IOptional<float> Zoom { get; } = new Optional<float>(){Value = 1};
|
||||
|
||||
|
|
@ -185,7 +190,7 @@ namespace BITKit.Entities
|
|||
|
||||
foreach (var x in equips.list)
|
||||
{
|
||||
x.Entity = entity;
|
||||
x.Entity = UnityEntity;
|
||||
x.OnAwake();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ namespace BITFALL
|
|||
/// 支持，护甲，头盔和背包等
|
||||
/// </summary>
|
||||
[CustomType(typeof(IEntityEquipmentContainer))]
|
||||
public class EntityEquipmentContainer : EntityComponent, IEntityEquipmentContainer
|
||||
public class EntityEquipmentContainer : EntityBehavior, IEntityEquipmentContainer
|
||||
{
|
||||
public IDictionary<IEquipmentSlot, IBasicItem> Equipment { get; } =
|
||||
new Dictionary<IEquipmentSlot, IBasicItem>();
|
||||
|
|
@ -28,7 +28,7 @@ namespace BITFALL
|
|||
|
||||
public override void OnAwake()
|
||||
{
|
||||
var health = entity.Get<IHealth>();
|
||||
var health = UnityEntity.Get<IHealth>();
|
||||
health.OnSetAlive += OnSetAlive;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using BITKit;
|
|||
using BITKit.Entities;
|
||||
namespace BITFALL.Entites
|
||||
{
|
||||
public class EntityFootstep : EntityComponent
|
||||
public class EntityFootstep : EntityBehavior
|
||||
{
|
||||
void FootStep()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ using UnityEngine.InputSystem.Interactions;
|
|||
namespace BITFALL.Entities.Improvised
|
||||
{
|
||||
[CustomType(typeof(ImprovisedServiceInterface))]
|
||||
public class ImprovisedService : EntityComponent,ImprovisedServiceInterface
|
||||
public class ImprovisedService : EntityBehavior,ImprovisedServiceInterface
|
||||
{
|
||||
[Inject] private IHealth _health;
|
||||
[Inject(true)] private IKnockdown _knockdown;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ namespace BITFALL
|
|||
{
|
||||
[CustomType(typeof(IEntityInventory))]
|
||||
[CustomType(typeof(IBasicItemContainer))]
|
||||
public class EntityInventory : EntityComponent, IEntityInventory
|
||||
public class EntityInventory : EntityBehavior, IEntityInventory
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据字典
|
||||
|
|
@ -25,7 +25,7 @@ namespace BITFALL
|
|||
/// <summary>
|
||||
/// 隐式接口实现
|
||||
/// </summary>
|
||||
public int Id => (int)entity.Id;
|
||||
public int Id => (int)UnityEntity.Id;
|
||||
|
||||
public bool DropOrSpawn(IBasicItem item)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace BITFALL
|
|||
event Action<double,double> OnWeighted;
|
||||
}
|
||||
[CustomType(typeof(IPlayerInventoryWeightable))]
|
||||
public class InventoryWeightable : EntityComponent,IPlayerInventoryWeightable
|
||||
public class InventoryWeightable : EntityBehavior,IPlayerInventoryWeightable
|
||||
{
|
||||
[Header(Constant.Header.Data)]
|
||||
public double currentWeight;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ using UnityEngine;
|
|||
namespace BITFALL.Player.Inventory
|
||||
{
|
||||
[CustomType(typeof(IEntitySwapItem))]
|
||||
public class PlayerInventorySwap : EntityComponent,IEntitySwapItem
|
||||
public class PlayerInventorySwap : EntityBehavior,IEntitySwapItem
|
||||
{
|
||||
public bool TryGetCurrentContainer(out IBasicItemContainer container)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ using UnityEngine;
|
|||
namespace BITFALL.Entities
|
||||
{
|
||||
[CustomType(typeof(IKnockdown))]
|
||||
public sealed class EntityKnockdown :EntityComponent,IKnockdown
|
||||
public sealed class EntityKnockdown :EntityBehavior,IKnockdown
|
||||
{
|
||||
[SerializeField] private int knockedHealth;
|
||||
[SerializeField] private int initialKnockedHealth;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using UnityEngine;
|
|||
namespace BITKit.Entities
|
||||
{
|
||||
[CustomType(typeof(IMeleeCombat))]
|
||||
public class EntityMelee : EntityComponent,IMeleeCombat
|
||||
public class EntityMelee : EntityBehavior,IMeleeCombat
|
||||
{
|
||||
[SerializeField] private UnityAnimator unityAnimator;
|
||||
|
||||
|
|
@ -21,8 +21,8 @@ namespace BITKit.Entities
|
|||
[Inject(true)] private IEntityOverride entityOverride;
|
||||
public override void OnStart()
|
||||
{
|
||||
entity.AddListener<int>("Melee", Melee);
|
||||
entity.AddListener<string>(AIAction);
|
||||
UnityEntity.AddListener<int>("Melee", Melee);
|
||||
UnityEntity.AddListener<string>(AIAction);
|
||||
|
||||
unityAnimator[0].onStateEnter += OnStateEnter;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using BITFALL.Entities.Equipment;
|
|||
|
||||
namespace BITFALL
|
||||
{
|
||||
public class EntityPropsDisplay : EntityComponent
|
||||
public class EntityPropsDisplay : EntityBehavior
|
||||
{
|
||||
[SerializeField] private SerializedDictionary<string, GameObject> equipped = new();
|
||||
[SerializeField] private SerializedDictionary<string, GameObject> bodyEquips = new();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ using BITKit;
|
|||
using BITKit.Entities;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
using IEntity = BITKit.Core.Entites.IEntity;
|
||||
using IEntity = BITKit.Entities.IEntity;
|
||||
|
||||
namespace BITFALL.Entities.Equipment
|
||||
{
|
||||
|
|
@ -12,18 +12,23 @@ namespace BITFALL.Entities.Equipment
|
|||
{
|
||||
[SerializeField] protected AssetableItem assetableItem;
|
||||
public bool IsEntered { get; set; }
|
||||
|
||||
public virtual void Entry()
|
||||
{
|
||||
|
||||
UnityEntity.AddListener<string>(Constant.Animation.OnEvent, OnAnimationEvent);
|
||||
}
|
||||
|
||||
protected virtual void OnAnimationEvent(string animationEventName)
|
||||
{
|
||||
}
|
||||
public virtual UniTask EntryAsync()
|
||||
{
|
||||
return UniTask.CompletedTask;
|
||||
}
|
||||
|
||||
public virtual void Exit()
|
||||
public virtual void Exit()
|
||||
{
|
||||
UnityEntity.RemoveListener<string>(Constant.Animation.OnEvent, OnAnimationEvent);
|
||||
}
|
||||
|
||||
public virtual UniTask ExitAsync()
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using BITFALL.Entities.Equipment;
|
|||
using BITKit;
|
||||
using BITKit.Entities;
|
||||
using BITKit.StateMachine;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BITFALL.Guns
|
||||
|
|
@ -16,6 +17,8 @@ namespace BITFALL.Guns
|
|||
[SerializeField] private Transform firePoint;
|
||||
[SerializeReference,SubclassSelector] private IBulletService bulletService;
|
||||
[SerializeField] private bool forceFire;
|
||||
[SerializeField] private Optional<int> customFireRate;
|
||||
[SerializeField] private Optional<IntervalUpdate> customFireInterval;
|
||||
private AssetableGun _gun=>assetableItem as AssetableGun;
|
||||
|
||||
private readonly IntervalUpdate fireInterval = new();
|
||||
|
|
@ -24,6 +27,10 @@ namespace BITFALL.Guns
|
|||
{
|
||||
base.Entry();
|
||||
fireInterval.Interval = _gun.FireMode.FireRate is 0 ? 1 : 1f/_gun.FireMode.FireRate;
|
||||
if (customFireRate.Allow)
|
||||
{
|
||||
fireInterval.Interval =customFireRate.Value is 0 ? 1 : 1f / customFireRate.Value;
|
||||
}
|
||||
UnityEntity.AddListener<BITConstant.Command.AttackCommand>(OnAttack);
|
||||
}
|
||||
public override void Exit()
|
||||
|
|
@ -36,7 +43,17 @@ namespace BITFALL.Guns
|
|||
{
|
||||
if (forceFire && fireInterval.AllowUpdate)
|
||||
{
|
||||
OnAttack(new BITConstant.Command.AttackCommand());
|
||||
if(customFireInterval.Allow)
|
||||
{
|
||||
if (customFireInterval.Value.AllowUpdate)
|
||||
{
|
||||
OnAttack(new BITConstant.Command.AttackCommand());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
OnAttack(new BITConstant.Command.AttackCommand());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.OleDb;
|
||||
using BITFALL.Bullet;
|
||||
using BITFALL.Guns;
|
||||
using BITFALL.Items.Melee;
|
||||
using BITKit;
|
||||
using BITKit.Entities.Melee;
|
||||
using UnityEngine;
|
||||
|
|
@ -14,6 +16,7 @@ namespace BITFALL.Entities.Equipment
|
|||
[SerializeField] private bool forceAttack;
|
||||
|
||||
private readonly IntervalUpdate interval = new(1);
|
||||
private AssetableMelee assetableMelee=>assetableItem as AssetableMelee;
|
||||
public override void Entry()
|
||||
{
|
||||
base.Entry();
|
||||
|
|
@ -37,6 +40,25 @@ namespace BITFALL.Entities.Equipment
|
|||
{
|
||||
UnityEntity.Invoke(Constant.Animation.Play, BITConstant.Player.Melee);
|
||||
}
|
||||
|
||||
protected override void OnAnimationEvent(string animationEventName)
|
||||
{
|
||||
switch (animationEventName)
|
||||
{
|
||||
case BITConstant.Player.Attack:
|
||||
case BITConstant.Player.Melee:
|
||||
meleeService.Melee(new MeleeCommand()
|
||||
{
|
||||
Damage = assetableMelee.MeleeDamage,
|
||||
Force = assetableMelee.MeleeForce,
|
||||
PlayerId = Entity.Id,
|
||||
Position = transform.position,
|
||||
Range = assetableMelee.MeleeRange,
|
||||
Forward = UnityEntity.transform.forward,
|
||||
});
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ namespace BITFALL.Guns.States
|
|||
}
|
||||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
root.animator.Play(BITConstant.Player.Melee);
|
||||
root.UnityEntity.Invoke(Constant.Animation.Play, BITConstant.Player.Melee);
|
||||
_entityMovement.ExecuteCommand(new PlayerDisableRunCommand(this));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using BITKit;
|
|||
using BITKit.Entities;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEngine;
|
||||
using IEntity = BITKit.Core.Entites.IEntity;
|
||||
using IEntity = BITKit.Entities.IEntity;
|
||||
|
||||
namespace BITFALL.Guns
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BITKit.Entities;
|
||||
using BITKit.StateMachine;
|
||||
using UnityEngine;
|
||||
|
||||
namespace BITFALL.Player.Equip
|
||||
{
|
||||
public sealed class EmptyController : BITEquipBase<EmptyState>
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@ using UnityEngine.InputSystem;
|
|||
|
||||
namespace BITFALL.Player.Movement
|
||||
{
|
||||
public class EquipSway : EntityComponent
|
||||
public class EquipSway : EntityBehavior
|
||||
{
|
||||
[SerializeField] private float rotDelta;
|
||||
[SerializeField] private float rotValue;
|
||||
|
|
@ -22,8 +22,8 @@ namespace BITFALL.Player.Movement
|
|||
private IEquipService _equipService;
|
||||
public override void OnAwake()
|
||||
{
|
||||
_movement = entity.Get<IEntityMovement>();
|
||||
_equipService = entity.Get<IEquipService>();
|
||||
_movement = UnityEntity.Get<IEntityMovement>();
|
||||
_equipService = UnityEntity.Get<IEquipService>();
|
||||
}
|
||||
|
||||
public override void OnLateUpdate(float deltaTime)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using BITFALL.Items.Melee;
|
|||
using BITFALL.Combat;
|
||||
using BITFALL.Player.Movement;
|
||||
using BITKit;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using BITKit.Entities.Melee;
|
||||
using BITKit.StateMachine;
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ namespace BITFALL.Entities.Equipment.Melee
|
|||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
base.OnStateEntry(old);
|
||||
meleeController.animator.Play(BITConstant.Player.Attack);
|
||||
meleeController.UnityEntity.Invoke(Constant.Animation.Play,BITConstant.Player.Attack);
|
||||
}
|
||||
public override void OnStateUpdate(float deltaTime)
|
||||
{
|
||||
|
|
@ -100,7 +100,7 @@ namespace BITFALL.Entities.Equipment.Melee
|
|||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
base.OnStateEntry(old);
|
||||
meleeController.animator.Play(BITConstant.Player.Charging);
|
||||
meleeController.UnityEntity.Invoke(Constant.Animation.Play,BITConstant.Player.Charging);
|
||||
|
||||
}
|
||||
public override void OnStateUpdate(float deltaTime)
|
||||
|
|
@ -127,7 +127,7 @@ namespace BITFALL.Entities.Equipment.Melee
|
|||
public override void OnStateEntry(IState old)
|
||||
{
|
||||
base.OnStateEntry(old);
|
||||
meleeController.animator.Play(BITConstant.Player.HeavyAttack);
|
||||
meleeController.UnityEntity.Invoke(Constant.Animation.Play,BITConstant.Player.HeavyAttack);
|
||||
_playerMovement.Stamina -= meleeController.melee.HeavyAttackStaminaCost;
|
||||
}
|
||||
}
|
||||
|
|
@ -143,7 +143,7 @@ namespace BITFALL.Entities.Equipment.Melee
|
|||
{
|
||||
base.OnStateEntry(old);
|
||||
_interval.Reset();
|
||||
meleeController.animator.Play(BITConstant.Player.Blocking);
|
||||
meleeController.UnityEntity.Invoke(Constant.Animation.Play,BITConstant.Player.Blocking);
|
||||
}
|
||||
public override void OnStateUpdate(float deltaTime)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using BITKit.Entities;
|
|||
using Cysharp.Threading.Tasks;
|
||||
using RotaryHeart.Lib.SerializableDictionary;
|
||||
using UnityEngine;
|
||||
using IEntity = BITKit.Core.Entites.IEntity;
|
||||
using IEntity = BITKit.Entities.IEntity;
|
||||
|
||||
namespace BITFALL.Player.Equip
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITFALL.Feel
|
||||
{
|
||||
public sealed class PlayerHandAnimations : EntityComponent
|
||||
public sealed class PlayerHandAnimations : EntityBehavior
|
||||
{
|
||||
[SerializeField] private UnityAnimator animator;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit.Entities.Player.Feel
|
||||
{
|
||||
public sealed class PlayerHitMotion : EntityComponent
|
||||
public sealed class PlayerHitMotion : EntityBehavior
|
||||
{
|
||||
[SerializeField] private Spring3 spring;
|
||||
[SerializeField] private LocationAdditive locationAdditive;
|
||||
[SerializeField] private AnimationCurve damageBasedMotion;
|
||||
public override void OnStart()
|
||||
{
|
||||
entity.AddListener<DamageMessage>(OnDamaged);
|
||||
UnityEntity.AddListener<DamageMessage>(OnDamaged);
|
||||
}
|
||||
|
||||
private void OnDamaged(DamageMessage obj)
|
||||
{
|
||||
if (obj.Target != entity) return;
|
||||
if (obj.Target != UnityEntity) return;
|
||||
var damage = damageBasedMotion.Evaluate(obj.Damage);
|
||||
spring.value = new Vector3(damage.Random(), damage.Random(), damage.Random());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,33 +41,46 @@ namespace BITFALL.Melee
|
|||
if (Queue.TryDequeue(out var command) is false) return;
|
||||
|
||||
var colliders = Physics.OverlapSphere(command.Position, command.Range,detectLayer);
|
||||
var damaged= new List<IEntity>();
|
||||
var damaged= new List<IUnityEntity>();
|
||||
foreach (var x in colliders.Where(x=>x.GetComponent<IDamagable>() is not null))
|
||||
{
|
||||
try
|
||||
{
|
||||
var damageable = x.GetComponent<IDamagable>();
|
||||
if (damaged.Contains(damageable.Entity) || damageable.Entity.Id == command.PlayerId)
|
||||
|
||||
var toTarget = x.transform.position - (Vector3)command.Position;
|
||||
|
||||
toTarget = Vector3.ProjectOnPlane(toTarget, Vector3.up);
|
||||
|
||||
// 获取正前方的向量
|
||||
var forward = command.Forward;
|
||||
|
||||
// 计算点积
|
||||
var dotProduct = Vector3.Dot(toTarget.normalized, forward);
|
||||
|
||||
if (dotProduct < 0.8f) continue;
|
||||
|
||||
if (damaged.Contains(damageable.UnityEntity) || damageable.UnityEntity?.Id == command.PlayerId)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
damaged.Add(damageable.Entity);
|
||||
damaged.Add(damageable.UnityEntity);
|
||||
var damageMsg =
|
||||
new DamageMessage()
|
||||
{
|
||||
Initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity,
|
||||
Initiator = UnityEntitiesService.Get(command.PlayerId) as IUnityEntity,
|
||||
DamageType = new MeleeDamageMessage
|
||||
{
|
||||
|
||||
},
|
||||
Target = damageable.Entity,
|
||||
Target = damageable.UnityEntity,
|
||||
Damage = command.Damage is 0 ? 64 : command.Damage,
|
||||
Hit = damageable,
|
||||
};
|
||||
if (command.PlayerId !=default)
|
||||
{
|
||||
damageMsg.Initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity;
|
||||
damageMsg.Initiator = UnityEntitiesService.Get(command.PlayerId) as IUnityEntity;
|
||||
}
|
||||
damageService.Execute(damageMsg);
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ namespace BITFALL.Entities.Player.Movement
|
|||
{
|
||||
[CustomType(typeof(IEntityMovement))]
|
||||
[CustomType(typeof(IPlayerMovement))]
|
||||
public class PlayerCharacterController : StateBasedPlayerComponent<IEntityMovementState>,IEntityMovement,IPlayerMovement
|
||||
public class PlayerCharacterController : StateBasedPlayerBehavior<IEntityMovementState>,IEntityMovement,IPlayerMovement
|
||||
{
|
||||
[SerializeField] private CharacterActor actor;
|
||||
[SerializeField] private Vector3 initialCameraPosition = new(0,0.11f,0.27f);
|
||||
|
|
@ -228,6 +228,7 @@ namespace BITFALL.Entities.Player.Movement
|
|||
{
|
||||
if (!x.TryGetComponent<OffMeshLink>(out var offMeshLink)) continue;
|
||||
var toTarget = x.transform.position - transform.position;
|
||||
|
||||
toTarget = Vector3.ProjectOnPlane(toTarget, Vector3.up);
|
||||
|
||||
// 获取正前方的向量
|
||||
|
|
@ -361,7 +362,7 @@ namespace BITFALL.Entities.Player.Movement
|
|||
case > 0:
|
||||
break;
|
||||
case < -16:
|
||||
entity.Invoke<DamageMessage>(new DamageMessage()
|
||||
UnityEntity.Invoke<DamageMessage>(new DamageMessage()
|
||||
{
|
||||
Damage = value < -30 ? int.MaxValue : (int)math.abs(value) * 2 ,
|
||||
DamageType = new GravityDamage(),
|
||||
|
|
@ -370,8 +371,8 @@ namespace BITFALL.Entities.Player.Movement
|
|||
position = actor.Position,
|
||||
rotation = actor.Rotation
|
||||
},
|
||||
Initiator = entity,
|
||||
Target = entity,
|
||||
Initiator = UnityEntity,
|
||||
Target = UnityEntity,
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace BITFALL.Entities.Player.Movement.States
|
|||
public bool Enabled { get; set; }
|
||||
public virtual void Initialize()
|
||||
{
|
||||
characterController.entity.Inject(this);
|
||||
characterController.UnityEntity.Inject(this);
|
||||
}
|
||||
|
||||
public virtual void OnStateEntry(IState old)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace BITFALL.Player.Animation
|
|||
{
|
||||
void OnMovementStateChanged(IEntityMovementState oldState, IEntityMovementState newState);
|
||||
}
|
||||
public class PlayerAnimationController : StateBasedComponent<IPlayerAnimationState>
|
||||
public class PlayerAnimationController : StateBasedBehavior<IPlayerAnimationState>
|
||||
{
|
||||
|
||||
[SerializeField] internal UnityAnimator animator;
|
||||
|
|
@ -25,7 +25,7 @@ namespace BITFALL.Player.Animation
|
|||
public override void OnAwake()
|
||||
{
|
||||
base.OnAwake();
|
||||
_movement = entity.Get<IEntityMovement>();
|
||||
_movement = UnityEntity.Get<IEntityMovement>();
|
||||
_movement.OnStateChanged += OnMovementStateChanged;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITFALL.Player.Survival
|
||||
{
|
||||
public class PlayerEatService : EntityComponent
|
||||
public class PlayerEatService : EntityBehavior
|
||||
{
|
||||
[Inject] private IPlayerSurvivalService _survival;
|
||||
[Inject] private IEntityInventory _inventory;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace BITFALL.Player.Survival
|
|||
public string Message;
|
||||
}
|
||||
[CustomType(typeof(IPlayerSurvivalService))]
|
||||
public class PlayerSurvivalService : EntityComponent, IPlayerSurvivalService
|
||||
public class PlayerSurvivalService : EntityBehavior, IPlayerSurvivalService
|
||||
{
|
||||
public IPlayerSurvivalElement[] Elements { get; set; } = Array.Empty<IPlayerSurvivalElement>();
|
||||
[SerializeReference, SubclassSelector] private IPlayerSurvivalElement[] initialElements = Array.Empty<IPlayerSurvivalElement>();
|
||||
|
|
@ -55,7 +55,7 @@ namespace BITFALL.Player.Survival
|
|||
{
|
||||
element = x,
|
||||
},
|
||||
Target = entity,
|
||||
Target = UnityEntity,
|
||||
Damage = 1,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
"GUID:7efac18f239530141802fb139776f333",
|
||||
"GUID:f51ebe6a0ceec4240a699833d6309b23",
|
||||
"GUID:ea5474181b324dd49a5976cd68f44f18",
|
||||
"GUID:bea3628e8b592ae47ade218cb9ec98db"
|
||||
"GUID:bea3628e8b592ae47ade218cb9ec98db",
|
||||
"GUID:8d74bfb2f67c5c14a810215b78383d40"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BITKit;
|
||||
using BITKit.Entities;
|
||||
using UnityEngine;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
namespace BITFALL.Props
|
||||
{
|
||||
public class Prop_Shield : MonoBehaviour,IDamagable
|
||||
{
|
||||
[SerializeField] private SpringEulerAngle spring=new();
|
||||
[SerializeField] private Optional<int> maxSpring;
|
||||
public IUnityEntity UnityEntity => null;
|
||||
public Rigidbody Rigidbody => null;
|
||||
private Vector3 initialEulerAngles;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
initialEulerAngles = transform.localEulerAngles;
|
||||
}
|
||||
private void FixedUpdate()
|
||||
{
|
||||
spring.Update(Time.fixedDeltaTime,initialEulerAngles);
|
||||
transform.localEulerAngles = spring.value;
|
||||
}
|
||||
public void GiveDamage(DamageMessage message)
|
||||
{
|
||||
var damage = message.Damage;
|
||||
if (maxSpring.Allow)
|
||||
{
|
||||
damage = Mathf.Min(damage, maxSpring.Value);
|
||||
}
|
||||
spring.value =initialEulerAngles + new Vector3(
|
||||
Random.Range(-damage, damage),
|
||||
Random.Range(-damage, damage),
|
||||
Random.Range(-damage, damage)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ namespace BITFALL.Props
|
|||
{
|
||||
damagable.GiveDamage(new DamageMessage()
|
||||
{
|
||||
Target = damagable.Entity,
|
||||
Target = damagable.UnityEntity,
|
||||
Damage = damage,
|
||||
Location = new Location()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using System.Linq;
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using BITKit;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using BITKit.Entities.Player;
|
||||
using BITKit.Events;
|
||||
using BITKit.Game;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using BITKit;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using BITKit.Entities;
|
||||
using UnityEngine;
|
||||
using IEntity = BITKit.Core.Entites.IEntity;
|
||||
using IEntity = BITKit.Entities.IEntity;
|
||||
|
||||
namespace BITFALL.Scenes
|
||||
{
|
||||
|
|
|
|||
|
|
@ -73,11 +73,11 @@ namespace BITFALL
|
|||
{
|
||||
playerService.OnPlayerInitialized -= OnStartLocalPlayer;
|
||||
}
|
||||
private void OnStartLocalPlayer(IEntity entity)
|
||||
private void OnStartLocalPlayer(IUnityEntity unityEntity)
|
||||
{
|
||||
cache.Clear();
|
||||
|
||||
entity.Inject(this);
|
||||
unityEntity.Inject(this);
|
||||
|
||||
_entityEquipment.OnEquip += OnEquip;
|
||||
_entityEquipment.OnUnEquip += OnUnEquip;
|
||||
|
|
|
|||
|
|
@ -86,9 +86,9 @@ namespace BITFALL.UX
|
|||
{
|
||||
seleableLabel.SetActive(false);
|
||||
}
|
||||
private async void OnPlayerInitializedLocalPlayer(IEntity entity)
|
||||
private async void OnPlayerInitializedLocalPlayer(IUnityEntity unityEntity)
|
||||
{
|
||||
entity.Inject(this);
|
||||
unityEntity.Inject(this);
|
||||
|
||||
|
||||
_health.OnSetAlive += OnSetAlive;
|
||||
|
|
@ -113,7 +113,7 @@ namespace BITFALL.UX
|
|||
playerAvatarImage.SetTexture(avatar);
|
||||
}
|
||||
|
||||
_equipService = entity.Get<IEquipService>();
|
||||
_equipService = unityEntity.Get<IEquipService>();
|
||||
|
||||
armorBar.SetActive(_armor.TryGetCurrentArmor(out _));
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace BITFALL.UX
|
|||
private IEntityInventory inventory;
|
||||
[Inject]
|
||||
private IEntityEquipmentContainer equipContainer;
|
||||
private IEntity _entity;
|
||||
private IUnityEntity _unityEntity;
|
||||
protected override async void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
|
@ -52,7 +52,7 @@ namespace BITFALL.UX
|
|||
equipContainers.Add(x.Name, uxContainer);
|
||||
element.RegisterCallback<MouseDownEvent>(mouseEvent =>
|
||||
{
|
||||
if(_entity is null) return;
|
||||
if(_unityEntity is null) return;
|
||||
switch (mouseEvent.button)
|
||||
{
|
||||
case 0:
|
||||
|
|
@ -83,13 +83,13 @@ namespace BITFALL.UX
|
|||
playerService.OnPlayerDisposed -= OnPlayerDisposed;
|
||||
playerService.OnPlayerInitialized -= OnPlayerInitializedLocalPlayer;
|
||||
}
|
||||
private void OnPlayerInitializedLocalPlayer(IEntity entity)
|
||||
private void OnPlayerInitializedLocalPlayer(IUnityEntity unityEntity)
|
||||
{
|
||||
entity.Inject(this);
|
||||
unityEntity.Inject(this);
|
||||
itemContainers.Clear();
|
||||
builder.Clear();
|
||||
|
||||
var weighted = entity.Get<IPlayerInventoryWeightable>();
|
||||
var weighted = unityEntity.Get<IPlayerInventoryWeightable>();
|
||||
|
||||
weighted.OnWeighted += OnWeighted;
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ namespace BITFALL.UX
|
|||
inventory.OnUsedItem += OnRemove;
|
||||
inventory.OnSet += OnSet;
|
||||
|
||||
_entity = entity;
|
||||
_unityEntity = unityEntity;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using System;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BITFALL.Player.Movement;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem;
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,9 @@
|
|||
</ui:VisualElement>
|
||||
<ui:VisualElement name="hud-container" picking-mode="Ignore" class="root">
|
||||
<ui:VisualElement class="flex-center" style="top: 64px; width: 384px; height: 8px; background-color: rgba(255, 255, 255, 0.13);">
|
||||
<ui:VisualElement style="position: absolute; top: -491px; align-items: auto; align-self: auto; width: 512px; overflow: hidden; left: -65px; display: none;">
|
||||
<ui:VisualElement style="background-image: url('project://database/Assets/Artists/Arts/Images/Compass%20Bar.png?fileID=2800000&guid=0095854de8f1fa346acff44a54009060&type=3#Compass Bar'); width: 1920px; height: 32px;" />
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="stamina-fill" style="width: 64%; height: 8px; background-color: rgb(255, 255, 255);" />
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
|
|
|
|||
|
|
@ -110,3 +110,26 @@ TabBar Button:disabled {
|
|||
-unity-background-image-tint-color: rgb(255, 255, 255);
|
||||
scale: 1.1 1.1;
|
||||
}
|
||||
|
||||
.inventory-container {
|
||||
width: 624px;
|
||||
height: 768px;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
align-items: flex-start;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: row;
|
||||
padding-left: 24px;
|
||||
padding-right: 24px;
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
}
|
||||
|
||||
.inventory-container-background {
|
||||
padding-left: 16px;
|
||||
padding-right: 16px;
|
||||
padding-top: 16px;
|
||||
padding-bottom: 16px;
|
||||
background-color: rgb(32, 32, 32);
|
||||
min-width: 256px;
|
||||
min-height: 512px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
</ui:VisualElement>
|
||||
<BITKit.UX.TabContainer picking-mode="Ignore" CustomTabPath="inventory-tab" name="inventory-window" CurrentTab="0" style="position: absolute; left: 64px; right: 64px; top: 192px; bottom: 100px;">
|
||||
<ui:VisualElement name="inventory-window" picking-mode="Ignore" style="align-items: flex-start; display: flex; flex-direction: row; justify-content: space-between;">
|
||||
<ui:VisualElement name="equips-container" style="display: flex; margin-left: 0; margin-right: 0; background-color: rgb(32, 32, 32); padding-left: 16px; padding-right: 16px; padding-top: 16px; padding-bottom: 16px;">
|
||||
<ui:Label text="已装备配置" display-tooltip-when-elided="true" class="title" style="display: flex;" />
|
||||
<ui:VisualElement name="equips-container" class="inventory-container-background">
|
||||
<ui:Label text="已装备配置" display-tooltip-when-elided="true" class="title" style="display: flex; margin-bottom: 8px;" />
|
||||
<ui:VisualElement name="equip-container" style="width: 768px; height: 768px; display: flex; padding-left: 24px; padding-right: 24px; padding-top: 24px; padding-bottom: 24px; flex-direction: column; align-items: stretch; justify-content: flex-start; flex-wrap: nowrap; background-color: rgb(16, 16, 16);">
|
||||
<ui:VisualElement name="Weapons">
|
||||
<ui:Label text="武器装备" display-tooltip-when-elided="true" class="title" />
|
||||
|
|
@ -76,14 +76,14 @@
|
|||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="player-status" style="display: flex; visibility: visible; overflow: visible;">
|
||||
<ui:VisualElement name="survival-container" style="flex-grow: 1;">
|
||||
<ui:VisualElement name="player-status" style="display: flex; visibility: visible; overflow: visible; align-items: stretch; justify-content: flex-start; flex-direction: column; flex-grow: 1; padding-left: 8px; padding-right: 8px; padding-top: 8px; padding-bottom: 8px;">
|
||||
<ui:VisualElement name="survival-container">
|
||||
<ui:Instance template="Survival-Template" name="Survival-Template" />
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="inventory-items" style="padding-left: 16px; padding-right: 16px; padding-top: 16px; padding-bottom: 16px; background-color: rgb(32, 32, 32);">
|
||||
<ui:VisualElement style="flex-direction: row; align-items: center;">
|
||||
<ui:Label text="背包物品" display-tooltip-when-elided="true" class="title" />
|
||||
<ui:VisualElement name="inventory-items" class="inventory-container-background">
|
||||
<ui:VisualElement style="flex-direction: row; align-items: center; margin-bottom: 8px;">
|
||||
<ui:Label text="重量" display-tooltip-when-elided="true" class="title" />
|
||||
<ui:VisualElement name="weight-bar" style="flex-direction: row; height: 32px; flex-grow: 1;">
|
||||
<ui:VisualElement name="weight-rect" style="background-color: rgba(255, 255, 255, 0.25); flex-grow: 1;">
|
||||
<ui:VisualElement name="weight-fill" class="root" style="width: 78%; background-color: rgb(26, 130, 255);" />
|
||||
|
|
@ -91,11 +91,15 @@
|
|||
<ui:Label text="8/16" display-tooltip-when-elided="true" name="weight-label" class="title" style="-unity-text-align: middle-left;" />
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="inventory-container" style="width: 768px; height: 768px; background-color: rgba(0, 0, 0, 0.5); align-items: flex-start; flex-wrap: wrap; flex-direction: row; padding-left: 24px; padding-right: 24px; padding-top: 24px; padding-bottom: 24px;" />
|
||||
<ui:VisualElement name="inventory-container" class="inventory-container" />
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="craft-window" picking-mode="Ignore" />
|
||||
<ui:VisualElement name="map-window" picking-mode="Ignore" />
|
||||
<ui:VisualElement name="map-window" picking-mode="Ignore">
|
||||
<ui:ScrollView mode="VerticalAndHorizontal" style="width: 768px; height: 768px; background-color: rgba(0, 0, 0, 0.5); background-image: url('project://database/Assets/Artists/Arts/Maps/Map_DMZ_128.png?fileID=2800000&guid=79969479327e05b43985f04588e2db25&type=3#Map_DMZ_128');">
|
||||
<ui:VisualElement style="width: 1024px; height: 1024px;" />
|
||||
</ui:ScrollView>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement name="quest-window" picking-mode="Ignore" />
|
||||
<ui:VisualElement name="skillTree-window" picking-mode="Ignore" />
|
||||
</BITKit.UX.TabContainer>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,40 @@
|
|||
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
|
||||
<ui:Template name="ItemContainer" src="project://database/Assets/Artists/UX/ItemContainer.uxml?fileID=9197481963319205126&guid=6e7ac9656332fa2489cc7fe4a9f0bf81&type=3#ItemContainer" />
|
||||
<Style src="project://database/Assets/BITKit/Unity/UX/Common/Common.uss?fileID=7433441132597879392&guid=a3a69d3518fd02b489e721f3c5b0b539&type=3#Common" />
|
||||
<Style src="project://database/Assets/Artists/UX/InventorySwap.uss?fileID=7433441132597879392&guid=b1116e2395199b24eab2912d6e319652&type=3#InventorySwap" />
|
||||
<Style src="project://database/Assets/Artists/UX/Inventory.uss?fileID=7433441132597879392&guid=48b2564db1f95a443b921af9745fd92a&type=3#Inventory" />
|
||||
<ui:VisualElement class="root" style="background-color: rgba(0, 0, 0, 0.78);" />
|
||||
<ui:VisualElement class="root">
|
||||
<ui:VisualElement class="flex-center" style="flex-direction: row;">
|
||||
<ui:ScrollView name="Self-Container" class="inventory-container">
|
||||
<ui:VisualElement name="self-container" style="flex-direction: row; flex-wrap: wrap;" />
|
||||
</ui:ScrollView>
|
||||
<ui:VisualElement name="VisualElement" style="width: 200px;" />
|
||||
<ui:ScrollView name="Other-Container" class="inventory-container">
|
||||
<ui:VisualElement name="other-container" style="flex-direction: row; flex-wrap: wrap;" />
|
||||
</ui:ScrollView>
|
||||
<ui:VisualElement class="flex-center" style="flex-direction: row; height: 768px;">
|
||||
<ui:VisualElement class="inventory-container-background">
|
||||
<ui:Label tabindex="-1" text="你的背包" parse-escape-sequences="true" display-tooltip-when-elided="true" name="player-label" style="margin-bottom: 8px;" />
|
||||
<ui:ScrollView name="Self-Container" class="inventory-container">
|
||||
<ui:VisualElement name="self-container" style="flex-direction: row; flex-wrap: wrap; align-items: flex-start;">
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
<ui:Instance template="ItemContainer" name="ItemContainer" />
|
||||
</ui:VisualElement>
|
||||
</ui:ScrollView>
|
||||
</ui:VisualElement>
|
||||
<ui:VisualElement style="width: 200px;" />
|
||||
<ui:VisualElement class="inventory-container-background">
|
||||
<ui:Label tabindex="-1" text="物品容器" parse-escape-sequences="true" display-tooltip-when-elided="true" name="container-label" style="margin-bottom: 8px;" />
|
||||
<ui:ScrollView name="Other-Container" class="inventory-container">
|
||||
<ui:VisualElement name="other-container" style="flex-direction: row; flex-wrap: wrap; align-items: flex-start;" />
|
||||
</ui:ScrollView>
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
</ui:VisualElement>
|
||||
</ui:UXML>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using System;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using BITKit;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
|
||||
namespace BITFALL.Entities.Equipment
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ namespace BITKit.Entities.Melee
|
|||
{
|
||||
public ulong PlayerId;
|
||||
public float3 Position;
|
||||
public float3 Forward;
|
||||
public float3 Force;
|
||||
public float Range;
|
||||
public int Damage;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using System;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.Eventing.Reader;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using Unity.Mathematics;
|
||||
|
||||
namespace BITFALL.Player.Movement
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ using System.ComponentModel.Design;
|
|||
#if NET5_0_OR_GREATER
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
#endif
|
||||
namespace BITKit.Core.Entites
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
/// <summary>
|
||||
/// 基本实体
|
||||
|
|
@ -18,19 +18,27 @@ namespace BITKit.Core.Entites
|
|||
bool RegisterComponent<T>(T component);
|
||||
IServiceProvider ServiceProvider { get; }
|
||||
void Inject(object obj);
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 基本实体组件
|
||||
/// </summary>
|
||||
public interface IEntityComponent:IAwake,IStart
|
||||
public interface IEntityComponent
|
||||
{
|
||||
Type BaseType { get; }
|
||||
IEntity Entity { get; set; }
|
||||
#if NET5_0_OR_GREATER
|
||||
void BuildService(IServiceCollection serviceCollection);
|
||||
#endif
|
||||
}
|
||||
public interface IEntityBehavior:IEntityComponent
|
||||
{
|
||||
void Initialize(IEntity _entity);
|
||||
void OnAwake();
|
||||
void OnStart();
|
||||
void OnUpdate(float deltaTime);
|
||||
void OnFixedUpdate(float deltaTime);
|
||||
void OnLateUpdate(float deltaTime);
|
||||
void OnDestroyComponent();
|
||||
}
|
||||
/// <summary>
|
||||
/// 基本实体服务
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using BITKit.Animations;
|
|||
namespace BITKit.Entities
|
||||
{
|
||||
|
||||
public sealed class EntityAnimator : EntityComponent
|
||||
public sealed class EntityAnimator : EntityBehavior
|
||||
{
|
||||
[SerializeField] private UnityAnimator[] animators;
|
||||
[SerializeReference, SubclassSelector] private References[] animationKeyWords;
|
||||
|
|
@ -20,7 +20,7 @@ namespace BITKit.Entities
|
|||
}
|
||||
public override void OnStart()
|
||||
{
|
||||
entity.AddListener<string>(Constant.Animation.Play, Play);
|
||||
UnityEntity.AddListener<string>(Constant.Animation.Play, Play);
|
||||
}
|
||||
|
||||
private void Play(string animationName)
|
||||
|
|
@ -42,7 +42,7 @@ namespace BITKit.Entities
|
|||
animators.ForEach(x =>
|
||||
{
|
||||
if (x.isActiveAndEnabled)
|
||||
x.animator.SetBool(boolPar, entity.Get<bool>(boolPar));
|
||||
x.animator.SetBool(boolPar, UnityEntity.Get<bool>(boolPar));
|
||||
});
|
||||
}
|
||||
foreach (var floatPar in floatParameters)
|
||||
|
|
@ -50,7 +50,7 @@ namespace BITKit.Entities
|
|||
animators.ForEach(x =>
|
||||
{
|
||||
if (x.isActiveAndEnabled)
|
||||
x.animator.SetFloat(floatPar, entity.Get<float>(floatPar));
|
||||
x.animator.SetFloat(floatPar, UnityEntity.Get<float>(floatPar));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -58,14 +58,14 @@ namespace BITKit.Entities
|
|||
private void OnAnimatorMove()
|
||||
{
|
||||
if (enabled is false) return;
|
||||
if (_rootVelocity is not null && entity is not null)
|
||||
entity.Set(_rootVelocity, animators[0].animator.velocity);
|
||||
if (_rootVelocity is not null && UnityEntity is not null)
|
||||
UnityEntity.Set(_rootVelocity, animators[0].animator.velocity);
|
||||
}
|
||||
|
||||
// ReSharper disable once UnusedMember.Local
|
||||
private void AnimationEvent(string eventName)
|
||||
{
|
||||
entity.Invoke(Constant.Animation.OnEvent, eventName);
|
||||
UnityEntity.Invoke(Constant.Animation.OnEvent, eventName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,12 +4,12 @@ using UnityEngine;
|
|||
using BITKit.Sensors;
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class EntityAudioObject : EntityComponent, IAudioObject
|
||||
public class EntityAudioObject : EntityBehavior, IAudioObject
|
||||
{
|
||||
float volume;
|
||||
public override void OnStart()
|
||||
{
|
||||
entity.AddListener<AudioSO>(OnAuioSO);
|
||||
UnityEntity.AddListener<AudioSO>(OnAuioSO);
|
||||
}
|
||||
public override void OnFixedUpdate(float deltaTime)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using BITKit.Entities.Player;
|
|||
using UnityEngine;
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class EntityCamera : EntityPlayerComponent
|
||||
public class EntityCamera : EntityPlayerBehavior
|
||||
{
|
||||
[Header(Constant.Header.Components)]
|
||||
public Behaviour aliveCamera;
|
||||
|
|
@ -11,7 +11,7 @@ namespace BITKit.Entities
|
|||
[SerializeReference, SubclassSelector] public IReference _onSetAlive;
|
||||
public override void OnAwake()
|
||||
{
|
||||
var heal = entity.Get<IHealth>();
|
||||
var heal = UnityEntity.Get<IHealth>();
|
||||
heal.OnSetAlive += OnSetAlive;
|
||||
}
|
||||
private void OnSetAlive(bool alive)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ using UnityEngine;
|
|||
using UnityEngine.Rendering;
|
||||
namespace BITKit.Entities.Player.Character
|
||||
{
|
||||
public class EntityCharacter : EntityPlayerComponent
|
||||
public class EntityCharacter : EntityPlayerBehavior
|
||||
{
|
||||
[Header(Constant.Header.Components)]
|
||||
[SerializeField] private Renderer[] fpvRenderer = Array.Empty<Renderer>();
|
||||
|
|
@ -13,7 +13,7 @@ namespace BITKit.Entities.Player.Character
|
|||
[SerializeReference, SubclassSelector] public References _getDamage;
|
||||
public override void OnStart()
|
||||
{
|
||||
var heal = entity.Get<IHealth>();
|
||||
var heal = UnityEntity.Get<IHealth>();
|
||||
heal.OnSetAlive += OnSetAlive;
|
||||
heal.OnSetHealthPoint += OnSetHP;
|
||||
}
|
||||
|
|
@ -33,7 +33,7 @@ namespace BITKit.Entities.Player.Character
|
|||
}
|
||||
private void OnSetHP(int hp)
|
||||
{
|
||||
entity.Invoke<string>(Constant.Animation.Play, _getDamage);
|
||||
UnityEntity.Invoke<string>(Constant.Animation.Play, _getDamage);
|
||||
}
|
||||
private void SetFPV(bool isFpv)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using UnityEngine.InputSystem;
|
|||
|
||||
namespace BITKit
|
||||
{
|
||||
public class NavAgentMovement: StateBasedComponent<IEntityMovementState>,IEntityMovement
|
||||
public class NavAgentMovement: StateBasedBehavior<IEntityMovementState>,IEntityMovement
|
||||
{
|
||||
#region 属性
|
||||
[SerializeField] private NavMeshAgent agent;
|
||||
|
|
@ -67,8 +67,8 @@ namespace BITKit
|
|||
GroundVelocity = _groundVelocity;
|
||||
IsGrounded = agent.isOnOffMeshLink is false;
|
||||
|
||||
entity.Set<bool>("IsMoving",Velocity.sqrMagnitude>=0.16f);
|
||||
entity.Set<float>("SqrMagnitude",Velocity.sqrMagnitude);
|
||||
UnityEntity.Set<bool>("IsMoving",Velocity.sqrMagnitude>=0.16f);
|
||||
UnityEntity.Set<float>("SqrMagnitude",Velocity.sqrMagnitude);
|
||||
|
||||
if (!isDead) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using UnityEngine.InputSystem;
|
|||
|
||||
namespace BITKit.Entities.Movement
|
||||
{
|
||||
public class RigidbodyBasedMovement : StateBasedComponent<IEntityMovementState>,IEntityMovement
|
||||
public class RigidbodyBasedMovement : StateBasedBehavior<IEntityMovementState>,IEntityMovement
|
||||
{
|
||||
[SerializeField] private new Rigidbody rigidbody;
|
||||
[SerializeField] private Animator animator;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit
|
||||
{
|
||||
public class AutoHealComponent : EntityComponent,IDamageCallback
|
||||
public class AutoHealBehavior : EntityBehavior,IDamageCallback
|
||||
{
|
||||
[SerializeField] private IntervalUpdate healDelayInterval;
|
||||
[SerializeField] private IntervalUpdate healInterval;
|
||||
|
|
@ -16,12 +16,10 @@ namespace BITKit
|
|||
private IHealth _health;
|
||||
public override void OnStart()
|
||||
{
|
||||
_health = entity.Get<IHealth>();
|
||||
_health = UnityEntity.Get<IHealth>();
|
||||
|
||||
_health.OnSetAlive += OnSetAlive;
|
||||
_health.OnSetHealthPoint += OnSetHP;
|
||||
|
||||
entity.RegisterCallback<IDamageCallback>(this);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit
|
||||
{
|
||||
public class AutoRespawnComponent : EntityComponent,IAction
|
||||
public class AutoRespawnBehavior : EntityBehavior,IAction
|
||||
{
|
||||
[SerializeField] private IntervalUpdate respawnInterval;
|
||||
private bool requestRespawn;
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@ namespace BITKit.Entities
|
|||
}
|
||||
public record DamageMessage
|
||||
{
|
||||
public IEntity Initiator;
|
||||
public IEntity Target;
|
||||
public IUnityEntity Initiator;
|
||||
public IUnityEntity Target;
|
||||
public bool RawDamage;
|
||||
public int Damage;
|
||||
public IDamagable Hit;
|
||||
|
|
@ -75,7 +75,7 @@ namespace BITKit.Entities
|
|||
}
|
||||
public interface IDamagable
|
||||
{
|
||||
IEntity Entity { get; }
|
||||
IUnityEntity UnityEntity { get; }
|
||||
Rigidbody Rigidbody { get; }
|
||||
void GiveDamage(DamageMessage message);
|
||||
}
|
||||
|
|
@ -99,11 +99,6 @@ namespace BITKit.Entities
|
|||
damageMessage.Initiator?.Invoke(damageMessage);
|
||||
damageMessage.Target?.Invoke(damageMessage);
|
||||
|
||||
foreach (var x in damageMessage.Target?.GetCallbacks<IDamageCallback>()!)
|
||||
{
|
||||
x.OnGetDamage(damageMessage);
|
||||
}
|
||||
|
||||
OnEntityDamaged?.Invoke(damageMessage);
|
||||
if (heal.IsAlive is false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace BITKit.Entities
|
|||
bool IsAlive { get; }
|
||||
}
|
||||
[CustomType(typeof(IHealth))]
|
||||
public class EntityHealth : EntityComponent, IHealth
|
||||
public class EntityHealth : EntityBehavior, IHealth
|
||||
{
|
||||
[Header(Constant.Header.Settings)]
|
||||
[SerializeField] private int healthPoint = 100;
|
||||
|
|
@ -49,7 +49,7 @@ namespace BITKit.Entities
|
|||
public bool IsAlive { get; private set; }
|
||||
public override void OnAwake()
|
||||
{
|
||||
entity.AddListener<DamageMessage>(OnGetDamage);
|
||||
UnityEntity.AddListener<DamageMessage>(OnGetDamage);
|
||||
}
|
||||
|
||||
public override void OnStart()
|
||||
|
|
@ -83,7 +83,7 @@ namespace BITKit.Entities
|
|||
|
||||
private void OnGetDamage(DamageMessage damageMessage)
|
||||
{
|
||||
if (damageMessage.Target != entity) return;
|
||||
if (damageMessage.Target != UnityEntity) return;
|
||||
if (IsAlive is false) return;
|
||||
var damage = damageMessage.Damage;
|
||||
foreach (var x in OnDamageFactory.CastAsFunc().Reverse())
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using UnityEngine.Events;
|
|||
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class GetDamageComponent : EntityComponent
|
||||
public class GetDamageBehavior : EntityBehavior
|
||||
{
|
||||
private readonly Queue<DamageMessage> DamageMessages = new();
|
||||
[SerializeField] private UnityEvent<DamageMessage> onGetDamage;
|
||||
|
|
@ -17,11 +17,11 @@ namespace BITKit.Entities
|
|||
private IDamageCallback[] callbacks;
|
||||
public override void OnAwake()
|
||||
{
|
||||
entity.AddListener<DamageMessage>(OnGetDamage);
|
||||
UnityEntity.AddListener<DamageMessage>(OnGetDamage);
|
||||
}
|
||||
private void OnGetDamage(DamageMessage obj)
|
||||
{
|
||||
if (obj.Target != entity) return;
|
||||
if (obj.Target != UnityEntity) return;
|
||||
DamageMessages.Enqueue(obj);
|
||||
onGetDamage?.Invoke(obj);
|
||||
foreach (var x in callbacks)
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ using UnityEngine;
|
|||
using BITKit;
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class EntityHitbox : EntityComponent,IDamagable
|
||||
public class EntityHitbox : EntityBehavior,IDamagable
|
||||
{
|
||||
IEntity IDamagable.Entity => entity;
|
||||
IUnityEntity IDamagable.UnityEntity => UnityEntity;
|
||||
public Rigidbody Rigidbody => m_rigidbody;
|
||||
public void GiveDamage(DamageMessage message)
|
||||
{
|
||||
entity.Invoke(message);
|
||||
UnityEntity.Invoke(message);
|
||||
}
|
||||
[SerializeField]private Rigidbody m_rigidbody;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using UnityEngine.UIElements;
|
|||
|
||||
namespace BITKit.Entities.InputSystem
|
||||
{
|
||||
public class EntityInputSystem : EntityComponent
|
||||
public class EntityInputSystem : EntityBehavior
|
||||
{
|
||||
protected readonly InputActionGroup inputActionGroup = new()
|
||||
{
|
||||
|
|
@ -24,7 +24,7 @@ namespace BITKit.Entities.InputSystem
|
|||
public override void Initialize(IEntity _entity)
|
||||
{
|
||||
base.Initialize(_entity);
|
||||
_entity.AddService(inputActionGroup);
|
||||
UnityEntity.AddService(inputActionGroup);
|
||||
}
|
||||
|
||||
public override void OnAwake()
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using UnityEngine.InputSystem.Interactions;
|
|||
namespace BITKit.Entities.Player
|
||||
{
|
||||
[CustomType(typeof(ISelector))]
|
||||
public class EntityInteractive : EntityPlayerComponent,ISelector
|
||||
public class EntityInteractive : EntityPlayerBehavior,ISelector
|
||||
{
|
||||
[Header(Constant.Header.Settings)]
|
||||
[SerializeReference, SubclassSelector] private ISensor sensor;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using UnityEngine.Events;
|
|||
using Cysharp.Threading.Tasks;
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class EntityLocomotion : EntityComponent
|
||||
public class EntityLocomotion : EntityBehavior
|
||||
{
|
||||
[Header(Constant.Header.Settings)]
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ using UnityEngine;
|
|||
namespace BITKit.Entities
|
||||
{
|
||||
[CustomType(typeof(IEntityPhysics))]
|
||||
public class EntityPhysics : EntityComponent,IEntityPhysics
|
||||
public class EntityPhysics : EntityBehavior,IEntityPhysics
|
||||
{
|
||||
[SerializeField] private Animator animator;
|
||||
[SerializeField] private Rigidbody[] rigidbodies;
|
||||
|
|
@ -29,7 +29,7 @@ namespace BITKit.Entities
|
|||
{
|
||||
_health.OnSetAlive += OnSetAlive;
|
||||
_health.OnSetHealthPoint += OnSetHP;
|
||||
_cancellationToken = entity.Get<CancellationToken>();
|
||||
_cancellationToken = UnityEntity.Get<CancellationToken>();
|
||||
foreach (var x in joints)
|
||||
{
|
||||
switch (x)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using UnityEngine;
|
|||
namespace BITKit.Entities.Slot
|
||||
{
|
||||
[CustomType(typeof(IEntitySlot<Transform>))]
|
||||
public sealed class UnityEntitySlot : EntityComponent, IEntitySlot<Transform>
|
||||
public sealed class UnityEntitySlot : EntityBehavior, IEntitySlot<Transform>
|
||||
{
|
||||
[SerializeField] private SerializedDictionary<string,Transform> dictionary = new();
|
||||
public IDictionary<string, Transform> Slots => dictionary;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class SlotComponent : EntityComponent
|
||||
public class SlotBehavior : EntityBehavior
|
||||
{
|
||||
public SerializedDictionary<string,Transform> slots;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using UnityEngine;
|
|||
|
||||
namespace BITKit.Entities.VFX
|
||||
{
|
||||
public class EntityVFXPlayer : EntityComponent
|
||||
public class EntityVFXPlayer : EntityBehavior
|
||||
{
|
||||
[SerializeReference,SubclassSelector] private IReference[] vfxReferences;
|
||||
[SerializeField] private VFXPlayer vfxPlayer;
|
||||
|
|
@ -14,7 +14,7 @@ namespace BITKit.Entities.VFX
|
|||
{
|
||||
base.OnAwake();
|
||||
keyWords.AddRange(vfxReferences.Select(x=>x.Value));
|
||||
entity.AddListener<string>(Constant.Animation.Play, Play);
|
||||
UnityEntity.AddListener<string>(Constant.Animation.Play, Play);
|
||||
}
|
||||
|
||||
private void Play(string animationName)
|
||||
|
|
|
|||
|
|
@ -5,29 +5,27 @@ using System.Linq;
|
|||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using BITKit.Core.Entites;
|
||||
using BITKit.Entities;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using UnityEngine.UIElements;
|
||||
// ReSharper disable RedundantTypeArgumentsOfMethod
|
||||
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public class Entity : MonoBehaviour, IEntity
|
||||
public class Entity : MonoBehaviour, IUnityEntity
|
||||
{
|
||||
private readonly GenericEvent genericEvent = new();
|
||||
private readonly Processor processor = new();
|
||||
public IEntityComponent[] entityComponents { get; set; }
|
||||
public ulong Id { get; private set; }
|
||||
public CancellationToken CancellationToken => _cancellationToken;
|
||||
public CancellationToken CancellationToken { get; private set; }
|
||||
public IEntityBehavior[] Behaviors { get;private set; }
|
||||
public IEntityComponent[] Components => Behaviors.Cast<IEntityComponent>().ToArray();
|
||||
|
||||
Core.Entites.IEntityComponent[] Core.Entites.IEntity.Components => _components;
|
||||
|
||||
bool Core.Entites.IEntity.RegisterComponent<T>(T component)
|
||||
bool Entities.IEntity.RegisterComponent<T>(T component)
|
||||
{
|
||||
throw new InvalidOperationException("Unity Entity can't register component");
|
||||
}
|
||||
|
||||
IServiceProvider Core.Entites.IEntity.ServiceProvider=> throw new InvalidOperationException("Unity Entity can't register component");
|
||||
IServiceProvider Entities.IEntity.ServiceProvider=> throw new InvalidOperationException("Unity Entity can't register component");
|
||||
public void Inject(object obj)
|
||||
{
|
||||
foreach (var fieldInfo in obj
|
||||
|
|
@ -44,7 +42,7 @@ namespace BITKit.Entities
|
|||
{
|
||||
case null:
|
||||
break;
|
||||
case Core.Entites.IEntityComponent entityComponent:
|
||||
case Entities.IEntityComponent entityComponent:
|
||||
if(entityComponent.Entity.Id == Id)
|
||||
continue;
|
||||
break;
|
||||
|
|
@ -84,17 +82,14 @@ namespace BITKit.Entities
|
|||
genericEvent.SetDirect(type.FullName,service);
|
||||
}
|
||||
|
||||
private CancellationToken _cancellationToken;
|
||||
private bool isInitialized;
|
||||
private Core.Entites.IEntityComponent[] _components => entityComponents.Cast<Core.Entites.IEntityComponent>().ToArray();
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Id = (ulong)Guid.NewGuid().GetHashCode();
|
||||
_cancellationToken = gameObject.GetCancellationTokenOnDestroy();
|
||||
Set(_cancellationToken);
|
||||
entityComponents = GetComponentsInChildren<IEntityComponent>(true).Distinct().ToArray();
|
||||
|
||||
CancellationToken = gameObject.GetCancellationTokenOnDestroy();
|
||||
Set(CancellationToken);
|
||||
Behaviors = GetComponentsInChildren<IEntityBehavior>(true).Distinct().ToArray();
|
||||
UnityEntitiesService.Register(this);
|
||||
}
|
||||
private void Start()
|
||||
|
|
@ -102,7 +97,7 @@ namespace BITKit.Entities
|
|||
try
|
||||
{
|
||||
var monoBehaviours = GetComponentsInChildren<MonoBehaviour>(true);
|
||||
entityComponents.ForEach(x => x.Initialize(this));
|
||||
Behaviors.ForEach(x => x.Initialize(this));
|
||||
foreach (var x in monoBehaviours)
|
||||
{
|
||||
foreach (var att in x
|
||||
|
|
@ -123,8 +118,8 @@ namespace BITKit.Entities
|
|||
}
|
||||
|
||||
|
||||
entityComponents.ForEach(x => x.OnAwake());
|
||||
entityComponents.ForEach(x => x.OnStart());
|
||||
Behaviors.ForEach(x => x.OnAwake());
|
||||
Behaviors.ForEach(x => x.OnStart());
|
||||
isInitialized = true;
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -138,21 +133,21 @@ namespace BITKit.Entities
|
|||
{
|
||||
if (isInitialized)
|
||||
{
|
||||
entityComponents.ForEach(x => x.OnDestroyComponent());
|
||||
Behaviors.ForEach(x => x.OnDestroyComponent());
|
||||
}
|
||||
UnityEntitiesService.UnRegister(this);
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
entityComponents.ForEach(x => x.OnUpdate(Time.deltaTime));
|
||||
Behaviors.ForEach(x => x.OnUpdate(Time.deltaTime));
|
||||
}
|
||||
private void FixedUpdate()
|
||||
{
|
||||
entityComponents.ForEach(x => x.OnFixedUpdate(Time.fixedDeltaTime));
|
||||
Behaviors.ForEach(x => x.OnFixedUpdate(Time.fixedDeltaTime));
|
||||
}
|
||||
private void LateUpdate()
|
||||
{
|
||||
entityComponents.ForEach(x => x.OnLateUpdate(Time.deltaTime));
|
||||
Behaviors.ForEach(x => x.OnLateUpdate(Time.deltaTime));
|
||||
}
|
||||
public void AddListener<T>(Action<T> action) => genericEvent.AddListener<T>(action);
|
||||
public void Invoke<T>(T value) => genericEvent.Invoke<T>(value);
|
||||
|
|
@ -171,42 +166,6 @@ namespace BITKit.Entities
|
|||
}
|
||||
public void Set<T>(T value) => genericEvent.Set<T>(value);
|
||||
public void Set<T>(string key = Constant.System.Internal, T value = default) => genericEvent.Set<T>(key, value);
|
||||
public T GetContext<T>(T value = default) => processor.GetContext<T>(value);
|
||||
public void AddProcessor<T>(Func<T, T> func) => processor.AddProcessor<T>(func);
|
||||
public void RemoveProcessor<T>(Func<T, T> func) => processor.RemoveProcessor<T>(func);
|
||||
public T GetContext<T>(string key, T value) => processor.GetContext<T>(value);
|
||||
public void AddProcessor<T>(string key, Func<T, T> func) => processor.AddProcessor<T>(key, func);
|
||||
public void RemoveProcessor<T>(string key, Func<T, T> func) => processor.RemoveProcessor<T>(key, func);
|
||||
|
||||
public void RegisterCallback<T>(T t)
|
||||
{
|
||||
var value = GetCallbacks<T>() as List<T>;
|
||||
value!.Add(t);
|
||||
}
|
||||
|
||||
public void UnRegisterCallback<T>(T t)
|
||||
{
|
||||
var value = GetCallbacks<T>() as List<T>;
|
||||
value!.Remove(t);
|
||||
}
|
||||
|
||||
public IEnumerable<T> GetCallbacks<T>()
|
||||
{
|
||||
var value = Get<List<T>>(nameof(ICallback)).CreateOrAddIfEmety(() =>
|
||||
{
|
||||
List<T> newList = new();
|
||||
Set<List<T>>(nameof(ICallback), newList);
|
||||
|
||||
return newList;
|
||||
});
|
||||
if (value is null)
|
||||
{
|
||||
Debug.LogWarning("List is Null");
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#if UNITY_EDITOR
|
||||
[UnityEditor.CustomEditor(typeof(Entity))]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
using System;
|
||||
using BITKit.Entities;
|
||||
#if UNITY_EDITOR
|
||||
using UnityEditor;
|
||||
#endif
|
||||
using UnityEngine;
|
||||
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public abstract class EntityBehavior : MonoBehaviour, IEntityBehavior
|
||||
{
|
||||
public IEntity Entity { get; set; }
|
||||
public IUnityEntity UnityEntity { get; private set; }
|
||||
protected Transform Transform { get; private set; }
|
||||
private IUnityEntity _mUnityEntity;
|
||||
public virtual void Initialize(IEntity _entity)
|
||||
{
|
||||
Transform = transform;
|
||||
UnityEntity = _entity as IUnityEntity;
|
||||
Entity = _entity;
|
||||
}
|
||||
public virtual void OnAwake() { }
|
||||
public virtual void OnStart() { }
|
||||
public virtual void OnUpdate(float deltaTime) { }
|
||||
public virtual void OnFixedUpdate(float deltaTime) { }
|
||||
public virtual void OnLateUpdate(float deltaTime) { }
|
||||
public virtual void OnDestroyComponent() { }
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
[CanEditMultipleObjects]
|
||||
[CustomEditor(typeof(EntityBehavior), true)]
|
||||
public class EntityComponentInspector : BITInspector<EntityBehavior>
|
||||
{
|
||||
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
using System;
|
||||
#if UNITY_EDITOR
|
||||
using UnityEditor;
|
||||
#endif
|
||||
using UnityEngine;
|
||||
|
||||
namespace BITKit.Entities
|
||||
{
|
||||
public interface IEntityComponent:BITKit.Core.Entites.IEntityComponent
|
||||
{
|
||||
IEntity entity { get; }
|
||||
void Initialize(IEntity _entity);
|
||||
void OnUpdate(float deltaTime);
|
||||
void OnFixedUpdate(float deltaTime);
|
||||
void OnLateUpdate(float deltaTime);
|
||||
void OnDestroyComponent();
|
||||
}
|
||||
public abstract class EntityComponent : MonoBehaviour, IEntityComponent
|
||||
{
|
||||
public IEntity entity { get; private set; }
|
||||
protected Transform Transform { get; private set; }
|
||||
private IEntity mEntity;
|
||||
public virtual void Initialize(IEntity _entity)
|
||||
{
|
||||
Transform = transform;
|
||||
entity = _entity;
|
||||
Entity = _entity;
|
||||
}
|
||||
public virtual void OnAwake() { }
|
||||
public virtual void OnStart() { }
|
||||
public virtual void OnUpdate(float deltaTime) { }
|
||||
public virtual void OnFixedUpdate(float deltaTime) { }
|
||||
public virtual void OnLateUpdate(float deltaTime) { }
|
||||
public virtual void OnDestroyComponent() { }
|
||||
public virtual Type BaseType => GetType();
|
||||
public Core.Entites.IEntity Entity { get; set; }
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
[CanEditMultipleObjects]
|
||||
[CustomEditor(typeof(EntityComponent), true)]
|
||||
public class EntityComponentInspector : BITInspector<EntityComponent>
|
||||
{
|
||||
|
||||
}
|
||||
#endif
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue