294 Commits

Author SHA1 Message Date
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
xiekaidong
1bbedf0181 引导适配 2023-04-21 20:36:46 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
chenxi
ad3f9961d7 编译 2023-04-21 16:30:58 +08:00
chenxi
ae20156744 battle ui 2023-04-21 16:27:46 +08:00
xiekaidong
51436d26f5 引导 2023-04-21 16:14:42 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
chenxi
72fd190f6a 适配 2023-04-21 11:58:11 +08:00
chenxi
62a3ba1905 红点 2023-04-21 11:57:11 +08:00
chenxi
a14d753aed 适配 2023-04-21 10:44:35 +08:00
chenxi
e36099a0e7 编译 tips 2023-04-20 22:15:16 +08:00
xiekaidong
8e50d8a36a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 21:27:05 +08:00
xiekaidong
caf9f121dc 技能解锁 2023-04-20 21:27:02 +08:00
chenxi
eac9e5753a tips 2023-04-20 21:09:11 +08:00
xiekaidong
96cba83db9 动画调整 2023-04-20 20:30:56 +08:00
chenxi
429adb121e ui 2023-04-20 19:25:40 +08:00
chenxi
0cd0ba2366 伤害 2023-04-20 19:04:18 +08:00
xiekaidong
c1119c5b9a 修复 2023-04-20 18:50:27 +08:00
xiekaidong
5222c799bb 动画 2023-04-20 18:46:11 +08:00
xiekaidong
af244ed017 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/ui/battle/cell/grid_cell.prefab
2023-04-20 18:14:27 +08:00
xiekaidong
0a38b7137a 特效 2023-04-20 18:14:11 +08:00
chenxi
494852cadb toast 2023-04-20 18:08:11 +08:00
chenxi
18f974d5b8 主城箭头 2023-04-20 18:02:15 +08:00
chenxi
7672b6edc4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 17:41:04 +08:00
chenxi
4b1ca125e0 随便 2023-04-20 17:40:58 +08:00
DESKTOP-5E92U9B\BigFoot
6aa7216dcf UI动画上传 2023-04-20 17:30:34 +08:00
xiekaidong
c6f97965bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 17:03:12 +08:00
xiekaidong
eb26827515 界面调整 2023-04-20 17:03:09 +08:00
chenxi
63d15c5c8f 调整节点位置 2023-04-20 16:55:10 +08:00
chenxi
6e18ed6563 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 16:34:33 +08:00
chenxi
e3692493e2 编译 2023-04-20 16:34:26 +08:00
DESKTOP-5E92U9B\BigFoot
7b6c2e2c46 UI动画上传 2023-04-20 16:19:48 +08:00
chenxi
830ace3d65 ui 2023-04-20 15:25:20 +08:00
chenxi
32f7cbab3d 战斗ui 2023-04-20 12:07:02 +08:00
chenxi
310fbd2102 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-20 11:16:33 +08:00
chenxi
456db2ec70 战斗ui 2023-04-20 11:16:30 +08:00
chenxi
f321791a71 更新资源 2023-04-20 11:16:09 +08:00
xiekaidong
942edff496 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-20 10:43:31 +08:00
xiekaidong
ba0d00407c 更新配置,优化一下检查棋盘的逻辑 2023-04-20 10:43:28 +08:00
chenxi
0b293ae067 战斗buff icon点击后 2023-04-20 10:05:37 +08:00
xiekaidong
899fde38c1 界面处理 2023-04-19 22:31:42 +08:00
xiekaidong
a416e756c9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-19 22:21:07 +08:00
chenxi
82af267f87 buff显示逻辑 2023-04-19 22:20:48 +08:00
xiekaidong
ca8519d154 英雄解锁和强制上阵的判定 2023-04-19 22:20:44 +08:00
chenxi
91980574ea 战斗资源 2023-04-19 20:45:10 +08:00
chenxi
3ab65f99ae 战斗章节资源 2023-04-19 20:17:09 +08:00
xiekaidong
922681982a 界面调整 2023-04-19 18:39:40 +08:00
xiekaidong
06749eaaeb 战斗节奏调整 2023-04-19 18:38:25 +08:00
chenxi
42d59d6045 界面替换 2023-04-19 17:56:21 +08:00
xiekaidong
9fd3b174af 检查棋盘是否是死局的状态 2023-04-19 15:50:18 +08:00