1394 Commits

Author SHA1 Message Date
chenxi
10e96bb030 Merge branch 'dev_20230608_hotupdate' 2023-06-08 17:08:30 +08:00
xiekaidong
cc8bace10b 上报修复 2023-06-08 17:07:04 +08:00
chenxi
5b37d50df4 多语言 2023-06-08 17:01:17 +08:00
xiekaidong
86e6e62fe9 bug修复 2023-06-08 16:41:07 +08:00
chenxi
4fd27dab0e 账号相关 2023-06-07 19:44:10 +08:00
chenxi
304ed48943 账号相关 2023-06-07 19:32:22 +08:00
chenxi
74a9205f30 账号绑定的bug 2023-06-07 19:13:20 +08:00
xiekaidong
fddb727eb4 删除冗余代码 2023-06-07 19:03:32 +08:00
chenxi
695e9f1e7d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 21:11:42 +08:00
chenxi
3edeb6c50c 隐私政策,退回登录界面还是连不上的问题 2023-06-06 21:11:38 +08:00
xiekaidong
7aa6dad65d 登陆界面复制账号 2023-06-06 21:05:12 +08:00
xiekaidong
1c89ec147b 显示bug修复 2023-06-06 20:37:32 +08:00
chenxi
1461bc9d7f 调长一点 2023-06-06 18:40:49 +08:00
chenxi
94ce7bdc8e 更新配置 2023-06-06 18:40:23 +08:00
chenxi
b621d37dbe Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 18:22:55 +08:00
chenxi
3ccfaec8d0 战令 2023-06-06 18:22:48 +08:00
xiekaidong
ce947c0a34 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 18:21:27 +08:00
CloudJ
a53c617f2a 登录触发的成长礼包增加满级不弹判断 2023-06-06 18:21:54 +08:00
xiekaidong
fac1e2c2d5 更新一下字段 2023-06-06 18:20:42 +08:00
chenxi
01054b8e3b merge bireport 2023-06-06 18:14:34 +08:00
chenxi
ec3ae95cc4 上报相关 2023-06-06 18:14:07 +08:00
xiekaidong
6cb971d493 战斗bi日志上报 2023-06-06 18:06:38 +08:00
xiekaidong
e69b7a14e5 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-06-06 17:59:30 +08:00
xiekaidong
8bdd4ae3d3 英雄操作bi上报 2023-06-06 17:58:58 +08:00
CloudJ
f4b2f6d32c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 17:51:23 +08:00
CloudJ
0d2144756d 调整上报参数 2023-06-06 17:51:18 +08:00
chenxi
9c94d29418 几个上报 2023-06-06 17:41:29 +08:00
Fang
be6d42fe88 战斗退出后显示主界面控制 2023-06-06 17:30:50 +08:00
chenxi
be52bb20b6 新号上报体力 2023-06-06 17:25:45 +08:00
chenxi
a9d40c0c64 新号上报 2023-06-06 17:21:57 +08:00
chenxi
0a7c349470 merge 2023-06-06 17:14:17 +08:00
chenxi
e59e40435d 上报玩家升级 2023-06-06 17:13:44 +08:00
CloudJ
f84f0a103a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 17:11:18 +08:00
CloudJ
f95926cfde 增加一部分上报 2023-06-06 17:11:16 +08:00
xiekaidong
1f22f95197 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 16:45:02 +08:00
xiekaidong
538c9e51b1 bug修复 2023-06-06 16:44:59 +08:00
chenxi
e6435c68ff 公共事件增加上报体力 2023-06-06 16:43:12 +08:00
chenxi
be043ef0d1 支付上报 2023-06-06 15:50:33 +08:00
chenxi
d3d224c855 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 15:29:54 +08:00
chenxi
469cd98661 显示重连 2023-06-06 15:29:52 +08:00
xiekaidong
32df7d9516 修改上报 2023-06-06 15:25:21 +08:00
xiekaidong
4d6e578982 显示 2023-06-06 15:06:18 +08:00
xiekaidong
e60cedc505 检查一下 2023-06-06 14:47:02 +08:00
xiekaidong
c9558263e2 更新配置 2023-06-06 14:39:25 +08:00
xiekaidong
0afa71888e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 14:12:53 +08:00
xiekaidong
0867e84815 切换波次时自动关闭buff弹窗 2023-06-06 14:12:50 +08:00
chenxi
48cc41ba97 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 11:59:44 +08:00
CloudJ
8052cfa716 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-06 12:00:50 +08:00
CloudJ
2c4aec0178 成长礼包屏蔽满级状态 2023-06-06 12:00:45 +08:00
chenxi
24c71edd35 loading 2023-06-06 11:59:36 +08:00