828 Commits

Author SHA1 Message Date
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
0445086500 竞技场日志上报 2023-07-06 18:08:53 +08:00
xiekaidong
8ee590a831 bug修复 2023-07-06 17:41:58 +08:00
xiekaidong
dc386c2bdb 网络模块优化,重连被拒绝后,后台静默重新登陆 2023-07-06 17:20:16 +08:00
xiekaidong
f65285bf46 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-06 14:43:51 +08:00
xiekaidong
994e93468c 引导延迟 2023-07-06 14:43:48 +08:00
Fang
9a7b8d316d 竞技场bi上报 2023-07-06 11:59:28 +08:00
xiekaidong
c9b32741cb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-05 17:55:03 +08:00
xiekaidong
7abf7a253b bug修复 2023-07-05 17:54:59 +08:00
Fang
73b3a451e9 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:48:46 +08:00
xiekaidong
e597b9f7be 战斗中属性加密 2023-07-05 17:05:17 +08:00
xiekaidong
960bf2eb5f 竞技场引导 2023-07-05 15:46:43 +08:00
xiekaidong
7c3f2cd890 竞技场开启引导 2023-07-05 15:45:28 +08:00
xiekaidong
51f709f3f3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-05 15:33:42 +08:00
xiekaidong
cb34322f99 竞技场解锁动画 2023-07-05 15:33:39 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
21365f487e 显示问题修复 2023-07-05 14:25:27 +08:00
xiekaidong
afd2c11ef1 连击提示 2023-07-05 11:22:46 +08:00
xiekaidong
9718eca3d7 竞技场任务 2023-07-05 10:15:33 +08:00
xiekaidong
c1592accae 敌方也显示combo 2023-07-04 21:04:50 +08:00
xiekaidong
d030ee5988 bug修复 2023-07-04 20:21:23 +08:00
xiekaidong
faf1e2487d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-04 20:13:28 +08:00
xiekaidong
d7cf21fde6 竞技场波次显示 2023-07-04 20:13:24 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
xiekaidong
e73346b5d6 客服红点 2023-07-04 18:14:46 +08:00
xiekaidong
8569147e4c 更新协议 2023-07-04 18:14:09 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
12ba5a0430 临时处理一下 2023-07-04 15:51:45 +08:00
xiekaidong
ce97be9b65 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua
2023-07-04 15:36:04 +08:00
Fang
a7aa915569 中途退出不重置对手 2023-07-04 15:24:12 +08:00
Fang
5cd90eab7e fix 2023-07-04 15:14:41 +08:00
xiekaidong
87cacec30c 竞技场暂停界面 2023-07-04 15:03:37 +08:00
xiekaidong
2d9c5b02b8 Merge branch 'new_arena' into arena 2023-07-04 10:44:09 +08:00
xiekaidong
b445b12dff 客服系统红点 2023-07-04 10:41:10 +08:00
xiekaidong
a454faa670 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
#	lua/app/config/strings/cn/global.lua
2023-07-03 19:57:49 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
Fang
c2843e5a88 完善细节 2023-07-03 18:34:51 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
xiekaidong
1cd1d31d98 评价弹窗 2023-07-03 11:33:17 +08:00
xiekaidong
9b738529fc 竞技场修改为自己先手 2023-07-03 09:46:39 +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
e7c6c45f0d 战斗系数 2023-06-29 21:56:47 +08:00
xiekaidong
1035873eef 战斗bug修复 2023-06-29 21:25:14 +08:00
xiekaidong
cae3580d2c 竞技场敌方自动战斗 2023-06-29 20:51:55 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00