diff --git a/Assets/lua/app/config/avatar_frame.lua.bytes b/Assets/lua/app/config/avatar_frame.lua.bytes index 7f98b1139..fbb8f3bd7 100644 Binary files a/Assets/lua/app/config/avatar_frame.lua.bytes and b/Assets/lua/app/config/avatar_frame.lua.bytes differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 55c9016f6..d0f8cfb5a 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 79db974b9..5478b7a96 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/en/global.lua.bytes b/Assets/lua/app/config/strings/en/global.lua.bytes index f223c4dc3..42432f90c 100644 Binary files a/Assets/lua/app/config/strings/en/global.lua.bytes and b/Assets/lua/app/config/strings/en/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/es/global.lua.bytes b/Assets/lua/app/config/strings/es/global.lua.bytes index 889c64fbf..3ef3391a3 100644 Binary files a/Assets/lua/app/config/strings/es/global.lua.bytes and b/Assets/lua/app/config/strings/es/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/id/global.lua.bytes b/Assets/lua/app/config/strings/id/global.lua.bytes index 3fdc1d695..f717507a3 100644 Binary files a/Assets/lua/app/config/strings/id/global.lua.bytes and b/Assets/lua/app/config/strings/id/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ja/global.lua.bytes b/Assets/lua/app/config/strings/ja/global.lua.bytes index 1ec6db9e1..b43a91fd3 100644 Binary files a/Assets/lua/app/config/strings/ja/global.lua.bytes and b/Assets/lua/app/config/strings/ja/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ko/global.lua.bytes b/Assets/lua/app/config/strings/ko/global.lua.bytes index eeb33b119..2781040a6 100644 Binary files a/Assets/lua/app/config/strings/ko/global.lua.bytes and b/Assets/lua/app/config/strings/ko/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/pt/global.lua.bytes b/Assets/lua/app/config/strings/pt/global.lua.bytes index ceb6a4643..605f8e7ca 100644 Binary files a/Assets/lua/app/config/strings/pt/global.lua.bytes and b/Assets/lua/app/config/strings/pt/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/th/global.lua.bytes b/Assets/lua/app/config/strings/th/global.lua.bytes index 602614c5b..8d8bea32d 100644 Binary files a/Assets/lua/app/config/strings/th/global.lua.bytes and b/Assets/lua/app/config/strings/th/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/vi/global.lua.bytes b/Assets/lua/app/config/strings/vi/global.lua.bytes index 66379414d..2ce1009bb 100644 Binary files a/Assets/lua/app/config/strings/vi/global.lua.bytes and b/Assets/lua/app/config/strings/vi/global.lua.bytes differ diff --git a/Assets/lua/app/config/strings/zh/global.lua.bytes b/Assets/lua/app/config/strings/zh/global.lua.bytes index 7d776c8b2..d456df672 100644 Binary files a/Assets/lua/app/config/strings/zh/global.lua.bytes and b/Assets/lua/app/config/strings/zh/global.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/tourn_arena/cell/tourn_arena_bounty_cell.lua.bytes b/Assets/lua/app/ui/activity/tourn_arena/cell/tourn_arena_bounty_cell.lua.bytes index 555249a38..3979a4235 100644 Binary files a/Assets/lua/app/ui/activity/tourn_arena/cell/tourn_arena_bounty_cell.lua.bytes and b/Assets/lua/app/ui/activity/tourn_arena/cell/tourn_arena_bounty_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua.bytes b/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua.bytes index 606913574..3115b7c87 100644 Binary files a/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua.bytes and b/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_bounty_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua.bytes b/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua.bytes index 5991fe6f1..bf1bd183e 100644 Binary files a/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua.bytes and b/Assets/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/tourn_wave/cell/tourn_wave_bounty_cell.lua.bytes b/Assets/lua/app/ui/activity/tourn_wave/cell/tourn_wave_bounty_cell.lua.bytes index 872821f62..aebab6a8c 100644 Binary files a/Assets/lua/app/ui/activity/tourn_wave/cell/tourn_wave_bounty_cell.lua.bytes and b/Assets/lua/app/ui/activity/tourn_wave/cell/tourn_wave_bounty_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua.bytes b/Assets/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua.bytes index dee752c0c..c1b81e492 100644 Binary files a/Assets/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua.bytes and b/Assets/lua/app/ui/activity/tourn_wave/tourn_wave_bounty_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua.bytes b/Assets/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua.bytes index fa75f77fd..1c90376ec 100644 Binary files a/Assets/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua.bytes and b/Assets/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua.bytes b/Assets/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua.bytes index a2ab170e4..bfdaf6569 100644 Binary files a/Assets/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua.bytes and b/Assets/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab b/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab index 08d179588..3a385e34c 100644 --- a/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab +++ b/Assets/prefabs/ui/activity/tourn_arena/tourn_arena_ui.prefab @@ -1099,7 +1099,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5234241679034365998} - {fileID: 7615869510061311036} - {fileID: 7842962686859569204} - {fileID: 6860052282104540683} @@ -1334,7 +1333,7 @@ RectTransform: m_Children: - {fileID: 267856068183062245} m_Father: {fileID: 7615869510061311036} - 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} @@ -1641,12 +1640,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6720166237636129092} - {fileID: 3792406422745509890} - {fileID: 1669265390632377040} - {fileID: 6457677548625216468} - {fileID: 9168675490417147680} m_Father: {fileID: 7955369474207028639} - m_RootOrder: 1 + 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} @@ -1682,6 +1682,14 @@ MonoBehaviour: hashName: 334138829 objectType: 1 gameObject: {fileID: 117480353050942206} + - name: tourn_arena_bounty_cell.progress + hashName: 618301350 + objectType: 0 + gameObject: {fileID: 8760415914826044071} + - name: tourn_arena_bounty_cell.progress.img_prog + hashName: 1301138334 + objectType: 0 + gameObject: {fileID: 4376040287085568226} --- !u!222 &6262266099309738003 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2008,7 +2016,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2122658457679232406 RectTransform: m_ObjectHideFlags: 0 @@ -4077,82 +4085,6 @@ MonoBehaviour: childAlignment: 4 spacing: 30 verticalOrHorizontal: 0 ---- !u!1 &3642527194306233845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5234241679034365998} - - component: {fileID: 9179123079457330362} - - component: {fileID: 1353661980142584921} - m_Layer: 5 - m_Name: prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5234241679034365998 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - 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: 8079150689098105321} - m_Father: {fileID: 7955369474207028639} - 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: 45, y: 0} - m_SizeDelta: {x: 34, y: 150} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &9179123079457330362 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - m_CullTransparentMesh: 1 ---- !u!114 &1353661980142584921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - 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: 4d07f67313e7250489ab8a5b5a27c512, 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 &3682218309070832876 GameObject: m_ObjectHideFlags: 0 @@ -4888,6 +4820,75 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &4376040287085568226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6511327857058513352} + - component: {fileID: 7660413851132195796} + - component: {fileID: 2361943530592342193} + m_Layer: 5 + m_Name: img_prog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6511327857058513352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376040287085568226} + 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: 6720166237636129092} + m_RootOrder: 0 + 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: -6, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7660413851132195796 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376040287085568226} + m_CullTransparentMesh: 1 +--- !u!114 &2361943530592342193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4376040287085568226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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: 3d0134d70e5cca64eb727b5d81d93518, type: 3} + m_FillDirection: 3 + m_Value: 1 + m_FillCenter: 1 --- !u!1 &4607331189897849449 GameObject: m_ObjectHideFlags: 0 @@ -5531,7 +5532,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7955369474207028639} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5917,75 +5918,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5263660300203150264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8079150689098105321} - - component: {fileID: 3861212574023874529} - - component: {fileID: 7181729373717590405} - m_Layer: 5 - m_Name: img_prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8079150689098105321 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - 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: 5234241679034365998} - m_RootOrder: 0 - 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: -6, y: -6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3861212574023874529 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - m_CullTransparentMesh: 1 ---- !u!114 &7181729373717590405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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: 3d0134d70e5cca64eb727b5d81d93518, type: 3} - m_FillDirection: 3 - m_Value: 1 - m_FillCenter: 1 --- !u!1 &5321722316296545377 GameObject: m_ObjectHideFlags: 0 @@ -6061,7 +5993,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4412000624834818031 RectTransform: m_ObjectHideFlags: 0 @@ -6141,14 +6073,6 @@ MonoBehaviour: hashName: 551682030 objectType: 0 gameObject: {fileID: 3430073042800902170} - - name: bounty_panel.list_bounty.viewport.content.prog - hashName: 856178167 - objectType: 0 - gameObject: {fileID: 3642527194306233845} - - name: bounty_panel.list_bounty.viewport.content.prog.img_prog - hashName: 1672061037 - objectType: 0 - gameObject: {fileID: 5263660300203150264} - name: bounty_panel.list_bounty.viewport.content.mask_img hashName: 612727821 objectType: 0 @@ -7949,7 +7873,7 @@ RectTransform: m_Children: - {fileID: 2592331163818314566} m_Father: {fileID: 7955369474207028639} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9580,6 +9504,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8760415914826044071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6720166237636129092} + - component: {fileID: 8165678669443793499} + - component: {fileID: 3583511715981079113} + m_Layer: 5 + m_Name: progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6720166237636129092 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8760415914826044071} + 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: 6511327857058513352} + m_Father: {fileID: 7615869510061311036} + 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: 45, y: 0} + m_SizeDelta: {x: 34, y: 120} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8165678669443793499 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8760415914826044071} + m_CullTransparentMesh: 1 +--- !u!114 &3583511715981079113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8760415914826044071} + 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: 4d07f67313e7250489ab8a5b5a27c512, 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 &8999951634738783710 GameObject: m_ObjectHideFlags: 0 @@ -10154,16 +10154,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &6874821849820253372 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 167300485409642806} - m_PrefabAsset: {fileID: 0} --- !u!224 &2446778450870397282 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 167300485409642806} m_PrefabAsset: {fileID: 0} +--- !u!1 &6874821849820253372 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 167300485409642806} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1455385615996745487 PrefabInstance: m_ObjectHideFlags: 0 @@ -10281,16 +10281,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4004961687845242715 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1455385615996745487} - m_PrefabAsset: {fileID: 0} --- !u!1 &5262607254074696325 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 1455385615996745487} m_PrefabAsset: {fileID: 0} +--- !u!224 &4004961687845242715 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 1455385615996745487} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2563302491751133179 PrefabInstance: m_ObjectHideFlags: 0 @@ -10562,7 +10562,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -10670,16 +10670,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &1669265390632377040 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 3786549724142463620} - m_PrefabAsset: {fileID: 0} --- !u!1 &7617449553333829390 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 3786549724142463620} m_PrefabAsset: {fileID: 0} +--- !u!224 &1669265390632377040 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 3786549724142463620} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3904307419706933266 PrefabInstance: m_ObjectHideFlags: 0 @@ -10896,16 +10896,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &8037203489578674489 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 5151834487641408167} - m_PrefabAsset: {fileID: 0} --- !u!1 &6690687962716139487 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 5151834487641408167} m_PrefabAsset: {fileID: 0} +--- !u!224 &8037203489578674489 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 5151834487641408167} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6673005517663014772 PrefabInstance: m_ObjectHideFlags: 0 @@ -10935,7 +10935,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -11158,16 +11158,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!1 &7057243789885179431 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 6764487534559236260} - m_PrefabAsset: {fileID: 0} --- !u!224 &1821032425258481434 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 6764487534559236260} m_PrefabAsset: {fileID: 0} +--- !u!1 &7057243789885179431 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 6764487534559236260} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6944533270156736632 PrefabInstance: m_ObjectHideFlags: 0 @@ -11273,16 +11273,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4897975589072308268 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6944533270156736632} - m_PrefabAsset: {fileID: 0} --- !u!1 &4424198244136136178 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6944533270156736632} m_PrefabAsset: {fileID: 0} +--- !u!224 &4897975589072308268 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6944533270156736632} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7681924898589810020 PrefabInstance: m_ObjectHideFlags: 0 @@ -11400,16 +11400,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &5277452474675817776 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 7681924898589810020} - m_PrefabAsset: {fileID: 0} --- !u!1 &4008684246689007854 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 7681924898589810020} m_PrefabAsset: {fileID: 0} +--- !u!224 &5277452474675817776 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7681924898589810020} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7682486277655377421 PrefabInstance: m_ObjectHideFlags: 0 @@ -11899,7 +11899,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab b/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab index 0ecc2bb96..0f75d362d 100644 --- a/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab +++ b/Assets/prefabs/ui/activity/tourn_wave/tourn_wave_ui.prefab @@ -1100,7 +1100,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5234241679034365998} - {fileID: 7615869510061311036} - {fileID: 7842962686859569204} - {fileID: 6860052282104540683} @@ -1335,7 +1334,7 @@ RectTransform: m_Children: - {fileID: 267856068183062245} m_Father: {fileID: 7615869510061311036} - 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} @@ -1642,12 +1641,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5134452038804338758} - {fileID: 3792406422745509890} - {fileID: 1669265390632377040} - {fileID: 6457677548625216468} - {fileID: 9168675490417147680} m_Father: {fileID: 7955369474207028639} - m_RootOrder: 1 + 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} @@ -1683,6 +1683,14 @@ MonoBehaviour: hashName: 1370686129 objectType: 1 gameObject: {fileID: 117480353050942206} + - name: tourn_wave_bounty_cell.progress + hashName: 2068681794 + objectType: 0 + gameObject: {fileID: 2729529375987917830} + - name: tourn_wave_bounty_cell.progress.img_prog + hashName: 3599314562 + objectType: 0 + gameObject: {fileID: 8839328427273587702} --- !u!222 &6262266099309738003 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2009,7 +2017,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2122658457679232406 RectTransform: m_ObjectHideFlags: 0 @@ -3021,6 +3029,82 @@ MonoBehaviour: childAlignment: 5 spacing: 5 verticalOrHorizontal: 0 +--- !u!1 &2729529375987917830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5134452038804338758} + - component: {fileID: 3251398636529219748} + - component: {fileID: 2264044171351113678} + m_Layer: 5 + m_Name: progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5134452038804338758 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2729529375987917830} + 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: 8326609424313064919} + m_Father: {fileID: 7615869510061311036} + 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: 45, y: 0} + m_SizeDelta: {x: 34, y: 120} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3251398636529219748 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2729529375987917830} + m_CullTransparentMesh: 1 +--- !u!114 &2264044171351113678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2729529375987917830} + 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: 4d07f67313e7250489ab8a5b5a27c512, 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 &2756902621464123032 GameObject: m_ObjectHideFlags: 0 @@ -4167,82 +4251,6 @@ MonoBehaviour: childAlignment: 4 spacing: 30 verticalOrHorizontal: 0 ---- !u!1 &3642527194306233845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5234241679034365998} - - component: {fileID: 9179123079457330362} - - component: {fileID: 1353661980142584921} - m_Layer: 5 - m_Name: prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5234241679034365998 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - 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: 8079150689098105321} - m_Father: {fileID: 7955369474207028639} - 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: 45, y: 0} - m_SizeDelta: {x: 34, y: 150} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &9179123079457330362 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - m_CullTransparentMesh: 1 ---- !u!114 &1353661980142584921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3642527194306233845} - 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: 4d07f67313e7250489ab8a5b5a27c512, 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 &3682218309070832876 GameObject: m_ObjectHideFlags: 0 @@ -5621,7 +5629,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7955369474207028639} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6080,75 +6088,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5263660300203150264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8079150689098105321} - - component: {fileID: 3861212574023874529} - - component: {fileID: 7181729373717590405} - m_Layer: 5 - m_Name: img_prog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8079150689098105321 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - 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: 5234241679034365998} - m_RootOrder: 0 - 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: -6, y: -6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3861212574023874529 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - m_CullTransparentMesh: 1 ---- !u!114 &7181729373717590405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5263660300203150264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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: 3d0134d70e5cca64eb727b5d81d93518, type: 3} - m_FillDirection: 3 - m_Value: 1 - m_FillCenter: 1 --- !u!1 &5321722316296545377 GameObject: m_ObjectHideFlags: 0 @@ -6224,7 +6163,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4412000624834818031 RectTransform: m_ObjectHideFlags: 0 @@ -6308,14 +6247,6 @@ MonoBehaviour: hashName: 551682030 objectType: 0 gameObject: {fileID: 3430073042800902170} - - name: bounty_panel.list_bounty.viewport.content.prog - hashName: 856178167 - objectType: 0 - gameObject: {fileID: 3642527194306233845} - - name: bounty_panel.list_bounty.viewport.content.prog.img_prog - hashName: 1672061037 - objectType: 0 - gameObject: {fileID: 5263660300203150264} - name: bounty_panel.list_bounty.viewport.content.mask_img hashName: 612727821 objectType: 0 @@ -6588,7 +6519,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 335} - m_SizeDelta: {x: 368.2, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9023020171910422639 CanvasRenderer: @@ -8126,7 +8057,7 @@ RectTransform: m_Children: - {fileID: 2592331163818314566} m_Father: {fileID: 7955369474207028639} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9757,6 +9688,75 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8839328427273587702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8326609424313064919} + - component: {fileID: 1280869583719383532} + - component: {fileID: 2217620785626534768} + m_Layer: 5 + m_Name: img_prog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8326609424313064919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839328427273587702} + 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: 5134452038804338758} + m_RootOrder: 0 + 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: -6, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1280869583719383532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839328427273587702} + m_CullTransparentMesh: 1 +--- !u!114 &2217620785626534768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839328427273587702} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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: 3d0134d70e5cca64eb727b5d81d93518, type: 3} + m_FillDirection: 3 + m_Value: 1 + m_FillCenter: 1 --- !u!1 &8999951634738783710 GameObject: m_ObjectHideFlags: 0 @@ -10458,16 +10458,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4004961687845242715 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1455385615996745487} - m_PrefabAsset: {fileID: 0} --- !u!1 &5262607254074696325 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 1455385615996745487} m_PrefabAsset: {fileID: 0} +--- !u!224 &4004961687845242715 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 1455385615996745487} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2563302491751133179 PrefabInstance: m_ObjectHideFlags: 0 @@ -10585,16 +10585,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &14712458305429423 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 2563302491751133179} - m_PrefabAsset: {fileID: 0} --- !u!1 &9126745730797927025 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 2563302491751133179} m_PrefabAsset: {fileID: 0} +--- !u!224 &14712458305429423 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 2563302491751133179} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3195650773789273123 PrefabInstance: m_ObjectHideFlags: 0 @@ -10739,7 +10739,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -11001,7 +11001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -11224,16 +11224,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!224 &1821032425258481434 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 6764487534559236260} - m_PrefabAsset: {fileID: 0} --- !u!1 &7057243789885179431 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 6764487534559236260} m_PrefabAsset: {fileID: 0} +--- !u!224 &1821032425258481434 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 6764487534559236260} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6944533270156736632 PrefabInstance: m_ObjectHideFlags: 0 @@ -11339,16 +11339,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &4424198244136136178 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 6944533270156736632} - m_PrefabAsset: {fileID: 0} --- !u!224 &4897975589072308268 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 6944533270156736632} m_PrefabAsset: {fileID: 0} +--- !u!1 &4424198244136136178 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6944533270156736632} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7681924898589810020 PrefabInstance: m_ObjectHideFlags: 0 @@ -11466,16 +11466,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &4008684246689007854 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 7681924898589810020} - m_PrefabAsset: {fileID: 0} --- !u!224 &5277452474675817776 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 7681924898589810020} m_PrefabAsset: {fileID: 0} +--- !u!1 &4008684246689007854 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7681924898589810020} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7682486277655377421 PrefabInstance: m_ObjectHideFlags: 0 @@ -11811,16 +11811,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &3410637706310916738 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8245840261561831176} - m_PrefabAsset: {fileID: 0} --- !u!224 &5893513071110111068 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 8245840261561831176} m_PrefabAsset: {fileID: 0} +--- !u!1 &3410637706310916738 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 8245840261561831176} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8786111521656507289 PrefabInstance: m_ObjectHideFlags: 0 @@ -11926,16 +11926,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &6505558577391860685 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8786111521656507289} - m_PrefabAsset: {fileID: 0} --- !u!1 &2653905557705678355 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 8786111521656507289} m_PrefabAsset: {fileID: 0} +--- !u!224 &6505558577391860685 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 8786111521656507289} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8806979742309823360 PrefabInstance: m_ObjectHideFlags: 0 @@ -11965,7 +11965,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -12073,16 +12073,16 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &2811008687169529354 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8806979742309823360} - m_PrefabAsset: {fileID: 0} --- !u!224 &6457677548625216468 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 8806979742309823360} m_PrefabAsset: {fileID: 0} +--- !u!1 &2811008687169529354 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 8806979742309823360} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8986858410982755018 PrefabInstance: m_ObjectHideFlags: 0