1877 Commits

Author SHA1 Message Date
xiekaidong
f672783ab5 节奏调整 2023-06-30 20:54:17 +08:00
xiekaidong
4aa36c0122 Merge branch 'arena' into new_arena 2023-06-30 20:49:21 +08:00
xiekaidong
a51ee6d872 竞技场战斗流程更改 2023-06-30 20:47:22 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
xiekaidong
3f4f62903d bug修复 2023-06-30 17:54:07 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
xiekaidong
84f1f27c3c 战斗处理 2023-06-30 16:03:51 +08:00
xiekaidong
2ad12c4b46 竞技场节奏调整 2023-06-30 14:45:30 +08:00
xiekaidong
e7c6c45f0d 战斗系数 2023-06-29 21:56:47 +08:00
xiekaidong
1035873eef 战斗bug修复 2023-06-29 21:25:14 +08:00
xiekaidong
36526bcd5e 战斗调整 2023-06-29 21:14:24 +08:00
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
a8ac9b1789 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-29 14:24:33 +08:00
xiekaidong
7f7707094d 竞技场战斗 2023-06-29 14:24:29 +08:00
CloudJ
b1f01a9ded 增加泰语/西班牙 2023-06-29 14:22:08 +08:00
CloudJ
73f1a4d299 成长礼包 2023-06-29 10:41:31 +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
8bc3bdba34 报错修复 2023-06-29 10:12:33 +08:00
Fang
10f3747396 处理新号报错 2023-06-29 10:03:42 +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
8246f19b27 战令弹窗时间记录 2023-06-28 14:24:21 +08:00
CloudJ
9b9bc72aa1 战令调整 2023-06-28 14:22:37 +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
Fang
54242318ed 审核处理 2023-06-21 21:20:35 +08:00
xiekaidong
95c6377dbb bug修复 2023-06-21 17:15:18 +08:00
xiekaidong
8259a5e787 调整格子效果生效顺序 2023-06-21 16:02:44 +08:00
Fang
f47a35f2e7 显示fix 2023-06-21 15:17:14 +08:00
chenxi
68f9a47e00 更新配置 2023-06-21 14:05:45 +08:00
chenxi
98b2faca16 更新配置 2023-06-21 12:11:39 +08:00
xiekaidong
a97447200d 审核模式下屏蔽兑换码按钮 2023-06-21 11:49:28 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
chenxi
b49e4f261f 更新配置 2023-06-21 11:21:20 +08:00