puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Browse Source
This commit is contained in:
chenxi 2023-04-18 21:33:18 +08:00
commit 173b47020f
7 changed files with 5797 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/battle/battle_result_ui.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/battle/battle_data.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/userdata/battle/skill/battle_board_skill_entity.lua.bytes
View File

Binary file not shown.

10
Assets/prefabs/ui/battle/battle_ui.prefab
View File

@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3885403657574585581 --- !u!222 &3885403657574585581
CanvasRenderer: CanvasRenderer:
@ -2326,7 +2326,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8603010391015290353 --- !u!222 &8603010391015290353
CanvasRenderer: CanvasRenderer:
@ -3126,7 +3126,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7832509953610574025 --- !u!222 &7832509953610574025
CanvasRenderer: CanvasRenderer:
@ -3201,7 +3201,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5911617627838697163 --- !u!222 &5911617627838697163
CanvasRenderer: CanvasRenderer:
@ -4382,7 +4382,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 60} m_SizeDelta: {x: 52, y: 52}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6204868198101501845 --- !u!222 &6204868198101501845
CanvasRenderer: CanvasRenderer:

2
Assets/prefabs/ui/hero/hero_detail_ui.prefab
View File

@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3} m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3}
m_Type: 3 m_Type: 3
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

6148
Assets/scenes/battle/battle_scene.unity
View File

File diff suppressed because it is too large Load Diff