diff --git a/Assets/Resources/Prefabs/UI/Form/Select Item.prefab b/Assets/Resources/Prefabs/UI/Form/Select Item.prefab index 1cf3e1ba9..9cca82202 100644 --- a/Assets/Resources/Prefabs/UI/Form/Select Item.prefab +++ b/Assets/Resources/Prefabs/UI/Form/Select Item.prefab @@ -465,12 +465,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef1de16c90b849ef86a4360768fc55f6, type: 3} m_Name: m_EditorClassIdentifier: - prop: - label: + prop: WindowMode + label: setting_window OnValueChanged: m_PersistentCalls: m_Calls: [] - options: [] + options: + - prop: Windowed + label: setting_window_windowed + - prop: FullScreen + label: setting_window_fullscreen + - prop: MaximizedWindow + label: setting_window_maximizedWindow --- !u!1 &5824775690649857626 GameObject: m_ObjectHideFlags: 0 @@ -520,7 +526,6 @@ GameObject: - component: {fileID: 27177156846382951} - component: {fileID: 85167933423521209} - component: {fileID: 5006247552854995519} - - component: {fileID: 8093621185121386848} - component: {fileID: 1032211294988139403} m_Layer: 5 m_Name: Label @@ -546,7 +551,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -10, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &85167933423521209 CanvasRenderer: @@ -610,7 +615,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -645,20 +650,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &8093621185121386848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7841004607171630674} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!114 &1032211294988139403 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Form/Slider Item.prefab b/Assets/Resources/Prefabs/UI/Form/Slider Item.prefab index 92a0ad93b..032718c28 100644 --- a/Assets/Resources/Prefabs/UI/Form/Slider Item.prefab +++ b/Assets/Resources/Prefabs/UI/Form/Slider Item.prefab @@ -161,7 +161,6 @@ GameObject: - component: {fileID: 1163567057521848681} - component: {fileID: 7616446508434232365} - component: {fileID: 6338673825785440556} - - component: {fileID: 3796203325540427147} - component: {fileID: 6550843177228825060} m_Layer: 5 m_Name: Label @@ -187,7 +186,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -10, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &7616446508434232365 CanvasRenderer: @@ -251,7 +250,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -286,20 +285,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &3796203325540427147 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2721427419101969262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!114 &6550843177228825060 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 2f21c6fb8..7a5931cd0 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -159,7 +159,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 800, y: -40} + m_AnchoredPosition: {x: 633.3334, y: -40} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7233337 @@ -1356,7 +1356,7 @@ RectTransform: m_GameObject: {fileID: 64199269} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1177719590} @@ -1364,7 +1364,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 120, y: -40} + m_AnchoredPosition: {x: 250, y: -100.175} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &64199271 @@ -1498,8 +1498,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1990,6 +1990,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 88588335} m_CullTransparentMesh: 1 +--- !u!1001 &93749663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1937938010} + m_Modifications: + - target: {fileID: 8277955267355516036, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_Name + value: Background-Container-4-Main + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e41135d8257280a44832f44d8a2480b8, type: 3} +--- !u!224 &93749664 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8277955267355516059, guid: e41135d8257280a44832f44d8a2480b8, type: 3} + m_PrefabInstance: {fileID: 93749663} + m_PrefabAsset: {fileID: 0} --- !u!1 &95741516 GameObject: m_ObjectHideFlags: 0 @@ -5544,8 +5646,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500.00003, y: -650.7822} - m_SizeDelta: {x: 1000, y: 80} + m_AnchoredPosition: {x: 470, y: -653} + m_SizeDelta: {x: 800, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &296256892 MonoBehaviour: @@ -6161,7 +6263,8 @@ GameObject: m_Component: - component: {fileID: 362403070} - component: {fileID: 362403072} - - component: {fileID: 362403071} + - component: {fileID: 362403074} + - component: {fileID: 362403073} m_Layer: 5 m_Name: Others m_TagString: Untagged @@ -6183,39 +6286,13 @@ RectTransform: m_Children: - {fileID: 64199270} - {fileID: 1100283195} - m_Father: {fileID: 1340005158} + m_Father: {fileID: 1937938010} 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: -131, y: 311} - m_SizeDelta: {x: 400, y: 300} + m_AnchoredPosition: {x: 402, y: 0} + m_SizeDelta: {x: 400, y: 400.7} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &362403071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362403069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 296 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!222 &362403072 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6224,6 +6301,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 362403069} m_CullTransparentMesh: 1 +--- !u!114 &362403073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362403069} + 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: 0.21717648, g: 0.23935296, b: 0.30588236, 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: 0f60bb35ef8c94081a98076f2e6d9c00, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &362403074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 362403069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 100 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &366561051 GameObject: m_ObjectHideFlags: 0 @@ -6434,7 +6567,7 @@ GameObject: - component: {fileID: 368280462} - component: {fileID: 368280461} m_Layer: 5 - m_Name: Chapter Scroll + m_Name: Record Scroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6920,7 +7053,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500.00003, y: -393.67334} + m_AnchoredPosition: {x: 448, y: -400} m_SizeDelta: {x: 400, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &430924360 @@ -6940,7 +7073,7 @@ MonoBehaviour: m_Right: 200 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 + m_ChildAlignment: 3 m_Spacing: 30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -13670,7 +13803,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500, y: -40} + m_AnchoredPosition: {x: 400, y: -40} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &871983002 @@ -14824,7 +14957,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 500.0001, y: -152.55945} + m_AnchoredPosition: {x: 200, y: -149} m_SizeDelta: {x: 300, y: 48.01} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1076103036 @@ -14849,8 +14982,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u8BBE\u7F6E" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} - m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2} + m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -14874,8 +15007,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 48 - m_fontSizeBase: 48 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -15516,7 +15649,7 @@ RectTransform: m_GameObject: {fileID: 1100283194} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000798, y: 1.0000798, z: 1.0000798} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1850675825} @@ -15524,7 +15657,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 656, y: -40} + m_AnchoredPosition: {x: 250, y: -300.52502} m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1100283196 @@ -15658,8 +15791,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -16547,8 +16680,8 @@ RectTransform: 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: -180, y: 2} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: -170, y: 0} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1177719591 MonoBehaviour: @@ -16705,6 +16838,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: popupBackground: {fileID: 366561053} + animator: {fileID: 2075950435} closeBtn: {fileID: 532555446} recordRoot: {fileID: 1017230347} recordPrefab: {fileID: 8643680592273313242, guid: 003f8d83e417e6a44a58ed1929b4eafd, type: 3} @@ -18976,7 +19110,6 @@ GameObject: m_Component: - component: {fileID: 1340005158} - component: {fileID: 1340005160} - - component: {fileID: 1340005159} - component: {fileID: 1340005161} m_Layer: 5 m_Name: Setting Panel @@ -18997,8 +19130,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1644309361} - {fileID: 1937938010} - - {fileID: 362403070} m_Father: {fileID: 2091451641} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -19006,36 +19139,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 10} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1340005159 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1340005157} - 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: 0, g: 0, b: 0, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!222 &1340005160 CanvasRenderer: m_ObjectHideFlags: 0 @@ -19056,6 +19159,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff78a14b28070864692582ecc5db824c, type: 3} m_Name: m_EditorClassIdentifier: + background: {fileID: 1644309362} + animator: {fileID: 1937938012} + continueBtn: {fileID: 1526950908} + backToMainBtn: {fileID: 871983002} + quitBtn: {fileID: 7233337} + wishlistBtn: {fileID: 64199272} + bugBtn: {fileID: 1100283197} --- !u!1 &1343879456 GameObject: m_ObjectHideFlags: 0 @@ -20017,7 +20127,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 695, y: -98} + m_AnchoredPosition: {x: 695, y: -100} m_SizeDelta: {x: 1050, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1397761842 @@ -21177,43 +21287,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 27177156846382951, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_SizeDelta.x - value: 100.8 - objectReference: {fileID: 0} - - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: prop - value: WindowMode - objectReference: {fileID: 0} - - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: label - value: setting_window + value: 180 objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: options.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: options.Array.data[0].prop - value: Windowed + value: 2 objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: options.Array.data[1].prop - value: FullScreen - objectReference: {fileID: 0} - - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: options.Array.data[2].prop value: MaximizedWindow objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: options.Array.data[0].label - value: setting_window_windowed + propertyPath: options.Array.data[2].prop + value: objectReference: {fileID: 0} - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: options.Array.data[1].label value: setting_window_fullscreen objectReference: {fileID: 0} - - target: {fileID: 4099831927643554877, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} - propertyPath: options.Array.data[2].label - value: setting_window_maximizedWindow + - target: {fileID: 5006247552854995519, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} + propertyPath: m_text + value: "\u5C4F\u5E55\u6A21\u5F0F" objectReference: {fileID: 0} - target: {fileID: 5654956763089875896, guid: e45f5fd66e7512444a9a27161cf51b7f, type: 3} propertyPath: m_Name @@ -21345,7 +21439,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -40} + m_AnchoredPosition: {x: 166.66667, y: -40} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1526950908 @@ -23207,6 +23301,123 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85815d386fde43dca8b4be1cfd26fe89, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1644309360 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1340005158} + m_Modifications: + - target: {fileID: 1675847664182167245, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_Name + value: PopupBackground + objectReference: {fileID: 0} + - target: {fileID: 1675847664182167245, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} +--- !u!224 &1644309361 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4101852642771111239, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + m_PrefabInstance: {fileID: 1644309360} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1644309362 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1173904363747743799, guid: d440515aa3c64f143a3f9c44f4a54741, type: 3} + m_PrefabInstance: {fileID: 1644309360} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1645213664 GameObject: m_ObjectHideFlags: 0 @@ -24951,8 +25162,8 @@ RectTransform: 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: -170, y: 2} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: -170, y: 0} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1850675826 MonoBehaviour: @@ -25382,6 +25593,8 @@ GameObject: m_Component: - component: {fileID: 1937938010} - component: {fileID: 1937938011} + - component: {fileID: 1937938012} + - component: {fileID: 1937938013} m_Layer: 5 m_Name: Main m_TagString: Untagged @@ -25401,42 +25614,59 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 93749664} - {fileID: 1076103035} - {fileID: 430924359} - {fileID: 296256891} + - {fileID: 362403070} m_Father: {fileID: 1340005158} 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: -5, y: -20} - m_SizeDelta: {x: 1000, y: 769.3367} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -600, y: -300} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1937938011 -MonoBehaviour: +--- !u!222 &1937938011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1937938009} + m_CullTransparentMesh: 1 +--- !u!95 &1937938012 +Animator: + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937938009} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 100 - m_Bottom: 50 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 1 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e3970a7dd5d13d64f9dd7b1b5751ced6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 2 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!225 &1937938013 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1937938009} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1949785437 GameObject: m_ObjectHideFlags: 0 @@ -44449,7 +44679,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1163567057521848681, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_SizeDelta.x - value: 67.2 + value: 180 objectReference: {fileID: 0} - target: {fileID: 1425762017047074178, guid: 2c1bcc3613815c74fb44cc1db21f524e, type: 3} propertyPath: m_AnchorMax.y @@ -61014,7 +61244,6 @@ MonoBehaviour: continueButton: {fileID: 4623837922595686632} restartButton: {fileID: 1838117938406717428} chapterItemPrefab: {fileID: 3059494652502176808, guid: 396b6acd14ffd2d46abab1fdb04af60c, type: 3} - delayTime: 0.15 --- !u!114 &7727657294902783753 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Panel/ChapterPanel.cs b/Assets/Scripts/UI/Panel/ChapterPanel.cs index 7fd162277..9f73ce559 100644 --- a/Assets/Scripts/UI/Panel/ChapterPanel.cs +++ b/Assets/Scripts/UI/Panel/ChapterPanel.cs @@ -26,7 +26,6 @@ namespace AibisDream.UI #endregion - public float delayTime = 0.5f; private GameObject _background; private ChapterVo _curChapterVo; @@ -37,14 +36,14 @@ namespace AibisDream.UI AddBackground(); animator.Play("Open", 0, 0); - ActionKit.Delay(delayTime, DrawContent).Start(this); + ActionKit.Delay(ConstRef.PanelDelayDuration, DrawContent).Start(this); } public void Hide() { RemoveBackground(); animator.Play("Close", 0, 0); - ActionKit.Delay(delayTime, DestroyContent).Start(this); + ActionKit.Delay(ConstRef.PanelDelayDuration, DestroyContent).Start(this); } private void AddBackground() diff --git a/Assets/Scripts/UI/Panel/Record/RecordPanel.cs b/Assets/Scripts/UI/Panel/Record/RecordPanel.cs index 9cd018d85..8702c997f 100644 --- a/Assets/Scripts/UI/Panel/Record/RecordPanel.cs +++ b/Assets/Scripts/UI/Panel/Record/RecordPanel.cs @@ -12,8 +12,9 @@ namespace AibisDream.UI public bool IsCloseable => true; #region 索引 - + [SerializeField] private Image popupBackground; + [SerializeField] private Animator animator; [SerializeField] private Button closeBtn; [SerializeField] private Transform recordRoot; [SerializeField] private GameObject recordPrefab; @@ -26,15 +27,14 @@ namespace AibisDream.UI { GameManager.Instance.PauseGame(); gameObject.SetActive(true); - - popupBackground.canvasRenderer.SetAlpha(0); - popupBackground.gameObject.SetActive(true); - popupBackground.CrossFadeAlpha(1, 0.4f, false); - + + AddBackground(); + animator.Play("Open", 0, 0); closeBtn.onClick.AddListener(ReturnGame); - + // 打开场景 ShowRecord(); + ActionKit.Delay(ConstRef.PanelDelayDuration, () => GameManager.Instance.PauseGame()).Start(this); } public void Hide() @@ -42,15 +42,28 @@ namespace AibisDream.UI gameObject.SetActive(false); GameManager.Instance.ContinueGame(); // 关闭背景 - popupBackground.CrossFadeAlpha(0, 0.2f, false); - ActionKit.Delay(0.2f, () => popupBackground.gameObject.SetActive(false)).Start(this); - + RemoveBackground(); + animator.Play("Close", 0, 0); + ActionKit.Delay(ConstRef.PanelDelayDuration, () => popupBackground.gameObject.SetActive(false)).Start(this); + // 关闭时停止渲染 closeBtn.onClick.RemoveAllListeners(); - + HideRecord(); } - + + private void AddBackground() + { + popupBackground.canvasRenderer.SetAlpha(0.0f); + popupBackground.gameObject.SetActive(true); + popupBackground.CrossFadeAlpha(1.0f, 0.4f, false); + } + + private void RemoveBackground() + { + popupBackground.CrossFadeAlpha(0.0f, 0.2f, false); + } + public void AppendDialogLine(DialogText dialogText) { _recordDataList.Add(dialogText); @@ -76,7 +89,6 @@ namespace AibisDream.UI // TODO 可能有性能问题 recordRoot.DestroyAllChildren(); } - private void ReturnGame() { diff --git a/Assets/Scripts/UI/Panel/SettingPanel.cs b/Assets/Scripts/UI/Panel/SettingPanel.cs index 82e6cdb14..58b9ea20c 100644 --- a/Assets/Scripts/UI/Panel/SettingPanel.cs +++ b/Assets/Scripts/UI/Panel/SettingPanel.cs @@ -1,3 +1,4 @@ +using AibisDream.Kit; using UnityEngine; using UnityEngine.UI; using AibisDream.Utility; @@ -9,19 +10,38 @@ namespace AibisDream.UI public bool IsOpen => gameObject.activeSelf; public bool IsCloseable => true; + #region 索引 + + [SerializeField] private Image background; + [SerializeField] private Animator animator; + + [Space] + [SerializeField] private Button continueBtn; + [SerializeField] private Button backToMainBtn; + [SerializeField] private Button quitBtn; + [SerializeField] private Button wishlistBtn; + [SerializeField] private Button bugBtn; + + #endregion + #region 打开和关闭 public void Show() { // 暂停游戏 - GameManager.Instance.PauseGame(); - gameObject.SetActive(true); + AddBackground(); + animator.Play("Open", 0, 0); + // 更新表单内容 var form = GetComponentInChildren(); form.Init(); // 注册函数 RegisterButton(); + ActionKit.Delay(ConstRef.PanelDelayDuration, () => + { + GameManager.Instance.PauseGame(); + }).Start(this); } public void Hide() @@ -31,46 +51,48 @@ namespace AibisDream.UI form.UnInit(); UnRegisterButton(); - gameObject.SetActive(false); - // 继续游戏 + RemoveBackground(); + animator.Play("Close", 0, 0); + GameManager.Instance.ContinueGame(); + ActionKit.Delay(ConstRef.PanelDelayDuration, () => + { + gameObject.SetActive(false); + // 继续游戏 + }).Start(this); } #endregion + + private void AddBackground() + { + background.canvasRenderer.SetAlpha(0.0f); + background.gameObject.SetActive(true); + background.CrossFadeAlpha(1.0f, 0.4f, false); + } + + private void RemoveBackground() + { + background.CrossFadeAlpha(0.0f, 0.2f, false); + } private void RegisterButton() { - var mainGroup = transform.Find("Main"); - var buttonGroup = mainGroup.Find("Button Group"); - var continueBtn = buttonGroup.Find("Continue").GetComponent