chenxi
|
c6ea40de7e
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-21 16:27:27 +08:00 |
|
chenxi
|
9a0ebd1318
|
技能抖屏
|
2023-04-21 16:27:24 +08:00 |
|
xiekaidong
|
5d1bc62572
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-21 16:10:31 +08:00 |
|
xiekaidong
|
eeb0af1262
|
战斗引导
|
2023-04-21 16:10:28 +08:00 |
|
chenxi
|
4d4bd0fc61
|
技能特效
|
2023-04-21 15:52:50 +08:00 |
|
chenxi
|
3010f1f7d5
|
fix bug
|
2023-04-21 14:27:08 +08:00 |
|
xiekaidong
|
565cfbc817
|
动画
|
2023-04-21 10:57:27 +08:00 |
|
chenxi
|
2e657ff39d
|
fix bug
|
2023-04-20 22:52:32 +08:00 |
|
chenxi
|
de5d0e34e5
|
还原测试代码
|
2023-04-20 22:49:56 +08:00 |
|
xiekaidong
|
a2e20a7c37
|
技能解锁
|
2023-04-20 21:26:35 +08:00 |
|
chenxi
|
3a916fd7ee
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-20 18:59:08 +08:00 |
|
chenxi
|
5303638b99
|
伤害数字
|
2023-04-20 18:59:06 +08:00 |
|
xiekaidong
|
b9a42b317b
|
动画
|
2023-04-20 18:45:38 +08:00 |
|
xiekaidong
|
c874c9026b
|
特效
|
2023-04-20 18:13:56 +08:00 |
|
chenxi
|
bd57840816
|
buff tips
|
2023-04-20 12:06:33 +08:00 |
|
chenxi
|
ae30c47881
|
战斗buff
|
2023-04-20 11:19:31 +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 |
|
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 |
|
chenxi
|
342bae9c82
|
bug
|
2023-04-18 20:37:11 +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
|
dc5a37ac0f
|
一些细节调整
|
2023-04-15 16:47:18 +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 |
|
chenxi
|
d5c99276b5
|
冒伤害
|
2023-04-13 22:04:22 +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 |
|
xiekaidong
|
cbad76a7d9
|
技能回收和吐出来
|
2023-04-12 21:03:07 +08:00 |
|
chenxi
|
dc66b8833a
|
清理战斗
|
2023-04-12 18:31:30 +08:00 |
|
xiekaidong
|
4b1875aafd
|
棋盘新的读取方式
|
2023-04-12 15:16:30 +08:00 |
|
xiekaidong
|
4c752c0e78
|
调整一些逻辑
|
2023-04-12 11:19:24 +08:00 |
|
chenxi
|
903e4899ca
|
merge
|
2023-04-11 18:24:00 +08:00 |
|
chenxi
|
4d31d587de
|
战斗
|
2023-04-11 18:23:25 +08:00 |
|
xiekaidong
|
85061a5126
|
一些肉鸽技能
|
2023-04-11 17:26:02 +08:00 |
|
xiekaidong
|
eb0856345f
|
一些技能的实现
|
2023-04-10 21:13:31 +08:00 |
|