diff --git a/Assets/Resources/Art/Marketing.meta b/Assets/Resources/Art/Marketing.meta new file mode 100644 index 000000000..e755fbe4d --- /dev/null +++ b/Assets/Resources/Art/Marketing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06cf7b752fd13514990983c1082743d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ea45591dd..10cb4a5f6 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -3213,6 +3213,186 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 216794752} m_PrefabAsset: {fileID: 0} +--- !u!1 &230058462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 230058463} + - component: {fileID: 230058466} + - component: {fileID: 230058465} + - component: {fileID: 230058464} + m_Layer: 5 + m_Name: "\u95EE\u5377" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &230058463 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230058462} + 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: 387510858} + m_Father: {fileID: 429395227} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1557, y: -825} + m_SizeDelta: {x: 240, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &230058464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230058462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 230058465} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &230058465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230058462} + 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: "\u95EE\u5377" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 64 + m_fontSizeBase: 64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 4096 + 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: 19.620605, 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 &230058466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230058462} + m_CullTransparentMesh: 1 --- !u!1 &230854707 GameObject: m_ObjectHideFlags: 0 @@ -4476,6 +4656,213 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 334229192} m_CullTransparentMesh: 1 +--- !u!1 &340035699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 340035700} + - component: {fileID: 340035703} + - component: {fileID: 340035702} + - component: {fileID: 340035701} + m_Layer: 5 + m_Name: Setting + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &340035700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340035699} + 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: 1788453626} + 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: 847, y: 357} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &340035701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340035699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 340035702} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1589364490} + m_TargetAssemblyTypeName: RainbowArt.CleanFlatUI.ModalWindow, Assembly-CSharp-firstpass + m_MethodName: ShowModalWindow + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &340035702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340035699} + 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: 1} + 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: 21300000, guid: 391c2a80049d057459bdc1291d8e88ca, type: 3} + m_Type: 0 + 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 &340035703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340035699} + m_CullTransparentMesh: 1 +--- !u!1 &387510857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 387510858} + - component: {fileID: 387510860} + - component: {fileID: 387510859} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &387510858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387510857} + 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: 230058463} + 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: -119, y: 2} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &387510859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387510857} + 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: 1} + 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: 21300000, guid: 5844688500658354a8e730ef510ba45f, type: 3} + m_Type: 0 + 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 &387510860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387510857} + m_CullTransparentMesh: 1 --- !u!1 &401198729 GameObject: m_ObjectHideFlags: 0 @@ -4954,9 +5341,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 429395227} - - component: {fileID: 429395228} m_Layer: 5 - m_Name: Start Menu + m_Name: Start MenuPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4975,6 +5361,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1299926725} + - {fileID: 230058463} + - {fileID: 1350512217} - {fileID: 1696845842} - {fileID: 892571112} m_Father: {fileID: 1788453626} @@ -4984,25 +5372,6 @@ RectTransform: m_AnchoredPosition: {x: 415, y: 0} m_SizeDelta: {x: 830, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &429395228 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 429395226} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb281616aaeece54c86a0a0a1f1d966d, type: 3} - m_Name: - m_EditorClassIdentifier: - startButton: {fileID: 237392158} - selectLevelButton: {fileID: 1596715194} - quitButton: {fileID: 1611684203} - startTab: {fileID: 1696845841} - sceneSelection: {fileID: 490985571} - levelTab: {fileID: 892571111} - buttonPrefab: {fileID: 1892187091667437644, guid: a619d30edcb0e9a46a29ad546f4adca7, type: 3} --- !u!1 &435293759 GameObject: m_ObjectHideFlags: 0 @@ -7674,12 +8043,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 984233631} + m_Father: {fileID: 1693917954} 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_AnchoredPosition: {x: 485, y: 80.70001} + m_SizeDelta: {x: 950, y: 918.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &614046223 MonoBehaviour: @@ -8914,7 +9283,7 @@ MonoBehaviour: - {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - runMode: 1 + runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2} saveFileName: StoneDay2_2_3 @@ -9022,17 +9391,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 731599307} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 984233631} + m_Father: {fileID: 1693917954} 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_AnchoredPosition: {x: 485, y: 80.70001} + m_SizeDelta: {x: 950, y: 918.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &731599309 MonoBehaviour: @@ -9381,17 +9750,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761395782} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 984233631} + m_Father: {fileID: 1693917954} 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_AnchoredPosition: {x: 485, y: 80.70001} + m_SizeDelta: {x: 950, y: 918.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &761395784 MonoBehaviour: @@ -9462,12 +9831,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2038437602} - m_Father: {fileID: 984233631} + m_Father: {fileID: 1693917954} 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_AnchoredPosition: {x: 485, y: 80.70001} + m_SizeDelta: {x: 950, y: 918.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &773911911 MonoBehaviour: @@ -11064,17 +11433,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 927888433} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 984233631} + m_Father: {fileID: 1693917954} 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_AnchoredPosition: {x: 485, y: 80.70001} + m_SizeDelta: {x: 950, y: 918.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &927888435 MonoBehaviour: @@ -11663,12 +12032,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1210536473} - - {fileID: 731599308} - - {fileID: 614046222} - - {fileID: 761395783} - - {fileID: 773911910} - - {fileID: 927888434} + - {fileID: 1693917954} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -11690,6 +12054,7 @@ MonoBehaviour: m_EditorClassIdentifier: objWidth: 700 objHeight: 550 + mainUIPanel: {fileID: 1693917953} --- !u!1 &1009826576 GameObject: m_ObjectHideFlags: 0 @@ -13072,11 +13437,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 984233631} + m_Father: {fileID: 1693917954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 50, y: -101.4} + m_AnchoredPosition: {x: 60, y: -20.69999} m_SizeDelta: {x: 120, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1210536474 @@ -14878,6 +15243,186 @@ Transform: - {fileID: 1076102356} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1350512216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350512217} + - component: {fileID: 1350512220} + - component: {fileID: 1350512219} + - component: {fileID: 1350512218} + m_Layer: 5 + m_Name: "\u5173\u6CE8" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1350512217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350512216} + 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: 1406679217} + m_Father: {fileID: 429395227} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1561, y: -952} + m_SizeDelta: {x: 240, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1350512218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350512216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1350512219} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1350512219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350512216} + 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: "\u5173\u6CE8\u6211\u4EEC" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, 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: 64 + m_fontSizeBase: 64 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 4096 + 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: -85.31055, 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 &1350512220 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350512216} + m_CullTransparentMesh: 1 --- !u!114 &1353101479 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -15345,6 +15890,81 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6036857918381590041, guid: 0b17c41ba2d401946a8eca60abbd974d, type: 3} m_PrefabInstance: {fileID: 1404026337} m_PrefabAsset: {fileID: 0} +--- !u!1 &1406679216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1406679217} + - component: {fileID: 1406679219} + - component: {fileID: 1406679218} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1406679217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406679216} + 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: 1350512217} + 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: -119, y: 2} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1406679218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406679216} + 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: 1} + 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: 21300000, guid: ca5736c96d1ab4044a41e2f79e19dd0b, type: 3} + m_Type: 0 + 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 &1406679219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406679216} + m_CullTransparentMesh: 1 --- !u!1 &1424797370 GameObject: m_ObjectHideFlags: 0 @@ -16964,6 +17584,355 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: choiceButtonPrefab: {fileID: 2831695685783823246, guid: 7b38c32597bbad84e92958938ef655dd, type: 3} +--- !u!1001 &1589364488 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1788453626} + m_Modifications: + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u786E\u8BA4" + objectReference: {fileID: 0} + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: -6838263774409351807, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u662F\u5426\u8FD4\u56DE\u4E3B\u754C\u9762\uFF1F" + objectReference: {fileID: 0} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2611369443023358479, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 484156982984796396, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 981726676788280686, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 79 + objectReference: {fileID: 0} + - target: {fileID: 1317429119650744762, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1589364490} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1788453630} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HideModalWindow + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: BackToMenu + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: RainbowArt.CleanFlatUI.ModalWindow, Assembly-CSharp-firstpass + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AibisDream.StartMenu, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onCancel.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: onConfirm.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u53D6\u6D88" + objectReference: {fileID: 0} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 2495430678409446208, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2690735023994097180, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 475 + objectReference: {fileID: 0} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u53D6\u6D88" + objectReference: {fileID: 0} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontColor32.rgba + value: 4287587027 + objectReference: {fileID: 0} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 2838972655342921835, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2952294754838136500, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2971839373268861373, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_Name + value: ModalWindowBasicCommon_Simple + objectReference: {fileID: 0} + - target: {fileID: 2971839373268861373, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u4E3B\u754C\u9762\u5305\u542B\uFF1A\u9000\u51FA\u6E38\u620F\uFF0C\u4ECE\u5B58\u6863\u5F00\u59CB\uFF0C\u95EE\u5377\u4EE5\u53CA\u5173\u6CE8\u94FE\u63A5" + objectReference: {fileID: 0} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 6910466631504884182, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_text + value: "\u786E\u8BA4" + objectReference: {fileID: 0} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_isOrthographic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_fontColor32.rgba + value: 4290628676 + objectReference: {fileID: 0} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 9187930419950852530, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} +--- !u!224 &1589364489 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8061307773979316499, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + m_PrefabInstance: {fileID: 1589364488} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1589364490 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1530496787198367724, guid: 255ac7605b284e048b2c9ffeaf32bb0f, type: 3} + m_PrefabInstance: {fileID: 1589364488} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8fb07e6cd5358104d8d5b7a77780ccfe, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1592246586 PrefabInstance: m_ObjectHideFlags: 0 @@ -18513,6 +19482,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1689237971} m_CullTransparentMesh: 1 +--- !u!1 &1693917953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1693917954} + m_Layer: 5 + m_Name: MainUIPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1693917954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693917953} + 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: 1210536473} + - {fileID: 731599308} + - {fileID: 614046222} + - {fileID: 761395783} + - {fileID: 773911910} + - {fileID: 927888434} + m_Father: {fileID: 984233631} + 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: -485, y: -80.7} + m_SizeDelta: {x: 970, y: 161.4} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1694277408 GameObject: m_ObjectHideFlags: 0 @@ -19431,6 +20441,7 @@ GameObject: - component: {fileID: 1788453629} - component: {fileID: 1788453628} - component: {fileID: 1788453627} + - component: {fileID: 1788453630} m_Layer: 5 m_Name: Menu Canvas m_TagString: Untagged @@ -19452,6 +20463,8 @@ RectTransform: m_Children: - {fileID: 429395227} - {fileID: 490985570} + - {fileID: 340035700} + - {fileID: 1589364489} m_Father: {fileID: 1343879457} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -19522,6 +20535,32 @@ Canvas: m_SortingLayerID: 813150151 m_SortingOrder: 19 m_TargetDisplay: 0 +--- !u!114 &1788453630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1788453625} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb281616aaeece54c86a0a0a1f1d966d, type: 3} + m_Name: + m_EditorClassIdentifier: + startMenuPanel: {fileID: 429395226} + startButton: {fileID: 237392158} + selectLevelButton: {fileID: 1596715194} + quitButton: {fileID: 1611684203} + settingButton: {fileID: 340035701} + settingWindow: {fileID: 0} + surveyButton: {fileID: 230058464} + followButton: {fileID: 1350512218} + startTab: {fileID: 1696845841} + sceneSelection: {fileID: 490985571} + levelTab: {fileID: 892571111} + buttonPrefab: {fileID: 1892187091667437644, guid: a619d30edcb0e9a46a29ad546f4adca7, type: 3} + surveyURL: https://wj.qq.com/s2/15348910/3c8c/ + qqURL: https://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XQFpOqRb1_zqkCdR2bLT3kHb11XzZ54T&authKey=w8G8qxzecnATXDOec1Ybv8LA%2FTTN8gQkyegvbK%2FUZ9m90WxggTjXy2U6%2FJesWJF3&noverify=0&group_code=325268983 --- !u!1 &1794129318 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game Loop/SceneLoader.cs b/Assets/Scripts/Game Loop/SceneLoader.cs index f05f57fcd..46f630a96 100644 --- a/Assets/Scripts/Game Loop/SceneLoader.cs +++ b/Assets/Scripts/Game Loop/SceneLoader.cs @@ -1,6 +1,7 @@ using System.Collections; using AibisDream.Framework; using AibisDream.Kit; +using UnityEditor; using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; using UnityEngine.SceneManagement; @@ -90,5 +91,43 @@ namespace AibisDream _isLoading = false; } } + #region 重新开始游戏功能 + + /// + /// 重新开始游戏,重新加载当前场景 + /// + public void RestartGame() + { + // 确保场景正在加载或卸载前,先重置相关状态 + StartCoroutine(RestartGameCoroutine()); + } + + private IEnumerator RestartGameCoroutine() + { + if (_isLoading) + { + yield return null; + } + else + { + // 清除当前场景的状态(如果需要) + _isLoading = true; + + if (!string.IsNullOrEmpty(_currentScene.Value)) + { + // 卸载当前场景 + yield return Addressables.UnloadSceneAsync(_loadHandle); + } + yield return MainUIController.Instance.FadeInSync(1); + DialogController.Instance.StopDialog(); + yield return MainUIController.Instance.TVFadeInSync(1); + MainUIController.Instance.ShowMainUI(); + StartMenu.Instance.showStartMenu(); + yield return MainUIController.Instance.FadeOutSync(1); + } + } + + #endregion } + } \ No newline at end of file diff --git a/Assets/Scripts/Game Loop/StartMenu.cs b/Assets/Scripts/Game Loop/StartMenu.cs index 2491048e0..6f4293ba7 100644 --- a/Assets/Scripts/Game Loop/StartMenu.cs +++ b/Assets/Scripts/Game Loop/StartMenu.cs @@ -4,25 +4,42 @@ using AibisDream.Kit; using TMPro; using UnityEngine; using UnityEngine.UI; +using RainbowArt.CleanFlatUI; + namespace AibisDream { public class StartMenu : Singleton { + [SerializeField] private GameObject startMenuPanel; [SerializeField] private Button startButton; [SerializeField] private Button selectLevelButton; [SerializeField] private Button quitButton; + [SerializeField] private Button settingButton; + + [SerializeField] private ModalWindow settingWindow; + + [SerializeField] private Button surveyButton; + + [SerializeField] private Button followButton; + [SerializeField] private GameObject startTab; [SerializeField] private SceneSelectionUIController sceneSelection; [SerializeField] private GameObject levelTab; [SerializeField] private GameObject buttonPrefab; + [SerializeField] private string surveyURL = "https://wj.qq.com/s2/15348910/3c8c/"; // 替换为你的问卷链接 + + [SerializeField] private string qqURL ="https://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XQFpOqRb1_zqkCdR2bLT3kHb11XzZ54T&authKey=w8G8qxzecnATXDOec1Ybv8LA%2FTTN8gQkyegvbK%2FUZ9m90WxggTjXy2U6%2FJesWJF3&noverify=0&group_code=325268983"; + private void OnEnable() { startButton.onClick.AddListener(StartGame); selectLevelButton.onClick.AddListener(SelectLevel); quitButton.onClick.AddListener(QuitGame); + surveyButton.onClick.AddListener(OpenLink); + followButton.onClick.AddListener(OpenQQLink); } private void OnDisable() @@ -42,6 +59,18 @@ namespace AibisDream { SwitchToLevelTab(); } + public void OpenSetting() + { + MainUIController.Instance.HideMainUI(); + showStartMenu(); + + } + public void BackToMenu() + { + SceneLoader.Instance.RestartGame(); + + } + private void SwitchToLevelTab() { sceneSelection.ShowSceneSelection(GameLoopManager.Instance.totalSceneSos); @@ -52,6 +81,14 @@ namespace AibisDream { startTab.SetActive(true); levelTab.SetActive(false); } + public void OpenLink() + { + Application.OpenURL(surveyURL); + } + public void OpenQQLink() + { + Application.OpenURL(qqURL); + } public void QuitGame() { @@ -60,7 +97,11 @@ namespace AibisDream { public void HideStartMenu() { - gameObject.SetActive(false); + startMenuPanel.SetActive(false); + } + public void showStartMenu() + { + startMenuPanel.SetActive(true); } } } diff --git a/Assets/Scripts/UI/MainUIViewer.cs b/Assets/Scripts/UI/MainUIViewer.cs index 620672f73..3c8d508bb 100644 --- a/Assets/Scripts/UI/MainUIViewer.cs +++ b/Assets/Scripts/UI/MainUIViewer.cs @@ -23,6 +23,8 @@ namespace AibisDream #region 主场景图片 + [SerializeField]private GameObject mainUIPanel; + private FadeImage _tvScene; private FadeImage _blackImage; private FadeImage _news; @@ -99,7 +101,11 @@ namespace AibisDream /// public void HideMainUI() { - gameObject.SetActive(false); + mainUIPanel.SetActive(false); + } + public void ShowMainUI() + { + mainUIPanel.SetActive(true); } /// @@ -163,19 +169,19 @@ namespace AibisDream private void InitChildObj() { - var rawTvScene = transform.Find(TVScene).gameObject.GetComponent(); + var rawTvScene = transform.GetChild(0).Find(TVScene).gameObject.GetComponent(); _tvScene = new FadeImage(rawTvScene); - var rawBlackImage = transform.Find(BlackImage).gameObject.GetComponent(); + var rawBlackImage = transform.GetChild(0).Find(BlackImage).gameObject.GetComponent(); _blackImage = new FadeImage(rawBlackImage); - var rawNews = transform.Find(NewsImage).gameObject.GetComponent(); + var rawNews = transform.GetChild(0).Find(NewsImage).gameObject.GetComponent(); _news = new FadeImage(rawNews); - _objPanel = transform.Find(ObjPanel).gameObject; + _objPanel = transform.GetChild(0).Find(ObjPanel).gameObject; _objImage = _objPanel.transform.GetChild(0).GetComponent(); - _fullScreen = transform.Find("Full Screen Image").GetComponent(); + _fullScreen = transform.GetChild(0).Find("Full Screen Image").GetComponent(); } } } \ No newline at end of file