1415 Commits

Author SHA1 Message Date
chenxi
fb18182d6a ios 支付 2023-06-14 18:43:04 +08:00
chenxi
27676042fb ios 支付调整 2023-06-14 17:36:22 +08:00
chenxi
02cdb96b4b ios支付 2023-06-13 18:19:01 +08:00
chenxi
1b27a8dfae ios支付参数 2023-06-13 18:05:16 +08:00
chenxi
4533b422cd Merge branch 'dev_shenhe' into dev_ios 2023-06-13 15:05:05 +08:00
chenxi
0e62320f31 审核模式不显示金猪 2023-06-13 15:04:47 +08:00
chenxi
da49331705 Merge branch 'dev_shenhe' into dev_ios 2023-06-13 10:45:42 +08:00
chenxi
00ec7c553d 账号绑定的apple处理 2023-06-13 10:41:19 +08:00
chenxi
d8b335daf5 支付转菊花 2023-06-12 22:19:11 +08:00
chenxi
df85eb2aed Merge branch 'dev_shenhe' into dev_ios 2023-06-12 18:26:28 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
chenxi
acccd99660 adjust事件 2023-06-09 19:00:54 +08:00
chenxi
2fd8f49f32 rechargeid 2023-06-09 17:08:04 +08:00
chenxi
4e4719a51e ios 支付 2023-06-09 16:39:45 +08:00
chenxi
89d068133e ios支付 2023-06-09 16:30:17 +08:00
xiekaidong
1ddb7bd43b ios支付处理 2023-06-09 16:08:22 +08:00
chenxi
c300705012 proto 2023-06-09 15:07:37 +08:00
chenxi
339d005e73 平台名 2023-06-09 11:46:47 +08:00
chenxi
c56d52f640 fix bug 2023-06-08 18:29:17 +08:00
chenxi
7dc52dbfd9 Merge branch 'master' into dev_ios 2023-06-08 18:28:34 +08:00
chenxi
c9a3ab1d14 启动界面 2023-06-08 17:30:16 +08:00
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