Skip to content

@ #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
habhab783124-lab merged 1 commit into from
Aug 17, 2026
Merged

@ #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 62 additions & 62 deletions Assets/_Project/Animations/WorldMap/Pet/WorldMap_Angel.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8983452279626155002
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3374965236757566565}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-8793898082576282253
AnimatorState:
serializedVersion: 6
Expand Down Expand Up @@ -80,34 +52,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: MoveX
--- !u!1101 &-7029820672522954920
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4975955284834212668}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-4907151191012855178
AnimatorState:
serializedVersion: 6
Expand Down Expand Up @@ -186,7 +130,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3251496337918458992
--- !u!1101 &-3185639260217173797
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -199,9 +143,9 @@ AnimatorStateTransition:
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 1
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7605669637908777287}
m_DstState: {fileID: 4975955284834212668}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
Expand Down Expand Up @@ -240,6 +184,34 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-250936924014440635
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3374965236757566565}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -327,9 +299,9 @@ AnimatorStateMachine:
m_Position: {x: 515, y: 585, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -8983452279626155002}
- {fileID: -3251496337918458992}
- {fileID: -7029820672522954920}
- {fileID: -250936924014440635}
- {fileID: 5400307805128391734}
- {fileID: -3185639260217173797}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -416,6 +388,34 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5400307805128391734
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7605669637908777287}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7605669637908777287
AnimatorState:
serializedVersion: 6
Expand Down
66 changes: 33 additions & 33 deletions Assets/_Project/Animations/WorldMap/Pet/WorldMap_Devil.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6266501712395137589
--- !u!1101 &-6741747863922702262
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -54,7 +54,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6146152800680428912
--- !u!1101 &-4671927949691270546
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -82,34 +82,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4500504897296460661
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4289068101725393157}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-4051931200525463923
AnimatorState:
serializedVersion: 6
Expand Down Expand Up @@ -214,6 +186,34 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-660020394932837785
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: IsMoving
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: MoveDir
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4289068101725393157}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.08
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -324,9 +324,9 @@ AnimatorStateMachine:
m_Position: {x: 480, y: 520, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -6266501712395137589}
- {fileID: -6146152800680428912}
- {fileID: -4500504897296460661}
- {fileID: -6741747863922702262}
- {fileID: -4671927949691270546}
- {fileID: -660020394932837785}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
Expand Down
42 changes: 42 additions & 0 deletions Assets/_Project/Art/WorldMap/arrange/PlacementGrid.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PlacementGrid
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 0.42}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/_Project/Art/WorldMap/arrange/PlacementGrid.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading