mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

룰 타일 파일 추가 및 몬스터 애니메이션 수정

Browse Source
This commit is contained in:
Mingu Kim
2025-02-07 14:25:45 +09:00
parent 828fb439e7
commit 860b4a0f09
5 changed files with 62 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Tiles/New Rule Tile.asset LFS Normal file
View File

Binary file not shown.

8
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_mingu/Tiles/New Rule Tile.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 06b7bea04e6a1ec41b8456495da92e05
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

253
Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Controller.controller
View File

@@ -22,31 +22,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-8324427415364973516
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Fire
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7991831788900291451}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1102 &-7991831788900291451
AnimatorState:
serializedVersion: 6
@@ -88,6 +63,31 @@ MonoBehaviour:
m_EditorClassIdentifier:
Continuous: 0
Active: 0
--- !u!1101 &-6758709151090677724
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Walk
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6342953676309033787}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6573913638171529319
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -124,34 +124,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
Continuous: 0
Active: 0
--- !u!1101 &-5096081901411044705
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Action
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Walk
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -56690746207215259}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1102 &-4838633882212068965
AnimatorState:
serializedVersion: 6
@@ -424,7 +396,8 @@ AnimatorState:
m_Name: Walking
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: -6758709151090677724}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -558,34 +531,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &2093058081499835153
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Action
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Ready
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4838633882212068965}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1107 &3007215386161293610
AnimatorStateMachine:
serializedVersion: 6
@@ -643,7 +588,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3270068045963234324
--- !u!1101 &3219202489512463615
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -651,42 +596,11 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Action
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Idle
m_ConditionEvent: Walk
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6342953676309033787}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1101 &3295697662574300128
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Action
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4602458092277031176}
m_DstState: {fileID: -56690746207215259}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
@@ -698,7 +612,7 @@ AnimatorStateTransition:
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
m_CanTransitionToSelf: 1
--- !u!1107 &3586348641808003577
AnimatorStateMachine:
serializedVersion: 6
@@ -710,35 +624,27 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6342953676309033787}
m_Position: {x: 200, y: 140, z: 0}
m_Position: {x: 500, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -56690746207215259}
m_Position: {x: 200, y: 240, z: 0}
m_Position: {x: 500, y: 160, z: 0}
- serializedVersion: 1
m_State: {fileID: 4602458092277031176}
m_Position: {x: 200, y: 290, z: 0}
m_Position: {x: 760, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -4838633882212068965}
m_Position: {x: 200, y: 190, z: 0}
m_Position: {x: 760, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 3188460960225426455}
m_Position: {x: 200, y: 340, z: 0}
m_Position: {x: 760, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: -136569306282141652}
m_Position: {x: 200, y: 390, z: 0}
m_Position: {x: 760, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: -7991831788900291451}
m_Position: {x: 200, y: 440, z: 0}
m_Position: {x: 760, y: 340, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 3270068045963234324}
- {fileID: 9163939847034252430}
- {fileID: -5096081901411044705}
- {fileID: 2093058081499835153}
- {fileID: 8013267777349193199}
- {fileID: 5102958025145475895}
- {fileID: 3295697662574300128}
- {fileID: -8324427415364973516}
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -801,31 +707,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5102958025145475895
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Die
m_EventTreshold: 9
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -136569306282141652}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1102 &6342953676309033787
AnimatorState:
serializedVersion: 6
@@ -836,7 +717,8 @@ AnimatorState:
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 3219202489512463615}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -874,56 +756,3 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8013267777349193199
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Attack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3188460960225426455}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0
--- !u!1101 &9163939847034252430
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Action
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Run
m_EventTreshold: 3
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4602458092277031176}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 0

12
Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Animation/Idle.anim
View File

@@ -7,7 +7,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
@@ -17,7 +17,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
@@ -72,6 +73,7 @@ AnimationClip:
path: Body
classID: 114
script: {fileID: 11500000, guid: ed8b1ae4e4e52b34ea557c1c11e076fc, type: 3}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -87,6 +89,8 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -109,7 +113,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
@@ -164,6 +169,7 @@ AnimationClip:
path: Body
classID: 114
script: {fileID: 11500000, guid: ed8b1ae4e4e52b34ea557c1c11e076fc, type: 3}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

2
Gameton-06/Assets/PixelFantasy/PixelMonsters/Common/Environment/Background.png.meta
View File

@@ -43,7 +43,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0