104 Commits

Author SHA1 Message Date
chenxi
325b34a691 tips最小限制 2023-04-20 21:08:03 +08:00
xiekaidong
a11f8613e1 动画调整 2023-04-20 20:30: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
1f0cba25d6 修复 2023-04-20 18:57:04 +08:00
xiekaidong
ccddeb8aa3 修复 2023-04-20 18:50:19 +08:00
xiekaidong
b9a42b317b 动画 2023-04-20 18:45:38 +08:00
chenxi
b8517ba934 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-20 18:22:43 +08:00
chenxi
666e36416e tips 2023-04-20 18:22:39 +08:00
xiekaidong
6fb864fa79 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-20 18:13:59 +08:00
xiekaidong
c874c9026b 特效 2023-04-20 18:13:56 +08:00
chenxi
e136291098 主城箭头 2023-04-20 18:01:39 +08:00
chenxi
f73980c7de 奖励显示碎片 2023-04-20 17:40:25 +08:00
xiekaidong
3c896cf339 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/strings/cn/buff.lua.meta
2023-04-20 15:17:23 +08:00
xiekaidong
06bc25c2d2 rogue技能显示修改 2023-04-20 15:17:14 +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
a98cf98c58 系数 2023-04-19 22:41:01 +08:00
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