Skip to content

Feature/menu #11

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
AyakorK merged 7 commits into from
Oct 21, 2024
Merged

Feature/menu #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2334117
merge: Merge menu and develop and fix little issues (#10)
AyakorK Oct 20, 2024
0bdef31
revert: Revert changes from EmptyRoom that breaked doors
AyakorK Oct 20, 2024
0a4fe3e
feat:Some menu option had
Thomlam Oct 21, 2024
01266f7
Merge branch 'feature/menu' of https://github.com/CodingFactory-Repos…
Thomlam Oct 21, 2024
614fba1
feat: Add pause system, return to menu and restart game, fix OnLoadSc…
Thomlam Oct 21, 2024
a432d44
chore: remove commentary for trap manager
Thomlam Oct 21, 2024
cbf73bc
Merge branch 'develop' into feature/menu
Thomlam Oct 21, 2024
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
9 changes: 1 addition & 8 deletions Assets/Animations/Idle.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,4 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 0
functionName:
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
m_Events: []
2 changes: 1 addition & 1 deletion Assets/Animations/Idle.anim.meta
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Assets/PlayerMovementAnimatorController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 35d46c531904e4f318de4b74f3406e3c, type: 2}
m_Motion: {fileID: 7400000, guid: 12864ee0eccb6402590333ee01067028, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down
8 changes: 8 additions & 0 deletions Assets/Prefabs/GameSystem.meta
View file
Open in desktop

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

60 changes: 60 additions & 0 deletions Assets/Prefabs/GameSystem/GameTracker.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &728652353996278025
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7355719168583625714}
- component: {fileID: 6993523190865074784}
- component: {fileID: 3400266234795620559}
m_Layer: 0
m_Name: GameTracker
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7355719168583625714
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728652353996278025}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 416, y: 234, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6993523190865074784
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728652353996278025}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dff3208a6c8451246867bd209a69143f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3400266234795620559
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728652353996278025}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 40d8f146f3d8ff74fa753f33896dae95, type: 3}
m_Name:
m_EditorClassIdentifier:
pauseMenuUI: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/Prefabs/GameSystem/GameTracker.prefab.meta
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions Assets/Prefabs/RoomSystem/Corridor/CorridorX7.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
newRoomPrefab: {fileID: 6459706332820108789, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3}
player: {fileID: 6754384466861484289, guid: 2359570f2fea24215ae3f989d41b590e, type: 3}
--- !u!1 &1874311396987187176
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1345,7 +1344,7 @@ Transform:
m_GameObject: {fileID: 6369746937129949933}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.1000004, y: 2.8000002, z: 0}
m_LocalPosition: {x: 0.1, y: 2.8000002, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down
Loading