30 Commits

Author SHA1 Message Date
Fang
6753303909 界面跳转未关闭fix 2023-07-25 15:44:10 +08:00
xiekaidong
100e125c19 Merge branch 'dev_20230725' into dungeon
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2023-07-20 19:45:54 +08:00
xiekaidong
b8751b9229 支线副本 2023-07-20 19:44:41 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
Fang
e580b332a9 添加头像、头像框道具解锁逻辑 2023-07-07 11:04:22 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
Fang
5cd90eab7e fix 2023-07-04 15:14:41 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
Fang
45e6b4d856 跨天关闭副本关卡选择界面 2023-06-19 15:58:51 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
chenxi
34332c6af9 merge cdkey 2023-06-14 15:04:56 +08:00
chenxi
5934e03198 cdkey 2023-06-14 15:04:26 +08:00
Fang
097812e730 fix 2023-06-14 10:22:34 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
chenxi
35a6bc5fa7 账号绑定 2023-05-31 22:23:04 +08:00
CloudJ
298a0aaa1b 修复一些商城的bug 2023-05-31 15:41:42 +08:00
Fang
17b5f1129c 每日挑战界面调整、扣除次数修复 2023-05-31 10:24:51 +08:00
CloudJ
2f15a426bc 更新配置表 2023-05-29 16:25:50 +08:00
CloudJ
8cc59343b7 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-29 14:05:35 +08:00
chenxi
85cdf222c6 修复任务没开启前会显示任务完成得toast 2023-05-29 12:05:26 +08:00
CloudJ
792830c90e 首充礼包 2023-05-29 11:03:43 +08:00
xiekaidong
bff772a1de 技能刷新接入联网 2023-05-24 10:01:36 +08:00
chenxi
78e03328ce 邮件 2023-05-22 21:23:07 +08:00
xiekaidong
3f747de9aa boss的buff自动提示 2023-05-22 17:23:36 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
xiekaidong
7de12f99e5 搬运一下b5的网络模块 2023-05-05 10:42:56 +08:00
xiekaidong
eeb0af1262 战斗引导 2023-04-21 16:10:28 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00
xiekaidong
e30ad1dbd0 整理代码 2023-04-03 10:59:13 +08:00