Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3481,11 +3481,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
Expand Down
69 changes: 52 additions & 17 deletions Assets/Prefabs/Character/Character.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ GameObject:
- component: {fileID: 4309865414312164521}
- component: {fileID: 753347877357705413}
- component: {fileID: -2014321709067566591}
- component: {fileID: 3884788294438199994}
m_Layer: 3
m_Name: Character
m_TagString: Player
Expand All @@ -36,13 +35,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4600110157238723790
MonoBehaviour:
Expand All @@ -56,13 +55,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 951099334
GlobalObjectIdHash: 3952140259
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &514105321093282895
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -75,6 +80,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
HitPoints:
m_InternalValue: 0
--- !u!114 &-5107732197415868221
Expand All @@ -89,6 +95,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_LifeState:
m_InternalValue: 0
--- !u!114 &7420593339233078707
Expand All @@ -103,6 +110,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_ClientCharacter: {fileID: 0}
m_CharacterClass: {fileID: 0}
m_BrainEnabled: 1
Expand All @@ -124,6 +132,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bc85fa0320dca1545a3e037ee46391cf, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_Transform: {fileID: 4600110157238723791}
m_DamageCollider: {fileID: 7679526581544062779}
--- !u!114 &350177175035117514
Expand All @@ -138,6 +147,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 162844b92fe5b9a469bf0cd049b43138, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_NetworkAnimator: {fileID: 0}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
m_NetworkLifeState: {fileID: -5107732197415868221}
Expand All @@ -148,10 +158,21 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
serializedVersion: 2
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
Expand Down Expand Up @@ -187,8 +208,17 @@ CapsuleCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Height: 2
m_Direction: 1
Expand All @@ -205,6 +235,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fdad0914904cc1e47933ecd7a58514ac, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_NavMeshAgent: {fileID: 745390554272530562}
m_Rigidbody: {fileID: 3375535791397456380}
m_CharLogic: {fileID: 7420593339233078707}
Expand All @@ -220,6 +251,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1da3998b52020a949af0999ab7ea2d14, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_NetworkLifeState: {fileID: -5107732197415868221}
--- !u!114 &-2014321709067566591
MonoBehaviour:
Expand All @@ -233,6 +265,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
NetworkTransformExpanded: 0
AutoOwnerAuthorityTickOffset: 1
PositionInterpolationType: 0
RotationInterpolationType: 0
ScaleInterpolationType: 0
PositionLerpSmoothing: 1
PositionMaxInterpolationTime: 0.1
RotationLerpSmoothing: 1
RotationMaxInterpolationTime: 0.1
ScaleLerpSmoothing: 1
ScaleMaxInterpolationTime: 0.1
AuthorityMode: 0
TickSyncChildren: 0
UseUnreliableDeltas: 0
SyncPositionX: 1
SyncPositionY: 0
SyncPositionZ: 1
Expand All @@ -249,18 +296,6 @@ MonoBehaviour:
UseQuaternionCompression: 0
UseHalfFloatPrecision: 1
InLocalSpace: 0
SwitchTransformSpaceWhenParented: 0
Interpolate: 1
SlerpPosition: 0
--- !u!114 &3884788294438199994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebe9bfd21e47445488dfd84b4e0c9884, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}
6 changes: 5 additions & 1 deletion Assets/Prefabs/Character/Enemy.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4600110157238723777, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
Expand All @@ -25,7 +26,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4600110157238723790, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
propertyPath: GlobalObjectIdHash
value: 951099334
value: 3885025524
objectReference: {fileID: 0}
- target: {fileID: 4600110157238723791, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
propertyPath: m_RootOrder
Expand Down Expand Up @@ -77,4 +78,7 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4600110157238723776, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
48 changes: 45 additions & 3 deletions Assets/Prefabs/Character/Imp.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3713729372785093434}
m_Modifications:
- target: {fileID: 234724737205816310, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 22100000, guid: 0406729e6e1c12e4d99fd34970073cd0, type: 2}
- target: {fileID: 2663813019036984750, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
propertyPath: m_ServerCharacter
value:
objectReference: {fileID: 7684320411818213958}
- target: {fileID: 3687104631385136546, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
Expand Down Expand Up @@ -63,11 +68,21 @@ PrefabInstance:
propertyPath: m_Name
value: ImpGraphics
objectReference: {fileID: 0}
- target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
propertyPath: m_ClientCharacter
value:
objectReference: {fileID: 3121817358174221070}
- target: {fileID: 8005647249789065143, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
propertyPath: m_ClientCharacterVisualization
value:
objectReference: {fileID: 3121817358174221070}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
insertIndex: -1
addedObject: {fileID: 5401475423617019972}
m_SourcePrefab: {fileID: 100100000, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
--- !u!95 &929086692793228630 stripped
Animator:
Expand Down Expand Up @@ -102,6 +117,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
TransitionStateInfoList: []
m_Animator: {fileID: 929086692793228630}
--- !u!4 &6486568539699693356 stripped
Transform:
Expand All @@ -113,6 +130,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1632591904850424414, guid: 64cfd098f62285f42918875fef849e88, type: 3}
Expand Down Expand Up @@ -145,7 +163,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: GlobalObjectIdHash
value: 951099334
value: 36723199
objectReference: {fileID: 0}
- target: {fileID: 3288448142974003546, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: PrefabHashGenerator
Expand Down Expand Up @@ -251,6 +269,10 @@ PrefabInstance:
propertyPath: m_CharacterClass
value:
objectReference: {fileID: 11400000, guid: fa81aca63f2fce545a3b9e046b6e42e7, type: 2}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_ClientCharacter
value:
objectReference: {fileID: 3121817358174221070}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_ClientVisualization
value:
Expand All @@ -272,6 +294,15 @@ PrefabInstance:
value: 0.8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3}
insertIndex: -1
addedObject: {fileID: 6486568539699693356}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3}
insertIndex: -1
addedObject: {fileID: -4570750241117365215}
m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
--- !u!114 &827948680237315002 stripped
MonoBehaviour:
Expand Down Expand Up @@ -301,12 +332,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cead4253912fb1241be383143c5f3b59, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_DisplayHealth: 1
m_DisplayName: 0
m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3}
m_NetworkNameState: {fileID: 0}
m_NetworkHealthState: {fileID: 827948680237315002}
m_ServerCharacter: {fileID: 0}
m_NetworkNameState: {fileID: 0}
m_BaseHP: {fileID: 11400000, guid: 95633dc134a4e654f863831b22b5681a, type: 2}
m_TransformToTrack: {fileID: 6486568539699693356}
m_VerticalWorldOffset: 2.2
Expand All @@ -327,3 +358,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7684320411818213958 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3713729372785093424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
m_Name:
m_EditorClassIdentifier:
Loading