diff --git a/Assets/arts/textures/background/bounty/bounty_banner_1.png b/Assets/arts/textures/background/bounty/bounty_banner_1.png deleted file mode 100644 index 8aa5b4b65..000000000 Binary files a/Assets/arts/textures/background/bounty/bounty_banner_1.png and /dev/null differ diff --git a/Assets/arts/textures/background/bounty/bounty_bg_1.png b/Assets/arts/textures/background/bounty/bounty_bg_1.png index 6f48399f7..884da18e3 100644 Binary files a/Assets/arts/textures/background/bounty/bounty_bg_1.png and b/Assets/arts/textures/background/bounty/bounty_bg_1.png differ diff --git a/Assets/arts/textures/background/bounty/bounty_bg_2.png b/Assets/arts/textures/background/bounty/bounty_bg_2.png index f92da4b48..d98d6e740 100644 Binary files a/Assets/arts/textures/background/bounty/bounty_bg_2.png and b/Assets/arts/textures/background/bounty/bounty_bg_2.png differ diff --git a/Assets/arts/textures/background/bounty/bounty_bg_4.png b/Assets/arts/textures/background/bounty/bounty_bg_4.png index 66970fc2f..f014a7e54 100644 Binary files a/Assets/arts/textures/background/bounty/bounty_bg_4.png and b/Assets/arts/textures/background/bounty/bounty_bg_4.png differ diff --git a/Assets/arts/textures/background/bounty/bounty_bg_5.png b/Assets/arts/textures/background/bounty/bounty_bg_5.png index 8d0eabcba..e58506c00 100644 Binary files a/Assets/arts/textures/background/bounty/bounty_bg_5.png and b/Assets/arts/textures/background/bounty/bounty_bg_5.png differ diff --git a/Assets/arts/textures/background/bounty/bounty_bg_6.png b/Assets/arts/textures/background/bounty/bounty_bg_6.png new file mode 100644 index 000000000..937c75c1c Binary files /dev/null and b/Assets/arts/textures/background/bounty/bounty_bg_6.png differ diff --git a/Assets/arts/textures/background/bounty/bounty_banner_1.png.meta b/Assets/arts/textures/background/bounty/bounty_bg_6.png.meta similarity index 95% rename from Assets/arts/textures/background/bounty/bounty_banner_1.png.meta rename to Assets/arts/textures/background/bounty/bounty_bg_6.png.meta index 4d88ac8c5..057e9a5c5 100644 --- a/Assets/arts/textures/background/bounty/bounty_banner_1.png.meta +++ b/Assets/arts/textures/background/bounty/bounty_bg_6.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 86e4d3bfc313bba4b9468f0362377a0d +guid: 3dca70492fdcb954290790a7634658cf TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -79,7 +79,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/background/bounty/bounty_banner_1.png.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/bounty_bg_2.png b/Assets/arts/textures/ui/bounty/bounty_bg_2.png index 7884dce3e..2d5bb7d61 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_bg_2.png and b/Assets/arts/textures/ui/bounty/bounty_bg_2.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_board_1.png b/Assets/arts/textures/ui/bounty/bounty_board_1.png index 3e8dfaa8e..5221bf471 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_board_1.png and b/Assets/arts/textures/ui/bounty/bounty_board_1.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_dec_1.png b/Assets/arts/textures/ui/bounty/bounty_dec_1.png index 7884f4a34..a3c2276db 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_dec_1.png and b/Assets/arts/textures/ui/bounty/bounty_dec_1.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_dec_3.png b/Assets/arts/textures/ui/bounty/bounty_dec_3.png index f9b9b4d3b..ca72604db 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_dec_3.png and b/Assets/arts/textures/ui/bounty/bounty_dec_3.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_dec_4.png b/Assets/arts/textures/ui/bounty/bounty_dec_4.png index 99117b63b..a1df1756c 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_dec_4.png and b/Assets/arts/textures/ui/bounty/bounty_dec_4.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_line_1.png b/Assets/arts/textures/ui/bounty/bounty_line_1.png index 13dc667e6..c1766709d 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_line_1.png and b/Assets/arts/textures/ui/bounty/bounty_line_1.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_line_2.png b/Assets/arts/textures/ui/bounty/bounty_line_2.png index 357ab9d09..a3b15015e 100644 Binary files a/Assets/arts/textures/ui/bounty/bounty_line_2.png and b/Assets/arts/textures/ui/bounty/bounty_line_2.png differ diff --git a/Assets/lua/app/common/pay_manager.lua.bytes b/Assets/lua/app/common/pay_manager.lua.bytes index d143e332e..a518e06c7 100644 Binary files a/Assets/lua/app/common/pay_manager.lua.bytes and b/Assets/lua/app/common/pay_manager.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index a2ea77f41..ad311120d 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/ui/bounty/bounty_buy_ui.lua.bytes b/Assets/lua/app/ui/bounty/bounty_buy_ui.lua.bytes index 316ec0cfa..7ef3b5572 100644 Binary files a/Assets/lua/app/ui/bounty/bounty_buy_ui.lua.bytes and b/Assets/lua/app/ui/bounty/bounty_buy_ui.lua.bytes differ 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 12f5bee93..f53e98738 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/prefabs/ui/bounty/bounty_buy_ui.prefab b/Assets/prefabs/ui/bounty/bounty_buy_ui.prefab index a346b1b04..623b9da97 100644 --- a/Assets/prefabs/ui/bounty/bounty_buy_ui.prefab +++ b/Assets/prefabs/ui/bounty/bounty_buy_ui.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: 0, y: 120} + m_AnchoredPosition: {x: 0, y: 106} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4816274672876390245 @@ -194,7 +194,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 17} - m_SizeDelta: {x: 636, y: 960} + m_SizeDelta: {x: 664, y: 980} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6909977157877530746 CanvasRenderer: @@ -266,7 +266,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 253} - m_SizeDelta: {x: 538, y: 218} + m_SizeDelta: {x: 538, y: 232} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8165730293609874279 CanvasRenderer: @@ -361,7 +361,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -412,7 +412,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: 50, y: 120} + m_AnchoredPosition: {x: 50, y: 106} m_SizeDelta: {x: 130, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1856613858920024029 @@ -487,7 +487,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: -44, y: -350} + m_AnchoredPosition: {x: -50, y: -350} m_SizeDelta: {x: 200, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7941121900965085182 @@ -621,8 +621,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: -110, y: -248} - m_SizeDelta: {x: 278, y: 51} + m_AnchoredPosition: {x: -107, y: -243} + m_SizeDelta: {x: 272, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5468852378091223966 CanvasRenderer: @@ -788,8 +788,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -889,7 +889,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: -50, y: 120} + m_AnchoredPosition: {x: -50, y: 106} m_SizeDelta: {x: 130, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1411950881814710213 @@ -962,11 +962,11 @@ RectTransform: m_Father: {fileID: 2853699279508015926} m_RootOrder: 8 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: -571} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -22} m_SizeDelta: {x: 92, y: 98} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &4609263583543076134 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1039,7 +1039,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: 0, y: 440} + m_AnchoredPosition: {x: 0, y: 441} m_SizeDelta: {x: 540, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4833170317954392705 @@ -1175,8 +1175,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: 151, y: -380} - m_SizeDelta: {x: 168, y: 65} + m_AnchoredPosition: {x: 154, y: -380} + m_SizeDelta: {x: 194, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2460897439577859879 CanvasRenderer: @@ -1206,7 +1206,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1264,7 +1264,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -202, y: -186} - m_SizeDelta: {x: 94, y: 57} + m_SizeDelta: {x: 76, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8194429408975352306 CanvasRenderer: @@ -1338,8 +1338,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: -110, y: -412} - m_SizeDelta: {x: 278, y: 51} + m_AnchoredPosition: {x: -107, y: -406} + m_SizeDelta: {x: 272, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7445689520148252242 CanvasRenderer: @@ -1472,8 +1472,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: -166, y: 192} - m_SizeDelta: {x: 166, y: 50} + m_AnchoredPosition: {x: 11, y: 173} + m_SizeDelta: {x: 194, y: 28} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6758776001539366581 CanvasRenderer: @@ -1530,14 +1530,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1850,8 +1850,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1951,7 +1951,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: -44, y: -186} + m_AnchoredPosition: {x: -50, y: -186} m_SizeDelta: {x: 200, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6205593569984152346 @@ -2086,7 +2086,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -202, y: -350} - m_SizeDelta: {x: 94, y: 57} + m_SizeDelta: {x: 76, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2777632540214001409 CanvasRenderer: @@ -2162,8 +2162,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: 151, y: -216} - m_SizeDelta: {x: 168, y: 65} + m_AnchoredPosition: {x: 154, y: -216} + m_SizeDelta: {x: 194, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2436247741004639247 CanvasRenderer: @@ -2193,7 +2193,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2309,7 +2309,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -56 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2436,7 +2436,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -56 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2563,7 +2563,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 43 + value: 35 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2690,7 +2690,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -56 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2817,7 +2817,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 43 + value: 35 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2944,7 +2944,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -56 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3071,7 +3071,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 43 + value: 35 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3198,7 +3198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 43 + value: 35 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3325,7 +3325,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 43 + value: 35 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3452,7 +3452,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -56 + value: -61 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab index c99590d89..97aec23e6 100644 --- a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab +++ b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8756210076838551104} - m_RootOrder: 5 + 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} @@ -256,7 +256,7 @@ RectTransform: - {fileID: 7934898876198237638} - {fileID: 4859345342887626137} m_Father: {fileID: 8756210076838551104} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -461,7 +461,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: 0, y: -4} + m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 234, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &130548844196084842 @@ -761,7 +761,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8756210076838551104} - m_RootOrder: 6 + 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} @@ -1046,7 +1046,7 @@ RectTransform: - {fileID: 2831366162968130897} - {fileID: 5364362473678056794} m_Father: {fileID: 8756210076838551104} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1187,102 +1187,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2985396407164141031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890872522410195713} - - component: {fileID: 5002791245573688106} - - component: {fileID: 1157276031996435700} - m_Layer: 5 - m_Name: ui_spine_obj - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1890872522410195713 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2985396407164141031} - 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: 8756210076838551104} - 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, y: -233} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5002791245573688106 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2985396407164141031} - m_CullTransparentMesh: 1 ---- !u!114 &1157276031996435700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2985396407164141031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: c131780bfdc98154ba12a567d7d1033c, type: 2} - additiveMaterial: {fileID: 0} - multiplyMaterial: {fileID: 0} - screenMaterial: {fileID: 0} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - startingAnimation: - startingLoop: 0 - timeScale: 1 - freeze: 0 - updateWhenInvisible: 3 - allowMultipleCanvasRenderers: 0 - canvasRenderers: [] - separatorSlotNames: [] - enableSeparatorSlots: 0 - separatorParts: [] - updateSeparatorPartLocation: 1 - disableMeshAssignmentOnOverride: 1 - meshGenerator: - settings: - useClipping: 1 - zSpacing: 0 - pmaVertexColors: 1 - tintBlack: 0 - canvasGroupTintBlack: 0 - calculateTangents: 0 - addNormals: 0 - immutableTriangles: 0 - updateTiming: 1 - unscaledTime: 0 --- !u!1 &3266912416713217143 GameObject: m_ObjectHideFlags: 0 @@ -1315,7 +1219,7 @@ RectTransform: m_Children: - {fileID: 8051104912802691994} m_Father: {fileID: 8756210076838551104} - m_RootOrder: 7 + 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} @@ -1466,10 +1370,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1209831792032525338} - - {fileID: 1890872522410195713} + - {fileID: 9106119335630548651} - {fileID: 6423042718413852083} - - {fileID: 3089605230460704393} - - {fileID: 841073652421072208} + - {fileID: 3732721124798958740} - {fileID: 5229655043651304349} - {fileID: 7334640269017785170} - {fileID: 6729094151385727374} @@ -2215,81 +2118,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5059764897650103346 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 841073652421072208} - - component: {fileID: 2529789678348600154} - - component: {fileID: 8497250919281300040} - m_Layer: 5 - m_Name: time_bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &841073652421072208 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5059764897650103346} - 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: 8756210076838551104} - 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} - m_AnchoredPosition: {x: 0, y: -254} - m_SizeDelta: {x: 228, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2529789678348600154 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5059764897650103346} - m_CullTransparentMesh: 1 ---- !u!114 &8497250919281300040 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5059764897650103346} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - 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: 38e2716343d274e4e936c8f1cd4f04cd, 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 &5137034268006282439 GameObject: m_ObjectHideFlags: 0 @@ -2442,8 +2270,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: 0, y: 0} - m_SizeDelta: {x: 572, y: 64} + m_AnchoredPosition: {x: 0, y: -3} + m_SizeDelta: {x: 590, y: 65} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3893419516498045569 CanvasRenderer: @@ -2530,7 +2358,7 @@ RectTransform: - {fileID: 3223154364955181446} - {fileID: 1177550915381763322} m_Father: {fileID: 8756210076838551104} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2612,6 +2440,174 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5551979529463113805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9106119335630548651} + - component: {fileID: 2382309514596048512} + - component: {fileID: 8389552630902671710} + m_Layer: 5 + m_Name: ui_spine_obj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9106119335630548651 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551979529463113805} + 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: 8756210076838551104} + 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, y: -235} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2382309514596048512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551979529463113805} + m_CullTransparentMesh: 1 +--- !u!114 &8389552630902671710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551979529463113805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 11400000, guid: c131780bfdc98154ba12a567d7d1033c, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + disableMeshAssignmentOnOverride: 1 + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + pmaVertexColors: 1 + tintBlack: 0 + canvasGroupTintBlack: 0 + calculateTangents: 0 + addNormals: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 +--- !u!1 &5801572180844317797 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3732721124798958740} + - component: {fileID: 6587938878064410669} + - component: {fileID: 884866485903116753} + m_Layer: 0 + m_Name: bg_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3732721124798958740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5801572180844317797} + 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: 8756210076838551104} + 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} + m_AnchoredPosition: {x: 0, y: -332} + m_SizeDelta: {x: 1280, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6587938878064410669 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5801572180844317797} + m_CullTransparentMesh: 1 +--- !u!114 &884866485903116753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5801572180844317797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 3dca70492fdcb954290790a7634658cf, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &5829639063031981973 GameObject: m_ObjectHideFlags: 0 @@ -2721,7 +2717,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: 0, y: 4} + m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6345433285364120523 @@ -2754,8 +2750,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2779,8 +2775,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 - m_fontSizeBase: 34 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2821,78 +2817,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5978583153083917973 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3089605230460704393} - - component: {fileID: 7073541665240895860} - - component: {fileID: 9011206675727881548} - m_Layer: 5 - m_Name: bg_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3089605230460704393 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5978583153083917973} - 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: 8756210076838551104} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -266} - m_SizeDelta: {x: 7.9999995, y: 164} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7073541665240895860 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5978583153083917973} - m_CullTransparentMesh: 1 ---- !u!114 &9011206675727881548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5978583153083917973} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2af436c80c32cb046bb90c11245ea4ed, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &6076523410243627288 GameObject: m_ObjectHideFlags: 0 @@ -3054,7 +2978,7 @@ RectTransform: m_GameObject: {fileID: 6440649853465962136} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: [] m_Father: {fileID: 6422827025758656605} m_RootOrder: 1 @@ -3409,8 +3333,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: 0, y: 0} - m_SizeDelta: {x: 64, y: 73} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 62, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2232266410298995376 CanvasRenderer: @@ -3484,7 +3408,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: -187, y: -4} + m_AnchoredPosition: {x: -187, y: -2} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4426464225768525362 @@ -3693,7 +3617,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: 263, y: -4} + m_AnchoredPosition: {x: 263, y: -2} m_SizeDelta: {x: 100, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7825765254247771023 @@ -3940,8 +3864,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: 145, y: 0} - m_SizeDelta: {x: 64, y: 73} + m_AnchoredPosition: {x: 135, y: 3} + m_SizeDelta: {x: 62, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9015275551326904540 CanvasRenderer: @@ -4692,7 +4616,7 @@ MonoBehaviour: - name: bounty_main_ui.top_node.ui_spine_obj hashName: 1136651914 objectType: 6 - gameObject: {fileID: 2985396407164141031} + gameObject: {fileID: 5551979529463113805} --- !u!114 &8949342078755672405 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4779,7 +4703,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: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3949283251512287483 @@ -4984,16 +4908,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8390582ba3282e842a66635351048609, type: 3} ---- !u!1 &7413545688893326525 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 8390582ba3282e842a66635351048609, type: 3} - m_PrefabInstance: {fileID: 4312245492012241207} - m_PrefabAsset: {fileID: 0} --- !u!224 &1765066371328713059 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 8390582ba3282e842a66635351048609, type: 3} m_PrefabInstance: {fileID: 4312245492012241207} m_PrefabAsset: {fileID: 0} +--- !u!1 &7413545688893326525 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 8390582ba3282e842a66635351048609, type: 3} + m_PrefabInstance: {fileID: 4312245492012241207} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4393684699394982797 PrefabInstance: m_ObjectHideFlags: 0 @@ -5099,16 +5023,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8390582ba3282e842a66635351048609, type: 3} ---- !u!1 &7044641502889711111 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 8390582ba3282e842a66635351048609, type: 3} - m_PrefabInstance: {fileID: 4393684699394982797} - m_PrefabAsset: {fileID: 0} --- !u!224 &2260642200971097049 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 8390582ba3282e842a66635351048609, type: 3} m_PrefabInstance: {fileID: 4393684699394982797} m_PrefabAsset: {fileID: 0} +--- !u!1 &7044641502889711111 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 8390582ba3282e842a66635351048609, type: 3} + m_PrefabInstance: {fileID: 4393684699394982797} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4423667425341570695 PrefabInstance: m_ObjectHideFlags: 0 @@ -5226,13 +5150,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &6944021751936690957 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4423667425341570695} - m_PrefabAsset: {fileID: 0} --- !u!224 &2216594533029842643 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 4423667425341570695} m_PrefabAsset: {fileID: 0} +--- !u!1 &6944021751936690957 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 4423667425341570695} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 3f125b0bb..8d176bf86 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -71,8 +71,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: 130, y: 0} - m_SizeDelta: {x: 64, y: 73} + m_AnchoredPosition: {x: 126, y: 0} + m_SizeDelta: {x: 62, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6888107353905067398 CanvasRenderer: @@ -420,7 +420,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: 130, y: 3} + m_AnchoredPosition: {x: 126, y: 0} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5552139826231197872