diff --git a/Assets/Image/SaveAndEvent/IMG_CloseButton.png b/Assets/Image/SaveAndEvent/IMG_CloseButton.png new file mode 100644 index 00000000..39184492 Binary files /dev/null and b/Assets/Image/SaveAndEvent/IMG_CloseButton.png differ diff --git a/Assets/Image/SaveAndEvent/IMG_CloseButton.png.meta b/Assets/Image/SaveAndEvent/IMG_CloseButton.png.meta new file mode 100644 index 00000000..bccb64ee --- /dev/null +++ b/Assets/Image/SaveAndEvent/IMG_CloseButton.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2db72ec0d2c2ff6428ec8e303baa0ebd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab b/Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab index 5b8d59c6..646d9dcf 100644 --- a/Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab +++ b/Assets/Prefabs/AAA/Panel_SaveAndNewChecker.prefab @@ -36,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -252, y: 69.5} + m_AnchoredPosition: {x: -350.8, y: 69.5} m_SizeDelta: {x: 120, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5273103722343148333 @@ -322,7 +322,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Save And New + m_text: SaveAndNew m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} m_sharedMaterial: {fileID: 8797862963918382650, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} @@ -393,6 +393,126 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1555576706142931404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7598019020271143672} + - component: {fileID: 6556477913848635542} + - component: {fileID: 3242730606053972636} + - component: {fileID: 297457329277478687} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7598019020271143672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555576706142931404} + 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: 1192815944285530361} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30, y: -24.5} + m_SizeDelta: {x: 40, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6556477913848635542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555576706142931404} + m_CullTransparentMesh: 1 +--- !u!114 &3242730606053972636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555576706142931404} + 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: 2db72ec0d2c2ff6428ec8e303baa0ebd, 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!114 &297457329277478687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555576706142931404} + 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: 3242730606053972636} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1742571325674711714 GameObject: m_ObjectHideFlags: 0 @@ -665,6 +785,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2818198016920448282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4504027753516170121} + - component: {fileID: 2813882154069195567} + - component: {fileID: 3099276893309860275} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4504027753516170121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2818198016920448282} + 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: 1527704009299339388} + 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!222 &2813882154069195567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2818198016920448282} + m_CullTransparentMesh: 1 +--- !u!114 &3099276893309860275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2818198016920448282} + 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: New + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} + m_sharedMaterial: {fileID: 8797862963918382650, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_fontSizeBase: 14 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &3708212017781205696 GameObject: m_ObjectHideFlags: 0 @@ -786,6 +1042,127 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &4206020799442978393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1527704009299339388} + - component: {fileID: 64708025939110672} + - component: {fileID: 6521073463314819896} + - component: {fileID: 7551957660775196761} + m_Layer: 5 + m_Name: Button_New + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1527704009299339388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206020799442978393} + 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: 4504027753516170121} + m_Father: {fileID: 1192815944285530361} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -239.9, y: 69.5} + m_SizeDelta: {x: 80, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &64708025939110672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206020799442978393} + m_CullTransparentMesh: 1 +--- !u!114 &6521073463314819896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206020799442978393} + 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: e36269be1515abc45a269ecaa90d4200, 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!114 &7551957660775196761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206020799442978393} + 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: 6521073463314819896} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5142265556766625585 GameObject: m_ObjectHideFlags: 0 @@ -820,8 +1197,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -18.5} - m_SizeDelta: {x: -16, y: 37} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: -20, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3784255377163638033 CanvasRenderer: @@ -971,13 +1348,15 @@ RectTransform: - {fileID: 7614706102491546423} - {fileID: 4999277377938531502} - {fileID: 1340262836991568649} + - {fileID: 1527704009299339388} - {fileID: 1655453301868869452} + - {fileID: 7598019020271143672} m_Father: {fileID: 0} 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: -45.5} - m_SizeDelta: {x: 420, y: 220} + m_AnchoredPosition: {x: 0, y: 45.5} + m_SizeDelta: {x: 520, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4139751315900355312 CanvasRenderer: diff --git a/Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab b/Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab index 2237fc40..57caed15 100644 --- a/Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab +++ b/Assets/Prefabs/AAA/Panel_SaveAndOpenChecker.prefab @@ -1,5 +1,126 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1478336340341381347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 376350984963704703} + - component: {fileID: 2686831251942637763} + - component: {fileID: 759113644977544519} + - component: {fileID: 8718707663307273769} + m_Layer: 5 + m_Name: Button_Open + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &376350984963704703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478336340341381347} + 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: 89052232779470904} + m_Father: {fileID: 3924726146150549819} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -239.7, y: 69.5} + m_SizeDelta: {x: 80, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2686831251942637763 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478336340341381347} + m_CullTransparentMesh: 1 +--- !u!114 &759113644977544519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478336340341381347} + 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: e36269be1515abc45a269ecaa90d4200, 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!114 &8718707663307273769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478336340341381347} + 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: 759113644977544519} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3396806135333855691 GameObject: m_ObjectHideFlags: 0 @@ -35,13 +156,15 @@ RectTransform: - {fileID: 7372976760307625978} - {fileID: 4016577786947884256} - {fileID: 3493738324233689900} + - {fileID: 376350984963704703} - {fileID: 217412919196494735} + - {fileID: 2046690851231139247} m_Father: {fileID: 0} 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: 45.5} - m_SizeDelta: {x: 420, y: 220} + m_SizeDelta: {x: 520, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8459847227333567013 CanvasRenderer: @@ -63,6 +186,126 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2210d7c485f6904d952f5df8ee52d0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3439590540886026129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2046690851231139247} + - component: {fileID: 3489487053964771023} + - component: {fileID: 7878587270565145753} + - component: {fileID: 1218402502921565386} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2046690851231139247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439590540886026129} + 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: 3924726146150549819} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30, y: -24.5} + m_SizeDelta: {x: 40, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3489487053964771023 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439590540886026129} + m_CullTransparentMesh: 1 +--- !u!114 &7878587270565145753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439590540886026129} + 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: 2db72ec0d2c2ff6428ec8e303baa0ebd, 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!114 &1218402502921565386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3439590540886026129} + 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: 7878587270565145753} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4342435668086164097 GameObject: m_ObjectHideFlags: 0 @@ -128,7 +371,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Save And Open + m_text: SaveAndOpen m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} m_sharedMaterial: {fileID: 8797862963918382650, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} @@ -371,7 +614,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -148, y: 69.5} + m_AnchoredPosition: {x: -148.9, y: 69.5} m_SizeDelta: {x: 80, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183108993842070084 @@ -531,6 +774,144 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6839960518146422437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 89052232779470904} + - component: {fileID: 1173615350989634819} + - component: {fileID: 8139332729891878528} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &89052232779470904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839960518146422437} + 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: 376350984963704703} + 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!222 &1173615350989634819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839960518146422437} + m_CullTransparentMesh: 1 +--- !u!114 &8139332729891878528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839960518146422437} + 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: 'Open + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} + m_sharedMaterial: {fileID: 8797862963918382650, guid: 414be81bcdc9caa4a8dc790330504c1a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 14 + m_fontSizeBase: 14 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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 &7014543498591621187 GameObject: m_ObjectHideFlags: 0 @@ -702,7 +1083,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -24.5} - m_SizeDelta: {x: -16, y: 37} + m_SizeDelta: {x: -20, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &761354077343858262 CanvasRenderer: @@ -778,7 +1159,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -252, y: 69.5} + m_AnchoredPosition: {x: -351.1, y: 69.5} m_SizeDelta: {x: 120, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2954427737503624849 diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 1c369d9a..c87c8bc0 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -956,112 +956,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} m_PrefabInstance: {fileID: 297039007} m_PrefabAsset: {fileID: 0} ---- !u!1001 &306923382 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 545811781} - m_Modifications: - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_SizeDelta.x - value: 420 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_SizeDelta.y - value: 220 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_AnchoredPosition.y - value: 45.5 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_Name - value: Panel_SaveAndNewChecker - objectReference: {fileID: 0} - - target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 72f142af384a5e341bf6099f889cca18, type: 3} ---- !u!224 &306923383 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} - m_PrefabInstance: {fileID: 306923382} - m_PrefabAsset: {fileID: 0} --- !u!1 &349372256 GameObject: m_ObjectHideFlags: 0 @@ -3158,7 +3052,7 @@ RectTransform: - {fileID: 1004894728} - {fileID: 1099738088} - {fileID: 802579212} - - {fileID: 306923383} + - {fileID: 1639318484} - {fileID: 2010909997} - {fileID: 18479049} m_Father: {fileID: 1981809316} @@ -9893,6 +9787,112 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7ba136ec400eea8498140d9abaa63da5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1639318483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 545811781} + m_Modifications: + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_SizeDelta.x + value: 520 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_SizeDelta.y + value: 220 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_AnchoredPosition.y + value: 45.5 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_Name + value: Panel_SaveAndNewChecker + objectReference: {fileID: 0} + - target: {fileID: 7955828146152623659, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 72f142af384a5e341bf6099f889cca18, type: 3} +--- !u!224 &1639318484 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1192815944285530361, guid: 72f142af384a5e341bf6099f889cca18, type: 3} + m_PrefabInstance: {fileID: 1639318483} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1712022042 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index 18ef02b4..44dc083c 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -22,6 +22,9 @@ namespace Studio.Manage canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_start.Close; canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close; + canvas_popup.panel_saveandnewchecker.onClickNew += canvas_popup.panel_topmenunewprojectinfo.Open; + canvas_popup.panel_saveandopenchecker.onClickOpen += canvas_popup.panel_topmenuopenprojectinfo.Open; + canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_static.panel_scenetab.Init; canvas_popup.panel_topmenunewprojectinfo.onClickCreate += canvas_popup.panel_topmenunewprojectinfo.Close; diff --git a/Assets/Scripts/Studio/UI/Elements/UI_ButtonColorChanger.cs b/Assets/Scripts/Studio/UI/Elements/UI_ButtonColorChanger.cs index 04bff8f0..c3d18148 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_ButtonColorChanger.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_ButtonColorChanger.cs @@ -38,5 +38,13 @@ namespace Studio text.color = textNormalColor; } } + private void OnDisable() + { + buttonImage.color = buttonNormalColor; + foreach (var text in buttonTexts) + { + text.color = textNormalColor; + } + } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs b/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs index f67420fd..b0ec20ed 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndNewChecker.cs @@ -8,14 +8,19 @@ namespace Studio public class Panel_SaveAndNewChecker : PanelBase { private Button Button_SaveAndNew; + private Button Button_New; private Button Button_Cancel; + private Button Button_Close; public Action onClickSaveAndNew; + public Action onClickNew; public override void AfterAwake() { Button_SaveAndNew.onClick.AddListener(OnClickSaveAndNewButton); - Button_Cancel.onClick.AddListener(OnClickCancelButton); + Button_New.onClick.AddListener(OnClickNewButton); + Button_Cancel.onClick.AddListener(Close); + Button_Close.onClick.AddListener(Close); } public void Open() { @@ -30,8 +35,9 @@ namespace Studio onClickSaveAndNew?.Invoke(); Close(); } - private void OnClickCancelButton() + private void OnClickNewButton() { + onClickNew?.Invoke(); Close(); } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs b/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs index e3c27b7c..13c3ad69 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_SaveAndOpenChecker.cs @@ -8,14 +8,19 @@ namespace Studio public class Panel_SaveAndOpenChecker : PanelBase { private Button Button_SaveAndOpen; + private Button Button_Open; private Button Button_Cancel; + private Button Button_Close; public Action onClickSaveAndOpen; + public Action onClickOpen; public override void AfterAwake() { Button_SaveAndOpen.onClick.AddListener(OnClickSaveAndOpenButton); - Button_Cancel.onClick.AddListener(OnClickCancelButton); + Button_Open.onClick.AddListener(OnClickOpenButton); + Button_Cancel.onClick.AddListener(Close); + Button_Close.onClick.AddListener(Close); } public void Open() { @@ -30,8 +35,9 @@ namespace Studio onClickSaveAndOpen?.Invoke(); Close(); } - private void OnClickCancelButton() + private void OnClickOpenButton() { + onClickOpen?.Invoke(); Close(); } }