Skip to content

Commit

Permalink
Add tilemap
Browse files Browse the repository at this point in the history
  • Loading branch information
kurushimee committed Aug 17, 2023
1 parent cba7954 commit 93e707f
Show file tree
Hide file tree
Showing 42 changed files with 41,913 additions and 8,204 deletions.
4 changes: 2 additions & 2 deletions .erp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<resetOnSceneChange>false</resetOnSceneChange>
<debugMode>false</debugMode>
<EditorClosed>true</EditorClosed>
<LastTimestamp>1692074912</LastTimestamp>
<LastSessionID>1781877937569200565</LastSessionID>
<LastTimestamp>1692309267</LastTimestamp>
<LastSessionID>3429039306050809504</LastSessionID>
<Errored>false</Errored>
</ERPSettings>
13 changes: 13 additions & 0 deletions .idea/.idea.MausTemple/.idea/.gitignore

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

4 changes: 4 additions & 0 deletions .idea/.idea.MausTemple/.idea/encodings.xml

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

8 changes: 8 additions & 0 deletions .idea/.idea.MausTemple/.idea/indexLayout.xml

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

6 changes: 6 additions & 0 deletions .idea/.idea.MausTemple/.idea/vcs.xml

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

8 changes: 8 additions & 0 deletions Assets/Animation.meta

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

53 changes: 53 additions & 0 deletions Assets/Animation/Player.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%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
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
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: []
8 changes: 8 additions & 0 deletions Assets/Animation/Player.anim.meta

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

72 changes: 72 additions & 0 deletions Assets/Animation/Sprite.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8396203507635348895
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Player
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: afcd25ac2d071e147a9a7ab596594429, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-1999808890205981249
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: -8396203507635348895}
m_Position: {x: 200, y: 0, 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: -8396203507635348895}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sprite
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -1999808890205981249}
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}
8 changes: 8 additions & 0 deletions Assets/Animation/Sprite.controller.meta

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

96 changes: 85 additions & 11 deletions Assets/Input/PlayerControls.inputactions
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Continue",
"type": "Button",
"id": "d2ed6995-11cc-434a-957c-7cf7ac867440",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -271,17 +262,100 @@
"action": "Exit",
"isComposite": false,
"isPartOfComposite": false
},
}
]
},
{
"name": "UI",
"id": "2409addd-41a1-415b-bd09-91ea21f1bd29",
"actions": [
{
"name": "Continue",
"type": "Button",
"id": "ebe16278-3be1-4f52-836c-c0c58af329c3",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
{
"name": "",
"id": "c523d0dc-ead2-4b1a-8568-615a7ea57090",
"id": "20f11355-7989-486d-b1c5-ad217efbd0f4",
"path": "<Keyboard>/anyKey",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f1a3d504-4cbd-4ce9-96f0-e313a6250183",
"path": "<Mouse>/backButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "825d1d5d-6bdc-4b3b-8e90-9161081763a2",
"path": "<Mouse>/forwardButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "29c071da-22f1-4627-b560-e5b85becaa04",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "60f6fab6-22d4-46c2-aecb-78dca3036c85",
"path": "<Mouse>/middleButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "c9866143-00df-4018-a28a-8f028f8bba13",
"path": "<Mouse>/press",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9b614e0a-38ac-4835-bbf5-93b917a78ba2",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "",
"action": "Continue",
"isComposite": false,
"isPartOfComposite": false
}
]
}
Expand Down
32 changes: 32 additions & 0 deletions Assets/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,38 @@ MonoBehaviour:
m_CallState: 2
m_ActionId: e63667c6-19c5-4af4-8aeb-2f6d1e111d48
m_ActionName: Gameplay/Drop[/Keyboard/s,/Keyboard/downArrow,/DualSenseGamepadHID/leftStick/down,/DualSenseGamepadHID/dpad/down]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: MausTemple.GameManager, Assembly-CSharp
m_MethodName: OnExit
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: bdba1c71-9e66-4209-81a8-982664d1be42
m_ActionName: Gameplay/Exit[/Keyboard/escape,/DualSenseGamepadHID/start]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
m_TargetAssemblyTypeName: MausTemple.GameManager, Assembly-CSharp
m_MethodName: OnContinue
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: d2ed6995-11cc-434a-957c-7cf7ac867440
m_ActionName: Gameplay/Continue[/Keyboard/anyKey]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Gameplay
Expand Down
Loading

0 comments on commit 93e707f

Please sign in to comment.