diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index 1c74e20a5..435b036d7 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index 545ea7e61..099528abc 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_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 321fe4aef..736d8a867 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/lua/app/ui/battle/battle_ui_pvp.lua.bytes b/Assets/lua/app/ui/battle/battle_ui_pvp.lua.bytes index 81dcc78e3..830fdf81a 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui_pvp.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui_pvp.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 12e37c8a9..ec77458ec 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 0f9558f38..1731a8eda 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 0548bc6d4..b9d3cf917 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -408,6 +408,7 @@ RectTransform: - {fileID: 4256631273791126118} - {fileID: 5853085491076849237} - {fileID: 5313457591195514166} + - {fileID: 7878058497166308518} m_Father: {fileID: 4165930251451731960} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -542,6 +543,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 60} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1226236936746349544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7878058497166308518} + - component: {fileID: 1283900539601424540} + - component: {fileID: 5411474737161624347} + m_Layer: 5 + m_Name: desc_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7878058497166308518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226236936746349544} + 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: 4567631707956313030} + m_RootOrder: 10 + 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: 129} + m_SizeDelta: {x: 50, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1283900539601424540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226236936746349544} + m_CullTransparentMesh: 1 +--- !u!114 &5411474737161624347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226236936746349544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 0.60784316, b: 0.34901962, 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: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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: 0 + 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 &1343827114221771081 GameObject: m_ObjectHideFlags: 0 @@ -1367,11 +1503,11 @@ RectTransform: m_Father: {fileID: 8498021877501455119} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -187.5, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 22} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &3507333327192365001 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1728,11 +1864,11 @@ RectTransform: m_Father: {fileID: 8498021877501455119} 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: 187.5, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 22} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6967881497418782594 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2170,7 +2306,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4287626239 - m_fontColor: {r: 1, g: 0.9843137, b: 0.56078434, a: 1} + m_fontColor: {r: 1, g: 0.8666667, b: 0.4, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2403,7 +2539,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 129} - m_SizeDelta: {x: 200, y: 30} + m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2638528053824224956 CanvasRenderer: @@ -5694,7 +5830,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.9372549, g: 0.9843137, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5898,7 +6034,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 156e0fd603636ea43841d960f99b6967, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6866,6 +7002,10 @@ MonoBehaviour: hashName: 47199002 objectType: 0 gameObject: {fileID: 1868469229290454677} + - name: battle_result_ui.unit_node.desc_4 + hashName: 666564118 + objectType: 0 + gameObject: {fileID: 1226236936746349544} --- !u!1 &8897498284405031625 GameObject: m_ObjectHideFlags: 0 @@ -6904,7 +7044,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10.5, y: -171} - m_SizeDelta: {x: 210, y: 30} + m_SizeDelta: {x: 134, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3222253099761167114 CanvasRenderer: diff --git a/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab b/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab index f7e99d685..0ca3c7f4b 100644 --- a/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab +++ b/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab @@ -542,7 +542,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab index 3ff67aed4..402d808de 100644 --- a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab +++ b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab @@ -6266,7 +6266,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 383} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3379945385861433032 CanvasRenderer: