diff --git a/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes b/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes index d0bb59c00..9d3178418 100644 Binary files a/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes and b/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/common/message_box.lua.bytes b/Assets/lua/app/ui/common/message_box.lua.bytes index e102e8dde..6113fe41a 100644 Binary files a/Assets/lua/app/ui/common/message_box.lua.bytes and b/Assets/lua/app/ui/common/message_box.lua.bytes differ diff --git a/Assets/lua/app/userdata/bounty/bounty_data.lua.bytes b/Assets/lua/app/userdata/bounty/bounty_data.lua.bytes index 22011a966..15f1cb94c 100644 Binary files a/Assets/lua/app/userdata/bounty/bounty_data.lua.bytes and b/Assets/lua/app/userdata/bounty/bounty_data.lua.bytes differ diff --git a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab index 5f11c17b3..f6cd7eccd 100644 --- a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab +++ b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab @@ -3820,7 +3820,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index 1aaaf0ec6..3a7ea7092 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -34,7 +34,7 @@ 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: 145, y: 0} + m_AnchoredPosition: {x: 47, y: 64} m_SizeDelta: {x: 330, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &832590403912408616 @@ -65,17 +65,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: "\u4ECA\u65E5\u4E0D\u5728\u63D0\u793A" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4290951349 - m_fontColor: {r: 0.70980394, g: 0.72156864, b: 0.7607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -92,14 +92,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 36 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 26 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -238,7 +238,7 @@ RectTransform: m_Children: - {fileID: 3319119855870404306} m_Father: {fileID: 4002258812364763181} - m_RootOrder: 3 + 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} @@ -303,15 +303,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.8627451} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -352,12 +352,12 @@ RectTransform: m_Children: - {fileID: 8169818512845020679} - {fileID: 2479030491461019998} - m_Father: {fileID: 4002258812364763181} - m_RootOrder: 4 + m_Father: {fileID: 6936090947867396111} + 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: -124, y: -95} + m_AnchoredPosition: {x: -124, y: 0} m_SizeDelta: {x: 208, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1773644531866514412 @@ -441,7 +441,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4002258812364763181} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -516,7 +516,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4002258812364763181} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -754,6 +754,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4847684170095283056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6936090947867396111} + m_Layer: 5 + m_Name: btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6936090947867396111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4847684170095283056} + 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: + - {fileID: 5535816440748046611} + - {fileID: 3647064225284467116} + m_Father: {fileID: 4002258812364763181} + 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} + m_AnchoredPosition: {x: 0, y: -136} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4918340139958855498 GameObject: m_ObjectHideFlags: 0 @@ -763,6 +800,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7060983534625811695} + - component: {fileID: 8443484724216762890} + - component: {fileID: 1265790441336753213} m_Layer: 5 m_Name: today m_TagString: Untagged @@ -784,13 +823,51 @@ RectTransform: - {fileID: 6412234626851302671} - {fileID: 7209293347416129617} m_Father: {fileID: 4002258812364763181} - m_RootOrder: 6 + 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: -175} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -123} + m_SizeDelta: {x: 568, y: 174} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8443484724216762890 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4918340139958855498} + m_CullTransparentMesh: 1 +--- !u!114 &1265790441336753213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4918340139958855498} + 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: 7cc4f1e808d2d6c45a721ee91ea63866, 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!1 &5126794169575288176 GameObject: m_ObjectHideFlags: 0 @@ -822,12 +899,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8597320429581163801} - m_Father: {fileID: 4002258812364763181} - m_RootOrder: 5 + m_Father: {fileID: 6936090947867396111} + 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: 124, y: -95} + m_AnchoredPosition: {x: 124, y: 0} m_SizeDelta: {x: 208, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8218460421123803817 @@ -910,13 +987,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7060983534625811695} - {fileID: 9188324771489412851} - {fileID: 5424090435795889818} - {fileID: 4944297764618943666} - {fileID: 7062665755871776357} - - {fileID: 5535816440748046611} - - {fileID: 3647064225284467116} - - {fileID: 7060983534625811695} + - {fileID: 6936090947867396111} m_Father: {fileID: 7390582371138297497} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -993,7 +1069,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4002258812364763181} - m_RootOrder: 0 + 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} @@ -1297,20 +1373,20 @@ MonoBehaviour: hashName: 4264583600 objectType: 0 gameObject: {fileID: 8156797759918051437} - - name: message_box.title_bg_img.cancel_btn - hashName: 1017984986 + - name: message_box.title_bg_img.btn.cancel_btn + hashName: 432565548 objectType: 0 gameObject: {fileID: 5126794169575288176} - - name: message_box.title_bg_img.ok_btn - hashName: 590442428 + - name: message_box.title_bg_img.btn.ok_btn + hashName: 1724915214 objectType: 0 gameObject: {fileID: 3253609334951185799} - - name: message_box.title_bg_img.cancel_btn.text - hashName: 4173078209 + - name: message_box.title_bg_img.btn.cancel_btn.text + hashName: 289893551 objectType: 0 gameObject: {fileID: 7884661295923494243} - - name: message_box.title_bg_img.ok_btn.text - hashName: 3773400095 + - name: message_box.title_bg_img.btn.ok_btn.text + hashName: 2805266701 objectType: 0 gameObject: {fileID: 4426901822265935258} - name: message_box.title_bg_img.title_text @@ -1341,10 +1417,14 @@ MonoBehaviour: hashName: 930375805 objectType: 0 gameObject: {fileID: 300109638638985350} - - name: message_box.title_bg_img.ok_btn.icon - hashName: 3773070187 + - name: message_box.title_bg_img.btn.ok_btn.icon + hashName: 2804936793 objectType: 0 gameObject: {fileID: 796314219863232056} + - name: message_box.title_bg_img.btn + hashName: 1800690425 + objectType: 0 + gameObject: {fileID: 4847684170095283056} --- !u!1 &7884661295923494243 GameObject: m_ObjectHideFlags: 0 @@ -1650,7 +1730,7 @@ 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: -45, y: 0} + m_AnchoredPosition: {x: -45, y: 64} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8138152585163357604