diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMCommonConfirmPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMCommonConfirmPanel.prefab index a1968273af..7916a38e22 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMCommonConfirmPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMCommonConfirmPanel.prefab @@ -31,7 +31,7 @@ RectTransform: - {fileID: 1667002311277386234} - {fileID: 1083722159440312667} m_Father: {fileID: 7317048584826271904} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -240,8 +240,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.6, y: 0} - m_SizeDelta: {x: -68.5, y: 0} + m_AnchoredPosition: {x: 0, y: 4} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7325099602942596844 CanvasRenderer: @@ -316,7 +316,7 @@ RectTransform: m_Children: - {fileID: 9034068141438048160} m_Father: {fileID: 7317048584826271904} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -504,7 +504,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2869336131105038414 @@ -550,6 +550,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 0 +--- !u!1 &3573009153625256159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5957849543847917075} + - component: {fileID: 597693382267927720} + - component: {fileID: 4639484618452140828} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5957849543847917075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3573009153625256159} + 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_Children: [] + m_Father: {fileID: 7317048584826271904} + m_RootOrder: 1 + 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.96, y: -1.6} + m_SizeDelta: {x: 866.3, y: 600.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &597693382267927720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3573009153625256159} + m_CullTransparentMesh: 0 +--- !u!114 &4639484618452140828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3573009153625256159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: db524d3ca12854646b84559dd3e346a3, 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 --- !u!1 &3886367584261459662 GameObject: m_ObjectHideFlags: 0 @@ -580,11 +654,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7317048584826271904} - m_RootOrder: 0 + m_RootOrder: 2 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.339997, y: 285} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 7.339997, y: -41.390015} m_SizeDelta: {x: 393.1, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7216258981789464123 @@ -608,7 +682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8627451, b: 0.59607846, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -616,9 +690,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 46 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 4 m_MaxSize: 50 @@ -630,6 +704,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u63D0\u793A" LanguageIndex: 0 +--- !u!1 &5686619132931470021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4054814099262282955} + - component: {fileID: 4132791559353379378} + - component: {fileID: 5553884927141028295} + m_Layer: 5 + m_Name: wenli + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4054814099262282955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5686619132931470021} + 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_Children: [] + m_Father: {fileID: 4498227435505206925} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 107} + m_SizeDelta: {x: 642, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4132791559353379378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5686619132931470021} + m_CullTransparentMesh: 0 +--- !u!114 &5553884927141028295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5686619132931470021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b105068399c35b842b41ad874dae29f0, 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 --- !u!1 &6548589582022010170 GameObject: m_ObjectHideFlags: 0 @@ -665,10 +813,10 @@ RectTransform: m_Father: {fileID: 7464270486657849393} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -246.29, y: 0.5} - m_SizeDelta: {x: 368.7, y: 125.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -190, y: 0} + m_SizeDelta: {x: 300, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5430246485127341836 CanvasRenderer: @@ -698,7 +846,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c2e594756c0aeab498b54d7d2f2eb2fe, type: 3} + m_Sprite: {fileID: 21300000, guid: 98032221983d95449b8ae9b38538089d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -804,10 +952,10 @@ RectTransform: m_Father: {fileID: 7464270486657849393} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 253, y: -1} - m_SizeDelta: {x: 368.7, y: 125.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 190, y: 0} + m_SizeDelta: {x: 300, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7919996903531968358 CanvasRenderer: @@ -837,7 +985,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: e7842f74ba7bf7e498aa76e925ced625, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -937,6 +1085,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4498227435505206925} + - {fileID: 5957849543847917075} - {fileID: 2180458446920578053} - {fileID: 6965081571982651930} - {fileID: 7464270486657849393} @@ -978,8 +1128,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 60da54ea70faabc49823d0462d3ae80d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f2b962493626faf4d9a1829d593bff07, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1067,6 +1217,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E \u8BA4" LanguageIndex: 0 +--- !u!1 &8232022664706365928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4498227435505206925} + - component: {fileID: 2211161899532119276} + - component: {fileID: 1376020542874105764} + m_Layer: 5 + m_Name: TitleBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4498227435505206925 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232022664706365928} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 4054814099262282955} + m_Father: {fileID: 7317048584826271904} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -45.99002} + m_SizeDelta: {x: 666, y: 124} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2211161899532119276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232022664706365928} + m_CullTransparentMesh: 0 +--- !u!114 &1376020542874105764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8232022664706365928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 23f48f30ffa61104f8558bd46c51b2cd, 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 --- !u!1 &8578508880073135533 GameObject: m_ObjectHideFlags: 0 @@ -1098,12 +1323,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7317048584826271904} - m_RootOrder: 4 + m_RootOrder: 6 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: 416.1, y: 288.2} - m_SizeDelta: {x: 142, y: 131} + m_AnchoredPosition: {x: 408.2, y: 274.2} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6018974459994190017 CanvasRenderer: @@ -1133,7 +1358,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 35da2f4636803c446b5f488a6f757f93, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b75ff76a0993041ac8b194fbeb0c19, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1214,7 +1439,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7317048584826271904} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}