Merge remote-tracking branch 'origin/dev' into jason

# Conflicts:
#	Assets/Scripts/MinionThrower.cs
This commit is contained in:
Jason Durand 01 2022-04-02 22:38:17 -04:00
commit 4c73354230
27 changed files with 1916 additions and 38 deletions

8
Assets/Animations.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 88f467c03e358f446a21c72d9b060491
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Attack
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6543683806485202196, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- time: 0.083333336
value: {fileID: 4031765538473228261, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- time: 0.16666667
value: {fileID: 1518346569251276849, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- time: 0.25
value: {fileID: 6544159311391134502, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- time: 0.33333334
value: {fileID: -8205635420568287911, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- time: 0.41666666
value: {fileID: 5365348509512086814, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 6543683806485202196, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- {fileID: 4031765538473228261, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- {fileID: 1518346569251276849, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- {fileID: 6544159311391134502, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- {fileID: -8205635420568287911, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
- {fileID: 5365348509512086814, guid: 0134d103fd01cbb4a9407da76f2daf38, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ddcf9bb353c9c4d47a8039bafe02f9fe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 3702383623512059768, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- time: 0.083333336
value: {fileID: -5654833299211097151, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- time: 0.16666667
value: {fileID: -5921645933360183524, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- time: 0.25
value: {fileID: 8654194646291298362, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 3702383623512059768, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- {fileID: -5654833299211097151, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- {fileID: -5921645933360183524, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
- {fileID: 8654194646291298362, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 61b11279060f6df438f0bd2769d58b34
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Jump
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -7468276728048604513, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- time: 0.083333336
value: {fileID: -1528968483713605751, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- time: 0.16666667
value: {fileID: 2065613693219613588, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- time: 0.25
value: {fileID: -3797278990935530344, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- time: 0.33333334
value: {fileID: 7556587491855275688, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -7468276728048604513, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- {fileID: -1528968483713605751, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- {fileID: 2065613693219613588, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- {fileID: -3797278990935530344, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
- {fileID: 7556587491855275688, guid: ba3c8bf101b0f4e46a24625686b9d8b3, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.41666666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6081abad32f1da64084a85d651dfd209
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Run
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -6340975805839830933, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.083333336
value: {fileID: -3991298745443165112, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.16666667
value: {fileID: 7677731886197083832, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.25
value: {fileID: 7380437498476750783, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.33333334
value: {fileID: -3646713291993161854, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.41666666
value: {fileID: 1157674346292121983, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.5
value: {fileID: -150065627806584677, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.5833333
value: {fileID: -5231704881271510533, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.6666667
value: {fileID: -6552776000313715405, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.75
value: {fileID: -7729537411479187167, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.8333333
value: {fileID: 6088148169649431297, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- time: 0.9166667
value: {fileID: -6368970444911176205, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -6340975805839830933, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -3991298745443165112, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: 7677731886197083832, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: 7380437498476750783, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -3646713291993161854, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: 1157674346292121983, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -150065627806584677, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -5231704881271510533, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -6552776000313715405, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -7729537411479187167, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: 6088148169649431297, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
- {fileID: -6368970444911176205, guid: e6b362c4d802d0743ab23bf4245762ed, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 23582e0d506936f43bd9c9738c2d3e57
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,171 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8762590617882576649
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Run
m_Speed: 0.7
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 23582e0d506936f43bd9c9738c2d3e57, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3236591453607994996
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Attack
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ddcf9bb353c9c4d47a8039bafe02f9fe, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: gothic-hero-idle_0
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Running
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: Jumping
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 7441066829095555691}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &3716416650148016836
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Idle
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 61b11279060f6df438f0bd2769d58b34, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &7441066829095555691
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 3716416650148016836}
m_Position: {x: 280, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -8762590617882576649}
m_Position: {x: 560, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: 9170910376667220155}
m_Position: {x: 560, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -3236591453607994996}
m_Position: {x: 560, y: 210, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 3716416650148016836}
--- !u!1102 &9170910376667220155
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player_Jump
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6081abad32f1da64084a85d651dfd209, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d7fe0a51deaa82646922ea4078686686
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -35,6 +35,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6528577097862060148}
- {fileID: 5561158611004983940} - {fileID: 5561158611004983940}
- {fileID: 8877496746214907228} - {fileID: 8877496746214907228}
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -122,7 +123,7 @@ SpriteRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1214567908930553593} m_GameObject: {fileID: 1214567908930553593}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -390,8 +391,110 @@ Transform:
m_Children: m_Children:
- {fileID: 8093247208668955472} - {fileID: 8093247208668955472}
m_Father: {fileID: 1214567908930553594} m_Father: {fileID: 1214567908930553594}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6851233285413272648
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6528577097862060148}
- component: {fileID: 3061273954050112714}
- component: {fileID: 1480599567555890603}
m_Layer: 0
m_Name: Character Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6528577097862060148
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6851233285413272648}
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_Children: []
m_Father: {fileID: 1214567908930553594}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3061273954050112714
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6851233285413272648}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 3702383623512059768, guid: bcdcace2f1ba9e24ea8824f428055c03, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.1875, y: 1.5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &1480599567555890603
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6851233285413272648}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: d7fe0a51deaa82646922ea4078686686, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &8736979949924850885 --- !u!1 &8736979949924850885
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -483,7 +586,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3} - target: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3} - target: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

View File

@ -204,6 +204,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} m_CorrespondingSourceObject: {fileID: 1214567908930553594, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
m_PrefabInstance: {fileID: 1942557562} m_PrefabInstance: {fileID: 1942557562}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &836972483 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 344214379, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
m_PrefabInstance: {fileID: 1551362086}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a53670f9cd399ea4a8ae3ed81b923aa8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1359990804 --- !u!1001 &1359990804
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -211,10 +222,14 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
propertyPath: gameFlowManager propertyPath: gameTimer
value: value:
objectReference: {fileID: 1359990806} objectReference: {fileID: 836972483}
- target: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
propertyPath: startPrompt
value:
objectReference: {fileID: 1551362088}
- target: {fileID: 4164153230343464235, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} - target: {fileID: 4164153230343464235, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
propertyPath: globalCamera propertyPath: globalCamera
value: value:
@ -269,30 +284,17 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
--- !u!1 &1359990805 stripped --- !u!114 &1359990806 stripped
GameObject: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9196727425507610131, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3} m_CorrespondingSourceObject: {fileID: 1359990806, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
m_PrefabInstance: {fileID: 1359990804} m_PrefabInstance: {fileID: 1359990804}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &1359990806 m_GameObject: {fileID: 0}
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359990805}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3} m_Script: {fileID: 11500000, guid: e3fecdc4a8b2cb4419ef9d03180d130d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
<Paused>k__BackingField: 1
startPrompt: {fileID: 1551362088}
--- !u!1 &1408196689 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 763564871199756608, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
m_PrefabInstance: {fileID: 1551362086}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1464970062 stripped --- !u!114 &1464970062 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} m_CorrespondingSourceObject: {fileID: 1878107874314509256, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
@ -425,6 +427,11 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1844274959428875625, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3} m_CorrespondingSourceObject: {fileID: 1844274959428875625, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
m_PrefabInstance: {fileID: 1551362086} m_PrefabInstance: {fileID: 1551362086}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1551362089 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 763564871199756608, guid: e1dac4f28fe75a547b919b7aa8240fed, type: 3}
m_PrefabInstance: {fileID: 1551362086}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1557338110 stripped --- !u!1 &1557338110 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3} m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
@ -585,10 +592,14 @@ PrefabInstance:
propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName propertyPath: m_ActionEvents.Array.data[16].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: globalCamera
value:
objectReference: {fileID: 1557338110}
- target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: safeZonePrompt propertyPath: safeZonePrompt
value: value:
objectReference: {fileID: 1408196689} objectReference: {fileID: 1551362089}
- target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager propertyPath: gameFlowManager
value: value:
@ -641,14 +652,30 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1214567908930553595, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager
value:
objectReference: {fileID: 1359990806}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: healthBar propertyPath: healthBar
value: value:
objectReference: {fileID: 1464970062} objectReference: {fileID: 1464970062}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: playerStats
value:
objectReference: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager propertyPath: gameFlowManager
value: value:
objectReference: {fileID: 1359990806} objectReference: {fileID: 1359990806}
- target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: <Health>k__BackingField
value: 100
objectReference: {fileID: 0}
m_RemovedComponents: m_RemovedComponents:
- {fileID: 7731321959366517533, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} - {fileID: 7731321959366517533, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ccd4cfe319c2d4d44b71ae684428bd43 guid: 1934b8286f8f97b4fa865f476cc97bde
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,6 +1,4 @@
#nullable enable #nullable enable
using System.Collections;
using System.Collections.Generic;
using NaughtyAttributes; using NaughtyAttributes;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
@ -61,7 +59,11 @@ public class MinionThrower : MonoBehaviour {
public void AimThrow(InputAction.CallbackContext context) { public void AimThrow(InputAction.CallbackContext context) {
throwDirection = context.ReadValue<Vector2>().normalized; throwDirection = context.ReadValue<Vector2>().normalized;
aimArrow.transform.rotation = Quaternion.FromToRotation(transform.right, throwDirection); if (vampireEntity.playerMovement.facingRight) {
aimArrow.transform.rotation = Quaternion.FromToRotation(Vector2.right, throwDirection);
} else {
aimArrow.transform.rotation = Quaternion.FromToRotation(Vector2.left, throwDirection);
}
} }
void PerformThrow() { void PerformThrow() {

View File

@ -19,6 +19,9 @@ public class PlayerMovement : MonoBehaviour {
Vector2 moveDirection; Vector2 moveDirection;
BaseState currentState = null!; BaseState currentState = null!;
SafeZone? safeZone; SafeZone? safeZone;
VampireEntity vampireEntity;
Animator animator;
public bool facingRight { get; private set; } = true;
bool lastJumpButton; bool lastJumpButton;
@ -28,6 +31,8 @@ public class PlayerMovement : MonoBehaviour {
void Awake() { void Awake() {
rb = GetComponent<Rigidbody2D>(); rb = GetComponent<Rigidbody2D>();
vampireEntity = GetComponent<VampireEntity>();
animator = GetComponentInChildren<Animator>();
currentState = new ImmobileMovementState(this); currentState = new ImmobileMovementState(this);
safeZonePrompt.SetActive(false); safeZonePrompt.SetActive(false);
} }
@ -63,6 +68,23 @@ public class PlayerMovement : MonoBehaviour {
#endregion #endregion
#region Flip
public void Flip() {
facingRight = !facingRight;
Vector3 scaler = transform.localScale;
scaler.x *= -1;
transform.localScale = scaler;
}
public void FlipAccordingToInput() {
if ((!facingRight && moveDirection.x > 0) || (facingRight && moveDirection.x < 0)) {
Flip();
}
}
#endregion
public SafeZone? GetSafeZoneIfImmobile() { public SafeZone? GetSafeZoneIfImmobile() {
return currentState is ImmobileMovementState ? safeZone : null; return currentState is ImmobileMovementState ? safeZone : null;
} }
@ -74,6 +96,7 @@ public class PlayerMovement : MonoBehaviour {
moveDirection = ctx.ReadValue<Vector2>(); moveDirection = ctx.ReadValue<Vector2>();
if (moveDirection.sqrMagnitude > 1.0f) if (moveDirection.sqrMagnitude > 1.0f)
moveDirection.Normalize(); moveDirection.Normalize();
FlipAccordingToInput();
}else //TODO Should set to zero via event or callback }else //TODO Should set to zero via event or callback
moveDirection = Vector2.zero; moveDirection = Vector2.zero;
} }
@ -133,9 +156,22 @@ public class PlayerMovement : MonoBehaviour {
class NormalMovementState : BaseStatePlayerMovement { class NormalMovementState : BaseStatePlayerMovement {
public NormalMovementState(PlayerMovement playerMovement) : base(playerMovement) {} public NormalMovementState(PlayerMovement playerMovement) : base(playerMovement) {}
public override void EnterState() {
// playerMovement.animator.SetBool("Running", true);
}
public override void LeaveState() {
// playerMovement.animator.SetBool("Running", false);
}
public override BaseState? FixedUpdateState() { public override BaseState? FixedUpdateState() {
playerMovement.rb.velocity = (Vector3)playerMovement.moveDirection * playerMovement.stats.movementSpeed; playerMovement.rb.velocity = (Vector3)playerMovement.moveDirection * playerMovement.stats.movementSpeed;
if(playerMovement.rb.velocity.magnitude > 0.01f) {
playerMovement.animator.Play("Player_Run");
} else {
playerMovement.animator.Play("Player_Idle");
}
return null; return null;
} }
} }
@ -155,6 +191,12 @@ public class PlayerMovement : MonoBehaviour {
public override void EnterState() { public override void EnterState() {
startPosition = playerMovement.transform.position; startPosition = playerMovement.transform.position;
startTime = Time.time; startTime = Time.time;
// playerMovement.animator.SetBool("Jumping", true);
playerMovement.animator.Play("Player_Jump");
}
public override void LeaveState() {
// playerMovement.animator.SetBool("Jumping", false);
playerMovement.animator.Play("Player_Idle");
} }
public override BaseState? FixedUpdateState() { public override BaseState? FixedUpdateState() {

View File

@ -7,7 +7,7 @@ public class VampireEntity : Entity {
// [SerializeField] [Required] // [SerializeField] [Required]
// HealthBar healthBar; // HealthBar healthBar;
PlayerMovement playerMovement; [HideInInspector] public PlayerMovement playerMovement;
protected override void Start() { protected override void Start() {
base.Start(); base.Start();

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ff1b4066aeeccc64089ac537a782c756
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f7d015fe0c8f97d449b91510e618e73a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -0,0 +1,264 @@
fileFormatVersion: 2
guid: 0134d103fd01cbb4a9407da76f2daf38
TextureImporter:
internalIDToNameTable:
- first:
213: 6543683806485202196
second: gothic-hero-attack_0
- first:
213: 4031765538473228261
second: gothic-hero-attack_1
- first:
213: 1518346569251276849
second: gothic-hero-attack_2
- first:
213: 6544159311391134502
second: gothic-hero-attack_3
- first:
213: -8205635420568287911
second: gothic-hero-attack_4
- first:
213: 5365348509512086814
second: gothic-hero-attack_5
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: gothic-hero-attack_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 415c60880c5dfca50800000000000000
internalID: 6543683806485202196
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-attack_1
rect:
serializedVersion: 2
x: 96
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5e7bb526565b3f730800000000000000
internalID: 4031765538473228261
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-attack_2
rect:
serializedVersion: 2
x: 192
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 138c7220920421510800000000000000
internalID: 1518346569251276849
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-attack_3
rect:
serializedVersion: 2
x: 288
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6239805a83681da50800000000000000
internalID: 6544159311391134502
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-attack_4
rect:
serializedVersion: 2
x: 384
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9550aa07f0abf1e80800000000000000
internalID: -8205635420568287911
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-attack_5
rect:
serializedVersion: 2
x: 480
y: 0
width: 96
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: e15b3a5ea0c857a40800000000000000
internalID: 5365348509512086814
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -0,0 +1,216 @@
fileFormatVersion: 2
guid: bcdcace2f1ba9e24ea8824f428055c03
TextureImporter:
internalIDToNameTable:
- first:
213: 3702383623512059768
second: gothic-hero-idle_0
- first:
213: -5654833299211097151
second: gothic-hero-idle_1
- first:
213: -5921645933360183524
second: gothic-hero-idle_2
- first:
213: 8654194646291298362
second: gothic-hero-idle_3
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: gothic-hero-idle_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 38
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 87fe8ad1a42816330800000000000000
internalID: 3702383623512059768
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-idle_1
rect:
serializedVersion: 2
x: 38
y: 0
width: 38
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1cbe870331ff581b0800000000000000
internalID: -5654833299211097151
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-idle_2
rect:
serializedVersion: 2
x: 76
y: 0
width: 38
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c170e68d56612dda0800000000000000
internalID: -5921645933360183524
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-idle_3
rect:
serializedVersion: 2
x: 114
y: 0
width: 38
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a38b74dcd20e91870800000000000000
internalID: 8654194646291298362
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -0,0 +1,240 @@
fileFormatVersion: 2
guid: ba3c8bf101b0f4e46a24625686b9d8b3
TextureImporter:
internalIDToNameTable:
- first:
213: -7468276728048604513
second: gothic-hero-jump_0
- first:
213: -1528968483713605751
second: gothic-hero-jump_1
- first:
213: 2065613693219613588
second: gothic-hero-jump_2
- first:
213: -3797278990935530344
second: gothic-hero-jump_3
- first:
213: 7556587491855275688
second: gothic-hero-jump_4
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: gothic-hero-jump_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 61
height: 77
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f9aa85c62e95b5890800000000000000
internalID: -7468276728048604513
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-jump_1
rect:
serializedVersion: 2
x: 61
y: 0
width: 61
height: 77
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 98f9b7fc34308cae0800000000000000
internalID: -1528968483713605751
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-jump_2
rect:
serializedVersion: 2
x: 122
y: 0
width: 61
height: 77
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 49ba98bb5b88aac10800000000000000
internalID: 2065613693219613588
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-jump_3
rect:
serializedVersion: 2
x: 183
y: 0
width: 61
height: 77
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 894eb3860ea5d4bc0800000000000000
internalID: -3797278990935530344
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-jump_4
rect:
serializedVersion: 2
x: 244
y: 0
width: 61
height: 77
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8a6913e89446ed860800000000000000
internalID: 7556587491855275688
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -0,0 +1,408 @@
fileFormatVersion: 2
guid: e6b362c4d802d0743ab23bf4245762ed
TextureImporter:
internalIDToNameTable:
- first:
213: -6340975805839830933
second: gothic-hero-run_0
- first:
213: -3991298745443165112
second: gothic-hero-run_1
- first:
213: 7677731886197083832
second: gothic-hero-run_2
- first:
213: 7380437498476750783
second: gothic-hero-run_3
- first:
213: -3646713291993161854
second: gothic-hero-run_4
- first:
213: 1157674346292121983
second: gothic-hero-run_5
- first:
213: -150065627806584677
second: gothic-hero-run_6
- first:
213: -5231704881271510533
second: gothic-hero-run_7
- first:
213: -6552776000313715405
second: gothic-hero-run_8
- first:
213: -7729537411479187167
second: gothic-hero-run_9
- first:
213: 6088148169649431297
second: gothic-hero-run_10
- first:
213: -6368970444911176205
second: gothic-hero-run_11
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: gothic-hero-run_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b60129bb9145008a0800000000000000
internalID: -6340975805839830933
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_1
rect:
serializedVersion: 2
x: 66
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 84cd56510fe0c98c0800000000000000
internalID: -3991298745443165112
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_2
rect:
serializedVersion: 2
x: 132
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8be877dd878cc8a60800000000000000
internalID: 7677731886197083832
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_3
rect:
serializedVersion: 2
x: 198
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fb7eda73dc49c6660800000000000000
internalID: 7380437498476750783
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_4
rect:
serializedVersion: 2
x: 264
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 28f5d010595446dc0800000000000000
internalID: -3646713291993161854
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_5
rect:
serializedVersion: 2
x: 330
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f7113503fa2e01010800000000000000
internalID: 1157674346292121983
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_6
rect:
serializedVersion: 2
x: 396
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: b90b7994b1cdaedf0800000000000000
internalID: -150065627806584677
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_7
rect:
serializedVersion: 2
x: 462
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bf9622611204567b0800000000000000
internalID: -5231704881271510533
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_8
rect:
serializedVersion: 2
x: 528
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 335989022fcdf05a0800000000000000
internalID: -6552776000313715405
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_9
rect:
serializedVersion: 2
x: 594
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 121d0b65daa2bb490800000000000000
internalID: -7729537411479187167
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_10
rect:
serializedVersion: 2
x: 660
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 10326eff0827d7450800000000000000
internalID: 6088148169649431297
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: gothic-hero-run_11
rect:
serializedVersion: 2
x: 726
y: 0
width: 66
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3f59b16ef1fdc97a0800000000000000
internalID: -6368970444911176205
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: