Merge pull request #83 from 2024FALL-SWPP/feature/UISetting

Feature/UI setting
2024FALL-SWPP · Dec 17, 2024 · 3737f80 · 3737f80
2 parents e594d77 + 3214d22
commit 3737f80
Show file tree

Hide file tree

Showing 73 changed files with 16,912 additions and 3,339 deletions.
diff --git a/Assets/SWPPT3/Alcheslime.inputactions b/Assets/SWPPT3/Alcheslime.inputactions
@@ -51,9 +51,9 @@
                     "initialStateCheck": false
                 },
                 {
-                    "name": "ChangeState",
+                    "name": "EscMenu",
                     "type": "Button",
-                    "id": "29ece330-81c9-4e89-ac30-5f6f846d8c3a",
+                    "id": "390dca62-fc42-47a1-9c60-10e85edf63f8",
                     "expectedControlType": "Button",
                     "processors": "",
                     "interactions": "",
@@ -261,34 +261,12 @@
                 },
                 {
                     "name": "",
-                    "id": "df266fdf-9b8d-4a82-9105-3bf79e3d1469",
-                    "path": "<Keyboard>/#(1)",
+                    "id": "0c27e8fd-6ec7-41d7-87ca-8f1f8dc40552",
+                    "path": "<Keyboard>/escape",
                     "interactions": "",
                     "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "ChangeState",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "22307426-fefa-4c11-9352-9d576dfb3a78",
-                    "path": "<Keyboard>/#(2)",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "ChangeState",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "6a896f8d-02de-4fc6-bf4d-be2b9b55f1b8",
-                    "path": "<Keyboard>/#(3)",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard&Mouse",
-                    "action": "ChangeState",
+                    "groups": "",
+                    "action": "EscMenu",
                     "isComposite": false,
                     "isPartOfComposite": false
                 }

diff --git a/Assets/SWPPT3/Prefabs/ManagerObject/UIManager.prefab b/Assets/SWPPT3/Prefabs/ManagerObject/UIManager.prefab
diff --git a/Assets/SWPPT3/Prefabs/Puzzle/Electric_Wire_Set.prefab.meta b/Assets/SWPPT3/Prefabs/Puzzle/Electric_Wire_Set.prefab.meta
diff --git a/Assets/SWPPT3/Prefabs/UI/Canvas/MainCanvas.prefab b/Assets/SWPPT3/Prefabs/UI/Canvas/MainCanvas.prefab
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &519183602932949858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4136735327766865086}
+  - component: {fileID: 4136735327766865087}
+  - component: {fileID: 4136735327766865080}
+  - component: {fileID: 4136735327766865081}
+  m_Layer: 5
+  m_Name: MainCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4136735327766865086
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519183602932949858}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &4136735327766865087
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519183602932949858}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 1
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &4136735327766865080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519183602932949858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &4136735327766865081
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519183602932949858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
diff --git a/...bs/UI/Canvas/StartSceneCanvas.prefab.meta → .../Prefabs/UI/Canvas/MainCanvas.prefab.meta b/...bs/UI/Canvas/StartSceneCanvas.prefab.meta → .../Prefabs/UI/Canvas/MainCanvas.prefab.meta