176 Commits

Author SHA1 Message Date
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
0d2144756d 调整上报参数 2023-06-06 17:51:18 +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
chenxi
e6435c68ff 公共事件增加上报体力 2023-06-06 16:43:12 +08:00
chenxi
be043ef0d1 支付上报 2023-06-06 15:50:33 +08:00
xiekaidong
eb1281f999 bi注释 2023-06-06 09:44:02 +08:00
chenxi
976dfc2653 上报参数 2023-06-05 21:29:54 +08:00
chenxi
0c8613fd6c bi 2023-06-05 21:04:38 +08:00
chenxi
74f91dabae 上报 2023-06-05 19:07:40 +08:00
chenxi
2b4dc82363 账号相关 2023-05-31 22:38:15 +08:00
chenxi
35a6bc5fa7 账号绑定 2023-05-31 22:23:04 +08:00
chenxi
fe3c8849b8 删除账号 2023-05-31 17:53:41 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
Fang
3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
2023-05-29 18:24:33 +08:00
chenxi
5ab6aac2b6 代码重命名 2023-05-29 10:54:10 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
Fang
858de8d1eb 每日挑战任务奖励 2023-05-26 18:00:46 +08:00
CloudJ
ec6ce43f70 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-26 15:44:50 +08:00
CloudJ
01922a4c0d 成长礼包 2023-05-26 15:44:35 +08:00
Fang
da120dc0a0 部分ui逻辑 2023-05-26 15:43:01 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
chenxi
8eccf012ba 七天乐 2023-05-26 15:38:55 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +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
chenxi
e421a044c2 删除不用的 2023-05-24 19:32:16 +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
xiekaidong
bff772a1de 技能刷新接入联网 2023-05-24 10:01:36 +08:00
CloudJ
ada108ac82 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-23 18:37:12 +08:00
CloudJ
1fb818d12b 提交一波 2023-05-23 18:37:09 +08:00
chenxi
c95e0cb014 merge 2023-05-23 17:04:04 +08:00
chenxi
ee23cd83ad 金猪和邮件 2023-05-23 17:02:14 +08:00
CloudJ
74e2ecbb76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-23 14:17:44 +08:00
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
chenxi
78e03328ce 邮件 2023-05-22 21:23:07 +08:00
CloudJ
46a2c52ca4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/bi_report.lua
2023-05-22 17:50:24 +08:00
CloudJ
066b5cdef9 cache 2023-05-22 17:50:02 +08:00
CloudJ
58de179979 每日特惠 2023-05-22 17:27:12 +08:00
chenxi
e97c1cd4e9 玩家升级界面 2023-05-22 16:22:26 +08:00
chenxi
f18e16103c 邮箱 2023-05-22 11:36:26 +08:00
chenxi
a783d2120c 挂机 2023-05-18 20:24:04 +08:00
chenxi
3cb5152538 挂机 2023-05-18 15:39:44 +08:00
chenxi
32051d90c6 战令 2023-05-15 21:32:13 +08:00