From 8a2ec05e40b9689ac10965fe3419e005363a2cd3 Mon Sep 17 00:00:00 2001 From: yauwailam Date: Tue, 18 Feb 2025 08:44:37 +0800 Subject: [PATCH] edit things --- Game/Assets/Scenes/Day1.unity | 10 +- Game/Assets/Scenes/EndingChoice.unity | 225 +++++++++++++++++++++++++- Game/Assets/Scenes/Start.unity | 6 +- 3 files changed, 230 insertions(+), 11 deletions(-) diff --git a/Game/Assets/Scenes/Day1.unity b/Game/Assets/Scenes/Day1.unity index 20014ae..5ee9571 100644 --- a/Game/Assets/Scenes/Day1.unity +++ b/Game/Assets/Scenes/Day1.unity @@ -265075,7 +265075,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3100722361824528699, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3408018161587624474, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3} propertyPath: m_Mesh @@ -265103,7 +265103,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8038368029267231487, guid: 519c364a8a1b96b428f69317d2cfb87f, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -422255,7 +422255,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trashCollected: 0 - trashRequired: 1 + trashRequired: 7 door: {fileID: 1545748364} lockedDoorUI: {fileID: 1786768887} storyPanelUI: {fileID: 620624014} @@ -435031,6 +435031,10 @@ PrefabInstance: propertyPath: m_Name value: Counter_Reza objectReference: {fileID: 0} + - target: {fileID: 312346524704041383, guid: f08520c74595f984ca1507db4e8aaa41, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 312346524704041383, guid: f08520c74595f984ca1507db4e8aaa41, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 diff --git a/Game/Assets/Scenes/EndingChoice.unity b/Game/Assets/Scenes/EndingChoice.unity index f613401..20f1a44 100644 --- a/Game/Assets/Scenes/EndingChoice.unity +++ b/Game/Assets/Scenes/EndingChoice.unity @@ -4000,8 +4000,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0dd9f95621cce5d4389410717683d6be, type: 3} m_Name: m_EditorClassIdentifier: - storyPanelUI: {fileID: 0} - storyText: {fileID: 0} + storyPanelUI: {fileID: 1026044013} + storyText: {fileID: 70251033} message: Someone's calling...? displayDuration: 7 --- !u!4 &29017750 @@ -11524,6 +11524,140 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &70251031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 70251032} + - component: {fileID: 70251034} + - component: {fileID: 70251033} + m_Layer: 5 + m_Name: Story Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &70251032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70251031} + 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: 1026044014} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -191} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &70251033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70251031} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: ' ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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: -234.78311, y: 0, z: -226.02475, 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!222 &70251034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70251031} + m_CullTransparentMesh: 1 --- !u!43 &71252657 Mesh: m_ObjectHideFlags: 0 @@ -50381,6 +50515,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 839937098} + - {fileID: 1026044014} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -141021,7 +141156,7 @@ MonoBehaviour: m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 - m_FarAttachMode: 0 + m_FarAttachMode: 1 --- !u!54 &929828843 Rigidbody: m_ObjectHideFlags: 0 @@ -153912,6 +154047,82 @@ Camera: m_CorrespondingSourceObject: {fileID: 4140838208988556472, guid: a4a4b6738cb4ba34bb94baa14bd938f0, type: 3} m_PrefabInstance: {fileID: 960695709} m_PrefabAsset: {fileID: 0} +--- !u!1 &1026044013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1026044014} + - component: {fileID: 1026044016} + - component: {fileID: 1026044015} + m_Layer: 5 + m_Name: Story Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &1026044014 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026044013} + 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: + - {fileID: 70251032} + m_Father: {fileID: 295538493} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1026044015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026044013} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1026044016 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026044013} + m_CullTransparentMesh: 1 --- !u!1 &1026357857 GameObject: m_ObjectHideFlags: 0 @@ -214610,6 +214821,10 @@ MonoBehaviour: confirmationPanel: {fileID: 347656170} warningText: {fileID: 0} warningPanel: {fileID: 0} + nextdayPanel: {fileID: 0} + fadeCanvasGroup: {fileID: 0} + fadeDuration: 1 + displayDuration: 5 --- !u!43 &1313607240 Mesh: m_ObjectHideFlags: 0 @@ -262794,14 +263009,14 @@ RectTransform: m_GameObject: {fileID: 1615552349} 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_LocalScale: {x: 0.87131685, y: 0.87131685, z: 0.87131685} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 839937098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -77, y: -395} + m_AnchoredPosition: {x: -77, y: -139} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1615552351 diff --git a/Game/Assets/Scenes/Start.unity b/Game/Assets/Scenes/Start.unity index 3e1470e..fccf55d 100644 --- a/Game/Assets/Scenes/Start.unity +++ b/Game/Assets/Scenes/Start.unity @@ -941,7 +941,7 @@ RectTransform: m_GameObject: {fileID: 1774110358} m_LocalRotation: {x: -0, y: 0.69073975, z: -0, w: -0.72310346} m_LocalPosition: {x: 0, y: 0, z: 0.03203002} - m_LocalScale: {x: 0.0020619652, y: 0.0020619652, z: 0.0020619652} + m_LocalScale: {x: 0.002220578, y: 0.002220578, z: 0.002220578} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1111814440} @@ -950,8 +950,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.69926685, y: 1.36144} - m_SizeDelta: {x: 704, y: 392} + m_AnchoredPosition: {x: -0.39, y: 1.36144} + m_SizeDelta: {x: 559.99994, y: 363.99997} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1774110363 MonoBehaviour: