diff --git a/Assets/lua/app/module/activity/act_pvp/act_pvp_manager.lua.bytes b/Assets/lua/app/module/activity/act_pvp/act_pvp_manager.lua.bytes index 1a47dd796..82ce2ee74 100644 Binary files a/Assets/lua/app/module/activity/act_pvp/act_pvp_manager.lua.bytes and b/Assets/lua/app/module/activity/act_pvp/act_pvp_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua.bytes b/Assets/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua.bytes index 4113ebb12..0ceb76237 100644 Binary files a/Assets/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_pvp/act_pvp_select_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes b/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes index 72b974baa..16c47b10e 100644 Binary files a/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes and b/Assets/lua/app/userdata/activity/act_pvp/act_pvp_data.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab index 88a5dd165..501a3d80c 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab @@ -472,6 +472,7 @@ RectTransform: m_Children: - {fileID: 5088806014663909211} - {fileID: 4236019952907989625} + - {fileID: 542351838280247699} m_Father: {fileID: 5138169443242319416} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1322,7 +1323,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -1440,6 +1441,85 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &3234155432066701130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 856703538255265657} + - component: {fileID: 531834753765700933} + - component: {fileID: 2226838716122565393} + - component: {fileID: 1898279835123942944} + m_Layer: 0 + m_Name: click_mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &856703538255265657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3234155432066701130} + 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: 1700807800967414711} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 176, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &531834753765700933 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3234155432066701130} + m_CullTransparentMesh: 1 +--- !u!114 &2226838716122565393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3234155432066701130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: [] +--- !u!114 &1898279835123942944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3234155432066701130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &3239013360794171263 GameObject: m_ObjectHideFlags: 0 @@ -1903,6 +1983,14 @@ MonoBehaviour: hashName: 4133622245 objectType: 0 gameObject: {fileID: 1031988763853136963} + - name: act_pvp_select_ui.bg.hero_cell_1.info.click_mask + hashName: 3509134078 + objectType: 0 + gameObject: {fileID: 5318140836933100308} + - name: act_pvp_select_ui.bg.hero_cell_2.info.click_mask + hashName: 567476479 + objectType: 0 + gameObject: {fileID: 3234155432066701130} --- !u!1 &3396903694833402479 GameObject: m_ObjectHideFlags: 0 @@ -2917,6 +3005,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5318140836933100308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542351838280247699} + - component: {fileID: 1346387173851609603} + - component: {fileID: 681446707865131526} + - component: {fileID: 4892840442318214311} + m_Layer: 0 + m_Name: click_mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542351838280247699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318140836933100308} + 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: 5166236856591593624} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 176, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1346387173851609603 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318140836933100308} + m_CullTransparentMesh: 1 +--- !u!114 &681446707865131526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318140836933100308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: [] +--- !u!114 &4892840442318214311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318140836933100308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &5372832548244415627 GameObject: m_ObjectHideFlags: 0 @@ -4675,6 +4842,7 @@ RectTransform: m_Children: - {fileID: 3308839418155934091} - {fileID: 2695583624974628176} + - {fileID: 856703538255265657} m_Father: {fileID: 8791175444727093205} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5025,16 +5193,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!224 &3778884482042761817 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 473798010390560417} - m_PrefabAsset: {fileID: 0} --- !u!1 &3521242876664343753 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 473798010390560417} m_PrefabAsset: {fileID: 0} +--- !u!224 &3778884482042761817 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 473798010390560417} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3304191828790666279 PrefabInstance: m_ObjectHideFlags: 0 @@ -5247,16 +5415,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!1 &138255735862438867 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 4009784358861011387} - m_PrefabAsset: {fileID: 0} --- !u!224 &380433276594771267 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 4009784358861011387} m_PrefabAsset: {fileID: 0} +--- !u!1 &138255735862438867 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 4009784358861011387} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4738446569863265440 PrefabInstance: m_ObjectHideFlags: 0 @@ -5592,16 +5760,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!1 &9222759794868072345 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 5310694289195662833} - m_PrefabAsset: {fileID: 0} --- !u!224 &8886006668401004809 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 5310694289195662833} m_PrefabAsset: {fileID: 0} +--- !u!1 &9222759794868072345 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 5310694289195662833} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5743410913213867961 PrefabInstance: m_ObjectHideFlags: 0 @@ -5715,16 +5883,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &6057436746841492161 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 5743410913213867961} - m_PrefabAsset: {fileID: 0} --- !u!224 &7440982452540148775 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 5743410913213867961} m_PrefabAsset: {fileID: 0} +--- !u!1 &6057436746841492161 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 5743410913213867961} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6937226130053698401 PrefabInstance: m_ObjectHideFlags: 0 @@ -5838,16 +6006,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &5238501926945716479 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 6937226130053698401} - m_PrefabAsset: {fileID: 0} --- !u!1 &8926447831149772313 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 6937226130053698401} m_PrefabAsset: {fileID: 0} +--- !u!224 &5238501926945716479 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 6937226130053698401} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8103142569475870873 PrefabInstance: m_ObjectHideFlags: 0 @@ -6060,13 +6228,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!224 &5580043289356692692 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 9192484982123184172} - m_PrefabAsset: {fileID: 0} --- !u!1 &5322400550644257348 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} m_PrefabInstance: {fileID: 9192484982123184172} m_PrefabAsset: {fileID: 0} +--- !u!224 &5580043289356692692 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 9192484982123184172} + m_PrefabAsset: {fileID: 0}