882 Commits

Author SHA1 Message Date
xiekaidong
cae3580d2c 竞技场敌方自动战斗 2023-06-29 20:51:55 +08:00
xiekaidong
6408b6c028 每日挑战bug修复 2023-06-29 17:13:25 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
xiekaidong
98d46965f9 界面调整 2023-06-29 15:22:42 +08:00
xiekaidong
340ac9a38d bug修复 2023-06-29 14:42:27 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
xiekaidong
efb9e79c4d Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-29 10:29:58 +08:00
xiekaidong
c391fb0fbc bug修复 2023-06-29 10:29:46 +08:00
Fang
b2be4d375e fix 2023-06-29 10:18:39 +08:00
xiekaidong
626c9b94f1 提交 2023-06-28 21:25:54 +08:00
xiekaidong
c259b2ed58 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
#	lua/app/module/battle/battle_const.lua
2023-06-28 21:25:19 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +08:00
CloudJ
519dc9822e Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
#	lua/app/common/module_manager.lua
2023-06-28 09:38:58 +08:00
CloudJ
5cbcb29a4d 成长礼包 2023-06-28 09:38:29 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
CloudJ
b88c471ce0 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/common/bi_report.lua
2023-06-27 17:25:42 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
xiekaidong
f17eeb8e68 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-26 15:28:43 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
xiekaidong
eb7d04a5dc 修改格子计算方式 2023-06-26 11:13:13 +08:00
xiekaidong
16c0fe7182 添加容错 2023-06-25 10:30:21 +08:00
xiekaidong
8259a5e787 调整格子效果生效顺序 2023-06-21 16:02:44 +08:00
xiekaidong
c42d287b5a 登录界面优化 2023-06-21 10:24:15 +08:00
chenxi
1e8aebf944 注释和删除中文 2023-06-20 20:18:11 +08:00
xiekaidong
d46fdec70a bug修复 2023-06-20 17:50:33 +08:00
xiekaidong
d9a6ccc527 bug修复 2023-06-20 16:28:51 +08:00
xiekaidong
5de785f28e bug修复 2023-06-20 11:35:23 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
xiekaidong
e8e17acbdf Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 10:13:08 +08:00
xiekaidong
9a620ae064 bug修复 2023-06-19 10:13:05 +08:00
chenxi
0988c47259 adjust事件 2023-06-19 09:56:07 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
chenxi
a3f223ffe2 维护公告 2023-06-16 16:16:39 +08:00
chenxi
805b9bec93 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-16 15:38:10 +08:00
chenxi
7929c8ba37 维护公告 2023-06-16 15:38:07 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
chenxi
0a82df2421 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-16 15:11:40 +08:00
chenxi
fb671ca1af 维护公告 2023-06-16 15:11:37 +08:00
xiekaidong
7b8da9c782 bug修复 2023-06-16 14:29:55 +08:00
xiekaidong
942f06485f bug修复 2023-06-16 10:58:10 +08:00
xiekaidong
027809a5bd 战斗支持血量换皮肤 2023-06-15 18:55:10 +08:00
xiekaidong
c11428b80b bug修复 2023-06-15 17:52:22 +08:00
xiekaidong
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +08:00
chenxi
c6361d035f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-15 16:26:00 +08:00
chenxi
2c2e67caee 客服 2023-06-15 16:25:58 +08:00
xiekaidong
e8b6534d3b 副本开启引导触发 2023-06-15 15:32:27 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00