diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas index caf8d424..daa2fda2 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas @@ -79,6 +79,7 @@ SpriteAtlas: - {fileID: 21300000, guid: a691a22e54180eb4db0187b1b06fd173, type: 3} - {fileID: 21300000, guid: d576d0eb7a26f6e4e82120ae022d5fb6, type: 3} - {fileID: 21300000, guid: 967ed9e56c7ad6c46a7fbf00ad5c6153, type: 3} + - {fileID: 21300000, guid: bf41522f17e35c244a6cbe340bddee06, type: 3} - {fileID: 21300000, guid: f9a06e163014f4f46b14f4499d3e7240, type: 3} - {fileID: 21300000, guid: 0d99c8434ed6d8249960942d73eab096, type: 3} - {fileID: 21300000, guid: 2761fc23b4aa7e34187ac5ffbc3fad9b, type: 3} diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas index c2ac3f38..b1534b30 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas @@ -71,7 +71,6 @@ SpriteAtlas: secondaryTextureSettings: {} variantMultiplier: 1 packables: - - {fileID: 21300000, guid: 503ed1e23062d9b458bb2cf34b4ba624, type: 3} - {fileID: 21300000, guid: 176a605a9c4ccbe43b70e8887cd8d90b, type: 3} - {fileID: 21300000, guid: 6ea7878d0b1ad5947899e5354ce4d1a6, type: 3} - {fileID: 21300000, guid: 622a30d893b81954089f0684282bc8b6, type: 3} diff --git a/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab b/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab index 442d0c1e..41486d35 100644 --- a/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UISettingForm.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 503ed1e23062d9b458bb2cf34b4ba624, type: 3} + m_Sprite: {fileID: 21300000, guid: bf41522f17e35c244a6cbe340bddee06, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1211858468683603309 +--- !u!1 &501544533464940444 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,119 +83,35 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3272445657825206264} - - component: {fileID: 5633079782227148970} - - component: {fileID: 1044119174137374195} - - component: {fileID: 8531791801494326726} + - component: {fileID: 3027068977226889149} m_Layer: 5 - m_Name: m_btn_closeBtn + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3272445657825206264 +--- !u!224 &3027068977226889149 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1211858468683603309} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 501544533464940444} + 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: 4081528251189279610} + m_Children: + - {fileID: 9012943009304587434} + m_Father: {fileID: 246797727244771830} 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: 221, y: 235} - m_SizeDelta: {x: 76, y: 77} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: -1.3519} + m_SizeDelta: {x: -20, y: 6.5666} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5633079782227148970 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1211858468683603309} - m_CullTransparentMesh: 1 ---- !u!114 &1044119174137374195 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1211858468683603309} - 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: e55eb2f9939873e488111e0f7f101a1e, 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 &8531791801494326726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1211858468683603309} - 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: 1044119174137374195} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1511084342976173764 +--- !u!1 &636099185031428273 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -203,125 +119,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3300686799643354555} - - component: {fileID: 6351929998905012888} - - component: {fileID: 5213112598612671236} + - component: {fileID: 4242591931033171757} + - component: {fileID: 570040352250164178} + - component: {fileID: 2371850430682876041} m_Layer: 5 - m_Name: Fill + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3300686799643354555 +--- !u!224 &4242591931033171757 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1511084342976173764} + m_GameObject: {fileID: 636099185031428273} 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: 3685573020211257619} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} - m_SizeDelta: {x: -0.000030518, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6351929998905012888 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1511084342976173764} - m_CullTransparentMesh: 1 ---- !u!114 &5213112598612671236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1511084342976173764} - 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: d9e18b96512931447960a749d91748ca, 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!1 &1757184001976997386 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 486611630685642856} - - component: {fileID: 2330540948715932259} - - component: {fileID: 2784008883149171144} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &486611630685642856 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757184001976997386} - 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: 2711765226022597958} + m_Father: {fileID: 1643851522143569780} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.000030517578, y: 0} - m_SizeDelta: {x: -0.000030518, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2330540948715932259 +--- !u!222 &570040352250164178 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757184001976997386} + m_GameObject: {fileID: 636099185031428273} m_CullTransparentMesh: 1 ---- !u!114 &2784008883149171144 +--- !u!114 &2371850430682876041 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757184001976997386} + m_GameObject: {fileID: 636099185031428273} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -335,7 +176,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9e18b96512931447960a749d91748ca, type: 3} + m_Sprite: {fileID: 21300000, guid: b53342587a8738048b3ca21751d36cf4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -362,7 +203,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1960434599741854716 RectTransform: m_ObjectHideFlags: 0 @@ -379,8 +220,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: -82.2, y: 97.1} - m_SizeDelta: {x: 201.0849, y: 43.6949} + m_AnchoredPosition: {x: -187.4, y: 164.5} + m_SizeDelta: {x: 209.8184, y: 49.1533} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6149848030150763018 CanvasRenderer: @@ -403,7 +244,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.37647063, g: 0.20784315, b: 0.08627451, a: 1} + 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 @@ -412,11 +253,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} - m_FontSize: 29 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 48 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -500,7 +341,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1957170266751344700 +--- !u!1 &2131104553867411725 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -508,77 +349,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9029179147078244189} - - component: {fileID: 3103276307091616322} - - component: {fileID: 676629071708421248} + - component: {fileID: 2395155594869819517} + - component: {fileID: 5346956544398864519} + - component: {fileID: 1856785159718846886} m_Layer: 5 - m_Name: Label + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9029179147078244189 +--- !u!224 &2395155594869819517 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1957170266751344700} + m_GameObject: {fileID: 2131104553867411725} 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: 7050198964783562439} + m_Father: {fileID: 8720116338288558810} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 114.5, y: -3.9036} - m_SizeDelta: {x: 80.8326, y: -3} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3103276307091616322 +--- !u!222 &5346956544398864519 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1957170266751344700} + m_GameObject: {fileID: 2131104553867411725} m_CullTransparentMesh: 1 ---- !u!114 &676629071708421248 +--- !u!114 &1856785159718846886 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1957170266751344700} + m_GameObject: {fileID: 2131104553867411725} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.37647063, g: 0.20784315, b: 0.08627451, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5165\u573A\u7279\u6548" + m_Sprite: {fileID: 21300000, guid: 38379376f62f30f499fd7ac3492d2927, 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!1 &2167136808470820151 GameObject: m_ObjectHideFlags: 0 @@ -609,12 +446,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7279231471833483879} - - {fileID: 9029179147078244189} m_Father: {fileID: 4081528251189279610} 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: -139.54, y: -59} + m_AnchoredPosition: {x: -52, y: -279} m_SizeDelta: {x: 52.8188, y: 54.1928} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6696617808920843981 @@ -740,7 +576,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2951965605894724779 +--- !u!1 &2772020843582948104 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -748,122 +584,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3685573020211257619} + - component: {fileID: 5278037803246841763} + - component: {fileID: 1337992743928194518} + - component: {fileID: 8517452637489306137} m_Layer: 5 - m_Name: Fill Area + m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3685573020211257619 +--- !u!224 &5278037803246841763 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2951965605894724779} - 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: 3300686799643354555} - m_Father: {fileID: 4992232848988748673} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 2.5, y: -0.0000009536743} - m_SizeDelta: {x: -5, y: 3.4106} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3032213930853029097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4196056007942675757} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4196056007942675757 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3032213930853029097} - 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: 1836939214632882188} - m_Father: {fileID: 4992232848988748673} - 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: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3113161384291275162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4499381856413446389} - - component: {fileID: 2791216773336795217} - - component: {fileID: 6846263305591773433} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4499381856413446389 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3113161384291275162} + m_GameObject: {fileID: 2772020843582948104} 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: 292805107253990102} + m_Father: {fileID: 1841268260948759132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 0, y: 0.25} - m_AnchoredPosition: {x: 175.5, y: 4.7947} - m_SizeDelta: {x: 341, y: 13} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2791216773336795217 +--- !u!222 &1337992743928194518 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3113161384291275162} + m_GameObject: {fileID: 2772020843582948104} m_CullTransparentMesh: 1 ---- !u!114 &6846263305591773433 +--- !u!114 &8517452637489306137 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3113161384291275162} + m_GameObject: {fileID: 2772020843582948104} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -877,7 +641,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fd9a159f4954ce34792126ba04072e1a, type: 3} + m_Sprite: {fileID: 21300000, guid: b53342587a8738048b3ca21751d36cf4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -887,6 +651,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2890820905660339295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8720116338288558810} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8720116338288558810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2890820905660339295} + 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: 2395155594869819517} + m_Father: {fileID: 5423264244508078961} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: -1.3519} + m_SizeDelta: {x: -20, y: 6.5666} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3136065462112667608 GameObject: m_ObjectHideFlags: 0 @@ -903,7 +703,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4396128134545367025 RectTransform: m_ObjectHideFlags: 0 @@ -917,12 +717,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8090693157322266883} - - {fileID: 577834075343202317} m_Father: {fileID: 4081528251189279610} 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: -139.5417, y: -88.754684} + m_AnchoredPosition: {x: -53, y: -184} m_SizeDelta: {x: 52.8188, y: 54.1928} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2411786602197927634 @@ -973,7 +772,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 ---- !u!1 &3260367881806935298 +--- !u!1 &3409633170409009058 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -981,109 +780,88 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1836939214632882188} - - component: {fileID: 7384817887729566870} - - component: {fileID: 8680139664746958843} + - component: {fileID: 246797727244771830} + - component: {fileID: 838694659021699504} m_Layer: 5 - m_Name: Handle + m_Name: m_slider_BgmSound m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1836939214632882188 +--- !u!224 &246797727244771830 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3260367881806935298} - 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: 4196056007942675757} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000015258789, y: -0.323} - m_SizeDelta: {x: 14, y: 10.1187} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7384817887729566870 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3260367881806935298} - m_CullTransparentMesh: 1 ---- !u!114 &8680139664746958843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3260367881806935298} - 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: 022c03a1ad88c824895a4028b9375b74, 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!1 &3322631297790552125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 17520770015820778} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &17520770015820778 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3322631297790552125} + m_GameObject: {fileID: 3409633170409009058} 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: 1180774072908344974} - m_Father: {fileID: 292805107253990102} + - {fileID: 8464962310274067897} + - {fileID: 3027068977226889149} + - {fileID: 1643851522143569780} + m_Father: {fileID: 4081528251189279610} 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: -20, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 5.5122, y: -54} + m_SizeDelta: {x: 581.8738, y: 48.3429} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &838694659021699504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3409633170409009058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 2371850430682876041} + m_FillRect: {fileID: 9012943009304587434} + m_HandleRect: {fileID: 4242591931033171757} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3427516677810858397 GameObject: m_ObjectHideFlags: 0 @@ -1119,8 +897,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: -5.9, y: -216.6} - m_SizeDelta: {x: 190, y: 62} + m_AnchoredPosition: {x: 12, y: -575} + m_SizeDelta: {x: 454, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5086476652144327326 CanvasRenderer: @@ -1150,7 +928,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b2a68309edc106a47bc6de73e29407b5, type: 3} + m_Sprite: {fileID: 21300000, guid: fae9b49e0764c3f43826cafdbca7ffa4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1204,6 +982,160 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3450162812694722327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8464962310274067897} + - component: {fileID: 1168645601075746597} + - component: {fileID: 4108375889208351206} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8464962310274067897 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3450162812694722327} + 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: 246797727244771830} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: -0.38622952} + m_SizeDelta: {x: 0, y: 8.498} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1168645601075746597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3450162812694722327} + m_CullTransparentMesh: 1 +--- !u!114 &4108375889208351206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3450162812694722327} + 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: 8388756f67ab8f34e987e4a66d675c3d, 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!1 &3497926840136463539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1334371723543478268} + - component: {fileID: 3265033709240599850} + - component: {fileID: 2730694078620436756} + m_Layer: 5 + m_Name: Text (Legacy) (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1334371723543478268 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497926840136463539} + 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: 4081528251189279610} + 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: -187.4, y: -282} + m_SizeDelta: {x: 209.8184, y: 49.1533} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3265033709240599850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497926840136463539} + m_CullTransparentMesh: 1 +--- !u!114 &2730694078620436756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497926840136463539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 48 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E16\u754C\u5165\u573A\u7279\u6548" --- !u!1 &3526502669594140401 GameObject: m_ObjectHideFlags: 0 @@ -1279,7 +1211,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3898679850845146681 +--- !u!1 &3943138657517901295 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1287,89 +1219,35 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 292805107253990102} - - component: {fileID: 8617007904083927813} + - component: {fileID: 1841268260948759132} m_Layer: 5 - m_Name: m_slider_BgmSound + m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &292805107253990102 +--- !u!224 &1841268260948759132 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3898679850845146681} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 3943138657517901295} + 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: 4499381856413446389} - - {fileID: 2711765226022597958} - - {fileID: 17520770015820778} - m_Father: {fileID: 4081528251189279610} + - {fileID: 5278037803246841763} + m_Father: {fileID: 5423264244508078961} 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: -10.9, y: 13.200001} - m_SizeDelta: {x: 345.2527, y: 19.1787} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8617007904083927813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3898679850845146681} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 8512210688847423441} - m_FillRect: {fileID: 486611630685642856} - m_HandleRect: {fileID: 1180774072908344974} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4715620030073166450 +--- !u!1 &5347708526616588830 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1377,9 +1255,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8477674119671591581} - - component: {fileID: 3517004189658107148} - - component: {fileID: 8555334397459135454} + - component: {fileID: 488697408827861549} + - component: {fileID: 4763101095741156010} + - component: {fileID: 3422227264169013648} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -1387,40 +1265,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8477674119671591581 +--- !u!224 &488697408827861549 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4715620030073166450} + m_GameObject: {fileID: 5347708526616588830} 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: 4992232848988748673} + m_Father: {fileID: 5423264244508078961} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 0, y: 0.25} - m_AnchoredPosition: {x: 175.5, y: 4.7947} - m_SizeDelta: {x: 341, y: 13} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: -0.38622952} + m_SizeDelta: {x: 0, y: 8.498} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3517004189658107148 +--- !u!222 &4763101095741156010 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4715620030073166450} + m_GameObject: {fileID: 5347708526616588830} m_CullTransparentMesh: 1 ---- !u!114 &8555334397459135454 +--- !u!114 &3422227264169013648 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4715620030073166450} + m_GameObject: {fileID: 5347708526616588830} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1434,7 +1312,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fd9a159f4954ce34792126ba04072e1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 8388756f67ab8f34e987e4a66d675c3d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1444,7 +1322,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5602729432100021530 +--- !u!1 &5815895696261972852 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1452,44 +1330,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4992232848988748673} - - component: {fileID: 5345053703852708908} + - component: {fileID: 5423264244508078961} + - component: {fileID: 2386496147529424494} m_Layer: 5 m_Name: m_slider_GameSound m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4992232848988748673 + m_IsActive: 1 +--- !u!224 &5423264244508078961 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5602729432100021530} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5815895696261972852} + 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: 8477674119671591581} - - {fileID: 3685573020211257619} - - {fileID: 4196056007942675757} + - {fileID: 488697408827861549} + - {fileID: 8720116338288558810} + - {fileID: 1841268260948759132} m_Father: {fileID: 4081528251189279610} 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: -7.8, y: 54.9} - m_SizeDelta: {x: 345.2527, y: 19.1787} + m_AnchoredPosition: {x: 5.5122, y: 94.808} + m_SizeDelta: {x: 581.8738, y: 48.3429} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5345053703852708908 +--- !u!114 &2386496147529424494 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5602729432100021530} + m_GameObject: {fileID: 5815895696261972852} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} @@ -1523,9 +1401,9 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 8680139664746958843} - m_FillRect: {fileID: 3300686799643354555} - m_HandleRect: {fileID: 1836939214632882188} + m_TargetGraphic: {fileID: 8517452637489306137} + m_FillRect: {fileID: 2395155594869819517} + m_HandleRect: {fileID: 5278037803246841763} m_Direction: 0 m_MinValue: 0 m_MaxValue: 1 @@ -1534,121 +1412,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &6181697066744991442 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2711765226022597958} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2711765226022597958 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6181697066744991442} - 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: 486611630685642856} - m_Father: {fileID: 292805107253990102} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 2.5, y: -0.0000009536743} - m_SizeDelta: {x: -5, y: 3.4106} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6711102902276933744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 577834075343202317} - - component: {fileID: 7465978191156847568} - - component: {fileID: 8004143488538775863} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &577834075343202317 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711102902276933744} - 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: 4396128134545367025} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 114.5, y: -3.9036} - m_SizeDelta: {x: 80.8326, y: -3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7465978191156847568 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711102902276933744} - m_CullTransparentMesh: 1 ---- !u!114 &8004143488538775863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6711102902276933744} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.37647063, g: 0.20784315, b: 0.08627451, 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_FontData: - m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u793C\u7269\u7279\u6548" --- !u!1 &6834903456432847494 GameObject: m_ObjectHideFlags: 0 @@ -1725,7 +1488,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7275315992762607290 +--- !u!1 &6949618791907830132 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1733,53 +1496,89 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1180774072908344974} - - component: {fileID: 4319140011646286726} - - component: {fileID: 8512210688847423441} + - component: {fileID: 1643851522143569780} m_Layer: 5 - m_Name: Handle + m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1180774072908344974 +--- !u!224 &1643851522143569780 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7275315992762607290} + m_GameObject: {fileID: 6949618791907830132} 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: 17520770015820778} + m_Children: + - {fileID: 4242591931033171757} + m_Father: {fileID: 246797727244771830} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 4.8, y: 0.3516} - m_SizeDelta: {x: 14, y: 13.5245} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4319140011646286726 +--- !u!1 &7086811898291120987 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4735675994220804998} + - component: {fileID: 8637523742179980807} + - component: {fileID: 8223301901471199308} + m_Layer: 5 + m_Name: Text (Legacy) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4735675994220804998 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7086811898291120987} + 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: 4081528251189279610} + 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: -187.4, y: -183.8} + m_SizeDelta: {x: 209.8184, y: 49.1533} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8637523742179980807 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7275315992762607290} + m_GameObject: {fileID: 7086811898291120987} m_CullTransparentMesh: 1 ---- !u!114 &8512210688847423441 +--- !u!114 &8223301901471199308 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7275315992762607290} + m_GameObject: {fileID: 7086811898291120987} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1790,16 +1589,20 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 022c03a1ad88c824895a4028b9375b74, 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 + m_FontData: + m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 48 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u793C\u7269\u7279\u6548" --- !u!1 &7666412045263395013 GameObject: m_ObjectHideFlags: 0 @@ -1832,6 +1635,7 @@ RectTransform: m_Children: - {fileID: 5120598360611216442} - {fileID: 4081528251189279610} + - {fileID: 8619294335379144811} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1879,7 +1683,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 55 ---- !u!1 &8715277184539493645 +--- !u!1 &8036871717868410271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1887,9 +1691,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5135996404073053029} - - component: {fileID: 9222046600694569754} - - component: {fileID: 3028550937327184702} + - component: {fileID: 4828697897226869749} + - component: {fileID: 4747203000774939828} + - component: {fileID: 7914174108144916631} m_Layer: 5 m_Name: Text (Legacy) (1) m_TagString: Untagged @@ -1897,13 +1701,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5135996404073053029 +--- !u!224 &4828697897226869749 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715277184539493645} + m_GameObject: {fileID: 8036871717868410271} 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} @@ -1913,31 +1717,31 @@ 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: -82.2, y: 60} - m_SizeDelta: {x: 201.0849, y: 43.6949} + m_AnchoredPosition: {x: -187.4, y: 13.8} + m_SizeDelta: {x: 209.8184, y: 49.1533} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9222046600694569754 +--- !u!222 &4747203000774939828 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715277184539493645} + m_GameObject: {fileID: 8036871717868410271} m_CullTransparentMesh: 1 ---- !u!114 &3028550937327184702 +--- !u!114 &7914174108144916631 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715277184539493645} + m_GameObject: {fileID: 8036871717868410271} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4039216, g: 0.24313727, b: 0.12941177, a: 1} + 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 @@ -1946,11 +1750,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 5b281cd6135061b478fbb32b619fbab0, type: 3} - m_FontSize: 29 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 48 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -1958,6 +1762,156 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u80CC\u666F\u97F3\u6548" +--- !u!1 &8226829652716932029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9012943009304587434} + - component: {fileID: 4393898426447424855} + - component: {fileID: 1873191209765966610} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9012943009304587434 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8226829652716932029} + 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: 3027068977226889149} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4393898426447424855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8226829652716932029} + m_CullTransparentMesh: 1 +--- !u!114 &1873191209765966610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8226829652716932029} + 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: 38379376f62f30f499fd7ac3492d2927, 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!1 &8379771769910809280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8619294335379144811} + - component: {fileID: 5897035907662857538} + - component: {fileID: 2262661758347149758} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8619294335379144811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8379771769910809280} + 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: 4070374929253206932} + 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: 0} + m_SizeDelta: {x: 1080, y: 2340.5715} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5897035907662857538 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8379771769910809280} + m_CullTransparentMesh: 1 +--- !u!114 &2262661758347149758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8379771769910809280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.6117647} + 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: 2cdf6cf0c55426d46942d97e835267c3, 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!1 &9108663456504243039 GameObject: m_ObjectHideFlags: 0 @@ -1988,20 +1942,21 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 3272445657825206264} - {fileID: 4764637147943422183} - {fileID: 1960434599741854716} - - {fileID: 4992232848988748673} - - {fileID: 5135996404073053029} - - {fileID: 292805107253990102} + - {fileID: 5423264244508078961} + - {fileID: 246797727244771830} + - {fileID: 4828697897226869749} + - {fileID: 4735675994220804998} + - {fileID: 1334371723543478268} - {fileID: 4396128134545367025} - {fileID: 7050198964783562439} m_Father: {fileID: 4070374929253206932} 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.000011981, y: -60} - m_SizeDelta: {x: 503, y: 494} + m_AnchoredPosition: {x: 0.000011981, y: 205} + m_SizeDelta: {x: 681, y: 860} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7910362769509927291 CanvasRenderer: @@ -2031,7 +1986,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c3faf5115e50abc4a875426dad1f57c2, type: 3} + m_Sprite: {fileID: 21300000, guid: 90ff6c24e99837a429943af61460803d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png new file mode 100644 index 00000000..28822b9f Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png.meta similarity index 98% rename from UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png.meta rename to UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png.meta index 410dc975..e21982a5 100644 --- a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png.meta +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/Common/beij.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 503ed1e23062d9b458bb2cf34b4ba624 +guid: bf41522f17e35c244a6cbe340bddee06 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png deleted file mode 100644 index f30abef3..00000000 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/BeiJi.png and /dev/null differ diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UISettingForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UISettingForm.cs index e094794d..b7ecf9c6 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UISettingForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UISettingForm.cs @@ -8,7 +8,6 @@ namespace GameLogic class UISettingForm : UIWindow { #region 脚本工具生成的代码 - private Button m_btn_closeBtn; private Button m_btn_OkBtn; private Slider m_slider_GameSound; private Slider m_slider_BgmSound; @@ -16,13 +15,11 @@ namespace GameLogic private Toggle m_toggle_WorldEffect; protected override void ScriptGenerator() { - m_btn_closeBtn = FindChildComponent