262 Commits

Author SHA1 Message Date
xiekaidong
01e691fceb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 10:57:34 +08:00
xiekaidong
565cfbc817 动画 2023-04-21 10:57:27 +08:00
chenxi
3abfa8ce27 打赢最新的关卡去下一关 2023-04-21 10:56:25 +08:00
chenxi
bffd98de70 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-21 10:55:16 +08:00
chenxi
79bad73dfe 打赢后去下一关 2023-04-21 10:55:13 +08:00
xiekaidong
5ccdd1e417 界面调整 2023-04-21 10:12:00 +08:00
xiekaidong
06229275bf 关卡数据容错 2023-04-21 09:56:30 +08:00
chenxi
c068622521 战斗加速的逻辑 2023-04-20 23:08:28 +08:00
chenxi
2e657ff39d fix bug 2023-04-20 22:52:32 +08:00
chenxi
de5d0e34e5 还原测试代码 2023-04-20 22:49:56 +08:00
chenxi
e7c01c9c5d 更新 2023-04-20 22:39:43 +08:00
xiekaidong
c4f034e13e 优化 2023-04-20 22:28:06 +08:00
chenxi
60b7a2677e 服务器解锁英雄 2023-04-20 22:14:38 +08:00
xiekaidong
47b08b4443 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-20 21:52:08 +08:00
xiekaidong
f4ef82e141 英雄解锁逻辑 2023-04-20 21:52:01 +08:00
chenxi
a8261cd641 merge 2023-04-20 21:48:51 +08:00
chenxi
817985422c 英雄随机碎片 2023-04-20 21:47:14 +08:00
xiekaidong
5727821969 英雄解锁条件 2023-04-20 21:43:03 +08:00
xiekaidong
d1c7f22f03 修改 2023-04-20 21:37:09 +08:00
xiekaidong
e34b3df0aa 删除代码 2023-04-20 21:28:42 +08:00
xiekaidong
44102b81b9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/skill_rogue.lua
#	lua/app/config/tutorial.lua.meta
#	lua/app/config/tutorial_start.lua.meta
#	lua/app/module/battle/battle_const.lua
2023-04-20 21:26:51 +08:00
xiekaidong
a2e20a7c37 技能解锁 2023-04-20 21:26:35 +08:00
chenxi
325b34a691 tips最小限制 2023-04-20 21:08:03 +08:00
chenxi
9c70bfbfed 更新配置 2023-04-20 20:54:29 +08:00
chenxi
9ac4b10ba2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-20 20:53:29 +08:00
chenxi
32edfe2a3a 波次之间回血 2023-04-20 20:53:26 +08:00
xiekaidong
75bca07d4d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-20 20:30:39 +08:00
xiekaidong
a11f8613e1 动画调整 2023-04-20 20:30:35 +08:00
chenxi
94b3c3ddc5 伤害数字对象池 2023-04-20 20:22:14 +08:00
chenxi
d52e92b6b0 伤害数字 2023-04-20 19:03:55 +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
chenxi
a44fb6ca2c 移动速度 2023-04-20 17:08:27 +08:00
chenxi
aae29468f7 距离 2023-04-20 17:01:53 +08:00
chenxi
a7f8eb8c5a 更新配置 2023-04-20 16:33:47 +08:00
chenxi
e979862f49 移动速度 2023-04-20 16:27:23 +08:00
chenxi
ad9dc7d8e2 修改字段名 2023-04-20 16:03:18 +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
59c1daf2e3 更新配置 2023-04-20 12:08:33 +08:00
chenxi
bd57840816 buff tips 2023-04-20 12:06:33 +08:00