xiekaidong
|
61a23d81c9
|
Merge branch 'master' into dev_20230712
|
2023-07-11 11:05:47 +08:00 |
|
xiekaidong
|
0beaf804a9
|
用户属性主线阵容上报信息错误修复，竞技场消耗上报增加段位id，竞技场结算上报增加胜负
|
2023-07-10 17:46:11 +08:00 |
|
xiekaidong
|
a334622cbb
|
bug修复
|
2023-07-10 16:44:29 +08:00 |
|
xiekaidong
|
460a60a34f
|
木兰试玩
|
2023-07-10 12:00:32 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
xiekaidong
|
8bea91e63e
|
加一行代码
|
2023-07-06 21:49:35 +08:00 |
|
xiekaidong
|
8ecb19d48c
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-07-06 18:24:59 +08:00 |
|
xiekaidong
|
9ff9550fb5
|
日志上报
|
2023-07-06 18:24:53 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
0445086500
|
竞技场日志上报
|
2023-07-06 18:08:53 +08:00 |
|
Fang
|
9a7b8d316d
|
竞技场bi上报
|
2023-07-06 11:59:28 +08:00 |
|
Fang
|
68f80b45d3
|
竞技场ad宝箱功能补全
|
2023-07-05 15:02:59 +08:00 |
|
Fang
|
6099fe08fb
|
fix
|
2023-07-04 18:29:05 +08:00 |
|
xiekaidong
|
8569147e4c
|
更新协议
|
2023-07-04 18:14:09 +08:00 |
|
xiekaidong
|
47d5b00318
|
取消连线
|
2023-07-04 18:05:17 +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
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|
xiekaidong
|
b445b12dff
|
客服系统红点
|
2023-07-04 10:41:10 +08:00 |
|
xiekaidong
|
c976166cc9
|
竞技场弹窗礼包
|
2023-07-03 19:57:39 +08:00 |
|
xiekaidong
|
f228e84585
|
评价弹窗
|
2023-07-03 15:55:05 +08:00 |
|
xiekaidong
|
ecddb99390
|
google支付问题
|
2023-07-03 14:24:57 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
Fang
|
9dc155e593
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:50 +08:00 |
|
Fang
|
52a1631ad4
|
逻辑完善
|
2023-06-29 16:09:54 +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 |
|
Fang
|
10f3747396
|
处理新号报错
|
2023-06-29 10:03:42 +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 |
|
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 |
|
chenxi
|
4c80f6ee3d
|
白名单和审核模式
|
2023-06-21 11:35:44 +08:00 |
|
xiekaidong
|
f39665d6ce
|
修复
|
2023-06-20 22:08:55 +08:00 |
|
chenxi
|
9f8fff2cae
|
先屏蔽泰语
|
2023-06-20 15:44:31 +08:00 |
|
chenxi
|
ae544d1f3d
|
审核服上报
|
2023-06-20 14:52:35 +08:00 |
|
chenxi
|
93f580f1bf
|
资源白名单
|
2023-06-20 14:42:34 +08:00 |
|
chenxi
|
eb3ec49d37
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-06-20 10:05:58 +08:00 |
|
chenxi
|
b57c80254b
|
西班牙语
|
2023-06-20 10:05:55 +08:00 |
|
xiekaidong
|
557475e3c4
|
参数
|
2023-06-19 17:46:06 +08:00 |
|
xiekaidong
|
33ba5c7ef1
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-19 17:28:08 +08:00 |
|
xiekaidong
|
e573463879
|
增加网络通信失败的上报
|
2023-06-19 17:28:05 +08:00 |
|
Fang
|
45e6b4d856
|
跨天关闭副本关卡选择界面
|
2023-06-19 15:58:51 +08:00 |
|
chenxi
|
3c9a656192
|
获取firebasetoken
|
2023-06-19 11:18:15 +08:00 |
|