xiekaidong
|
213c4c1188
|
界面处理
|
2023-04-19 22:31:15 +08:00 |
|
xiekaidong
|
2f28925a71
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 22:20:25 +08:00 |
|
xiekaidong
|
9be9feefbd
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:22 +08:00 |
|
chenxi
|
a6b3df378f
|
buff显示逻辑
|
2023-04-19 22:20:07 +08:00 |
|
chenxi
|
87d7f9b597
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-19 21:07:38 +08:00 |
|
chenxi
|
7118b8790a
|
背景移动
|
2023-04-19 21:07:35 +08:00 |
|
xiekaidong
|
ce6c6feee3
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 21:03:57 +08:00 |
|
xiekaidong
|
7afa7f77b5
|
填充bug修复
|
2023-04-19 21:03:53 +08:00 |
|
chenxi
|
726e4af821
|
更新配置
|
2023-04-19 20:50:41 +08:00 |
|
xiekaidong
|
32b9deba6d
|
战斗节奏调整
|
2023-04-19 18:38:09 +08:00 |
|
xiekaidong
|
ecdeca90ec
|
切大波次节奏调整
|
2023-04-19 17:19:39 +08:00 |
|
xiekaidong
|
f6847beaa8
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 15:50:00 +08:00 |
|
xiekaidong
|
19ced28f90
|
检查棋盘是否是死局的状态
|
2023-04-19 15:49:57 +08:00 |
|
chenxi
|
bfdf418a39
|
大小
|
2023-04-19 15:39:54 +08:00 |
|
chenxi
|
f9b9dc1726
|
大小
|
2023-04-19 15:36:44 +08:00 |
|
xiekaidong
|
073b4cceab
|
界面处理
|
2023-04-19 09:48:53 +08:00 |
|
xiekaidong
|
0a7cb2a5b9
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-19 09:32:11 +08:00 |
|
xiekaidong
|
6633f28b66
|
更新图集
|
2023-04-19 09:32:04 +08:00 |
|
chenxi
|
65cbffc5e2
|
血条动画
|
2023-04-18 22:32:11 +08:00 |
|
chenxi
|
421748cd17
|
更新配置
|
2023-04-18 22:25:33 +08:00 |
|
chenxi
|
e6015e7e8c
|
血条动画
|
2023-04-18 22:22:03 +08:00 |
|
xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +08:00 |
|
chenxi
|
7ee1d620bb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 20:37:24 +08:00 |
|
chenxi
|
342bae9c82
|
bug
|
2023-04-18 20:37:11 +08:00 |
|
xiekaidong
|
bbc04cf46a
|
bug修改
|
2023-04-18 20:37:00 +08:00 |
|
xiekaidong
|
0de7ceb3b3
|
切大波次
|
2023-04-18 19:52:15 +08:00 |
|
xiekaidong
|
ac5183c0fe
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 17:58:32 +08:00 |
|
xiekaidong
|
375efc10de
|
一些肉鸽技能接入战斗
|
2023-04-18 17:58:19 +08:00 |
|
chenxi
|
fd4e6d88c4
|
显示属性
|
2023-04-18 17:43:32 +08:00 |
|
xiekaidong
|
65f695030e
|
局内升级
|
2023-04-17 15:43:23 +08:00 |
|
chenxi
|
f291195ccd
|
攻防反了
|
2023-04-16 20:46:55 +08:00 |
|
xiekaidong
|
e58626d82b
|
界面调整
|
2023-04-15 16:57:43 +08:00 |
|
xiekaidong
|
00b1c43f54
|
界面处理
|
2023-04-15 16:54:44 +08:00 |
|
xiekaidong
|
dc5a37ac0f
|
一些细节调整
|
2023-04-15 16:47:18 +08:00 |
|
xiekaidong
|
328515c82a
|
开宝箱
|
2023-04-15 14:57:34 +08:00 |
|
xiekaidong
|
f74a7f6080
|
关卡宝箱
|
2023-04-15 14:45:42 +08:00 |
|
xiekaidong
|
f9541d56d8
|
血条
|
2023-04-14 22:23:03 +08:00 |
|
xiekaidong
|
88b9067fc4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 22:19:25 +08:00 |
|
xiekaidong
|
3b909a2a81
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:22 +08:00 |
|
chenxi
|
c6ae8e7c99
|
血量
|
2023-04-14 21:21:03 +08:00 |
|
xiekaidong
|
642eb4d247
|
战斗回合概念
|
2023-04-14 17:59:12 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
xiekaidong
|
c0eedc10ce
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-13 22:30:12 +08:00 |
|
xiekaidong
|
8424303c97
|
英雄改一下
|
2023-04-13 22:30:08 +08:00 |
|
chenxi
|
15a182cd30
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-13 22:04:25 +08:00 |
|
chenxi
|
d5c99276b5
|
冒伤害
|
2023-04-13 22:04:22 +08:00 |
|
xiekaidong
|
d1b80d3527
|
英雄养成
|
2023-04-13 21:13:43 +08:00 |
|
xiekaidong
|
d5bedb659a
|
加一个大卡片信息
|
2023-04-12 22:11:46 +08:00 |
|
xiekaidong
|
f268d99606
|
reward显示
|
2023-04-12 21:46:16 +08:00 |
|
xiekaidong
|
eb17b324c4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/ui/battle/battle_ui.lua
|
2023-04-12 21:03:40 +08:00 |
|