52 Commits

Author SHA1 Message Date
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
Fang
2da8da07d0 装备升级礼包 2023-08-24 17:29:33 +08:00
xiekaidong
c880279be1 英雄基金 2023-08-18 18:08:48 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
Fang
2933776048 支线基金 2023-07-24 11:54:09 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00
xiekaidong
6f85752093 firebase、af、fb日志上报 2023-07-18 15:06:30 +08:00
xiekaidong
0157ca5d27 一些日志上报混乱修复 2023-07-11 11:02:14 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +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
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
af1c4f72a7 支付调整 2023-06-15 10:11:08 +08:00
chenxi
9666158491 adjust上报 2023-06-14 21:43:02 +08:00
chenxi
119a6eaa27 支付 2023-06-14 18:57:09 +08:00
chenxi
fb18182d6a ios 支付 2023-06-14 18:43:04 +08:00
xiekaidong
35053faa9b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-14 16:00:20 +08:00
xiekaidong
17ad018a43 日志上报 2023-06-14 16:00:17 +08:00
chenxi
d3bb4c3698 Merge branch 'dev_ios' into dev 2023-06-14 15:40:47 +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
acccd99660 adjust事件 2023-06-09 19:00:54 +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
xiekaidong
cc8bace10b 上报修复 2023-06-08 17:07:04 +08:00
xiekaidong
75bcd50e85 支付奖励上报修复 2023-06-08 12:06:03 +08:00
xiekaidong
c800a0cc31 日志上报 2023-06-07 17:25:08 +08:00
chenxi
be043ef0d1 支付上报 2023-06-06 15:50:33 +08:00
chenxi
16975e700e 充值后没有绑定则提示绑定 2023-06-05 18:32:51 +08:00
xiekaidong
5d5ba37a4b 支付成功时没绑定账号,提示绑定账号 2023-06-05 18:02:12 +08:00
xiekaidong
7acd32c46c 更改奖励上报 2023-06-05 15:35:05 +08:00
chenxi
a225025d02 支付code 2023-06-04 22:12:28 +08:00
CloudJ
23fca8d7bf 更新首充界面 2023-05-29 17:15:54 +08:00
chenxi
5ab6aac2b6 代码重命名 2023-05-29 10:54:10 +08:00
CloudJ
01922a4c0d 成长礼包 2023-05-26 15:44:35 +08:00
CloudJ
423b4a8f78 助力与金币礼包 2023-05-25 12:00:57 +08:00
CloudJ
602cd716df Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/pay_manager.lua
2023-05-25 10:18:31 +08:00
chenxi
4212a80a4a 等级基金 2023-05-24 21:05:52 +08:00
CloudJ
5888ee766f 助力礼包 2023-05-24 17:26:52 +08:00
CloudJ
eb531423dd 章节礼包与新手礼包 2023-05-24 16:00:43 +08:00
CloudJ
ca51dddab2 章节礼包 2023-05-24 11:33:54 +08:00
chenxi
c95e0cb014 merge 2023-05-23 17:04:04 +08:00
chenxi
ee23cd83ad 金猪和邮件 2023-05-23 17:02:14 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00