Merge pull request #143 from 2024FALL-SWPP/scene_modify

fix: scene modify

Assets/SWPPT3/PhysicMaterials/BoxMaterial.physicMaterial

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BoxMaterial
+  dynamicFriction: 0.2
+  staticFriction: 0.2
+  bounciness: 0
+  frictionCombine: 0
+  bounceCombine: 0

Assets/SWPPT3/PhysicMaterials/BoxOnHeadMaterial.physicMaterial

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BoxOnHeadMaterial
+  dynamicFriction: 0.7
+  staticFriction: 0.7
+  bounciness: 0
+  frictionCombine: 3
+  bounceCombine: 0

Assets/SWPPT3/Prefabs/Puzzle/Metal_Cube.prefab

@@ -94,7 +94,7 @@ MeshCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9059292695080840484}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: a1ad1c4c472e9a04c82d84e0e30d7c01, type: 2}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 4

Assets/SWPPT3/Prefabs/Puzzle/Wood_Box.prefab

@@ -93,7 +93,7 @@ BoxCollider:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6134383050356027056}
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 13400000, guid: a1ad1c4c472e9a04c82d84e0e30d7c01, type: 2}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2

Assets/SWPPT3/Prefabs/UI/Screen/Title.prefab

@@ -45,6 +45,143 @@ RectTransform:
   m_AnchoredPosition: {x: 469.99994, y: -194.49998}
   m_SizeDelta: {x: 649, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &3642882618839677419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6199447075542982628}
+  - component: {fileID: 2858977314454632647}
+  - component: {fileID: 4615596299244502651}
+  m_Layer: 5
+  m_Name: Text (TMP) (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6199447075542982628
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3642882618839677419}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1401436087585215248}
+  m_RootOrder: 5
+  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: 1000, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2858977314454632647
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3642882618839677419}
+  m_CullTransparentMesh: 1
+--- !u!114 &4615596299244502651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3642882618839677419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\uC6B0\uD074\uB9AD \uBC0F \uB4DC\uB798\uADF8: \uD50C\uB808\uC774\uC5B4
+    \uD68C\uC804"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: a3762933beacca440916cacea714f969, type: 2}
+  m_sharedMaterial: {fileID: -5269100479118320206, guid: a3762933beacca440916cacea714f969,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &4924722160105393931
 GameObject:
   m_ObjectHideFlags: 0
@@ -285,10 +422,10 @@ RectTransform:
   m_Father: {fileID: 1401436087585215248}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -385}
-  m_SizeDelta: {x: 900, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1000, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7121301282885840641
 CanvasRenderer:
@@ -318,7 +455,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\uC6B0\uD074\uB9AD: \uD50C\uB808\uC774\uC5B4 \uD68C\uC804"
+  m_text: "\uC88C\uD074\uB9AD \uBC0F \uB4DC\uB798\uADF8: \uD50C\uB808\uC774\uC5B4
+    \uC7AC\uC9C8 \uBCC0\uD654. \uD074\uB9AD \uD574\uC81C \uC2DC \uC120\uD0DD \uC7AC\uC9C8\uB85C
+    \uBCC0\uD654"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a3762933beacca440916cacea714f969, type: 2}
   m_sharedMaterial: {fileID: -5269100479118320206, guid: a3762933beacca440916cacea714f969,
@@ -1431,25 +1570,40 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2239757946886983373}
     m_Modifications:
+    - target: {fileID: 431900071733285263, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_text
+      value: "ESC: \uC77C\uC2DC\uC815\uC9C0"
+      objectReference: {fileID: 0}
+    - target: {fileID: 731184113521379402, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 40
+      objectReference: {fileID: 0}
     - target: {fileID: 1065356725276874137, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1065356725276874137, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1065356725276874137, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1000
       objectReference: {fileID: 0}
     - target: {fileID: 1065356725276874137, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1065356725276874137, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -115
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2359247953216285160, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
@@ -1506,45 +1660,70 @@ PrefabInstance:
       propertyPath: m_Spacing
       value: 40
       objectReference: {fileID: 0}
+    - target: {fileID: 2694149835116323061, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_text
+      value: "\uB9C8\uC6B0\uC2A4 : \uC2DC\uC810 \uD68C\uC804"
+      objectReference: {fileID: 0}
     - target: {fileID: 3865457293123417420, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3865457293123417420, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3865457293123417420, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1000
       objectReference: {fileID: 0}
     - target: {fileID: 3865457293123417420, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3865457293123417420, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -205
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4365475736015346895, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4741733005364380484, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4741733005364380484, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4741733005364380484, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1000
       objectReference: {fileID: 0}
     - target: {fileID: 4741733005364380484, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4741733005364380484, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -25
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5616760430373398176, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_text
+      value: "SPACE: \uC810\uD504"
       objectReference: {fileID: 0}
     - target: {fileID: 8223946710411296185, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
@@ -1659,27 +1838,32 @@ PrefabInstance:
     - target: {fileID: 8223946710411296190, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8789342136068491937, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8789342136068491937, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8789342136068491937, guid: 9f6b0656c5ec04623875dfda897297b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1000
       objectReference: {fileID: 0}
     - target: {fileID: 8789342136068491937, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8789342136068491937, guid: 9f6b0656c5ec04623875dfda897297b4,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -295
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 1786516466497720481, guid: 9f6b0656c5ec04623875dfda897297b4, type: 3}