diff --git a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes index ae4a5cc19..7c0423b87 100644 Binary files a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index ecee437d8..72c08008c 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index 2271e50ad..40513c7e3 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -1766,6 +1766,7 @@ GameObject: - component: {fileID: 1652254950293225014} - component: {fileID: 6645555860507715977} - component: {fileID: 5438448160771658672} + - component: {fileID: 209592025390711907} m_Layer: 5 m_Name: arena_match_ui m_TagString: Untagged @@ -1789,6 +1790,7 @@ RectTransform: - {fileID: 5775455470526392891} - {fileID: 5221279569728953363} - {fileID: 3121552964615492639} + - {fileID: 4881425484033169538} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1972,6 +1974,10 @@ MonoBehaviour: hashName: 587385496 objectType: 6 gameObject: {fileID: 7166760395963591901} + - name: arena_match_ui.vfx_c1_ui_vs_01 + hashName: 1815440362 + objectType: 2 + gameObject: {fileID: 1329394573992856438} --- !u!114 &5438448160771658672 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2002,6 +2008,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &209592025390711907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e78a175da984a448199e5b51a3a5f437, type: 3} + m_Name: + m_EditorClassIdentifier: + EffectList: + - {fileID: 6034718509829099790} + NotchScreenNodeList: [] --- !u!1 &6155098701873223977 GameObject: m_ObjectHideFlags: 0 @@ -3781,6 +3802,128 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 1637016210762041153} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3161427305238660136 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8461932745927490369} + m_Modifications: + - target: {fileID: 4156066198269038430, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_Name + value: vfx_c1_ui_vs_01 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_AnchoredPosition.y + value: 99 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8673939345137079590, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + propertyPath: GroupOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} +--- !u!1 &1329394573992856438 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4156066198269038430, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + m_PrefabInstance: {fileID: 3161427305238660136} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4881425484033169538 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7521552333984930986, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + m_PrefabInstance: {fileID: 3161427305238660136} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6034718509829099790 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8673939345137079590, guid: 51a9b4f0af6c6cd4ba0a83b383853526, type: 3} + m_PrefabInstance: {fileID: 3161427305238660136} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329394573992856438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3727998341292997578 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 120a05b6c..23f893514 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -899,6 +899,218 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1855568914210283817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8738798756520849513} + - component: {fileID: 2677329771911233306} + - component: {fileID: 6615023902514705817} + m_Layer: 5 + m_Name: ok_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8738798756520849513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855568914210283817} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8948567619573757815} + m_Father: {fileID: 4165930251451731960} + 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: -496} + m_SizeDelta: {x: 218, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2677329771911233306 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855568914210283817} + m_CullTransparentMesh: 1 +--- !u!114 &6615023902514705817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855568914210283817} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1868469229290454677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8948567619573757815} + - component: {fileID: 5571394505831456929} + - component: {fileID: 6205117517267988026} + m_Layer: 5 + m_Name: tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8948567619573757815 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868469229290454677} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8738798756520849513} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5571394505831456929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868469229290454677} + m_CullTransparentMesh: 1 +--- !u!114 &6205117517267988026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868469229290454677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2082953437342881326 GameObject: m_ObjectHideFlags: 0 @@ -1364,7 +1576,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3748114741305968975 RectTransform: m_ObjectHideFlags: 0 @@ -1606,9 +1818,9 @@ RectTransform: m_Father: {fileID: 4165930251451731960} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 144} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -496} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3897439462126193203 @@ -6418,6 +6630,7 @@ RectTransform: - {fileID: 3748114741305968975} - {fileID: 5514586864113881801} - {fileID: 4322956751028045404} + - {fileID: 8738798756520849513} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6605,10 +6818,6 @@ MonoBehaviour: hashName: 4036993011 objectType: 0 gameObject: {fileID: 1008296922414108458} - - name: battle_result_ui.arena_box_node.img_box - hashName: 1705126190 - objectType: 0 - gameObject: {fileID: 0} - name: battle_result_ui.arena_box_node.tx_box hashName: 3843531729 objectType: 0 @@ -6649,6 +6858,14 @@ MonoBehaviour: hashName: 3368525451 objectType: 0 gameObject: {fileID: 6262848720989481186} + - name: battle_result_ui.ok_btn + hashName: 2870858008 + objectType: 0 + gameObject: {fileID: 1855568914210283817} + - name: battle_result_ui.ok_btn.tx + hashName: 47199002 + objectType: 0 + gameObject: {fileID: 1868469229290454677} --- !u!1 &8897498284405031625 GameObject: m_ObjectHideFlags: 0