52 Commits

Author SHA1 Message Date
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
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
chenxi
4306ab73ad 任务 2023-05-12 10:44:57 +08:00
chenxi
c44ce67f07 任务 2023-05-11 22:22:03 +08:00
chenxi
482e1a2127 任务 2023-05-11 18:20:10 +08:00
chenxi
dc81cffe85 任务 2023-05-11 11:22:11 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
chenxi
bef87baceb 货币获取上报总数量 2023-04-28 18:22:27 +08:00
xiekaidong
e54db9c128 体力回复上报 2023-04-28 00:00:32 +08:00
chenxi
e45900ee6f 删除不用的代码 2023-04-27 20:06:36 +08:00
xiekaidong
64826cfefb 改一下执行顺序 2023-04-27 09:49:03 +08:00
xiekaidong
442f75efab 调整一下bi打印逻辑 2023-04-27 09:45:16 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
chenxi
41330be8c2 上报 2023-04-25 18:17:39 +08:00
chenxi
824841e6f1 buff破裂特效 2023-04-25 16:20:18 +08:00
chenxi
799835c9be 登录 2023-04-25 14:38:12 +08:00
chenxi
57dc62ef4d 登录 2023-04-25 14:13:30 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
chenxi
7508f219d2 体力 2023-04-24 10:30:40 +08:00
chenxi
6224483fe9 屏蔽bi 2023-04-22 00:19:27 +08:00
xiekaidong
f74a7f6080 关卡宝箱 2023-04-15 14:45:42 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00
xiekaidong
d1c95c8979 战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理 2023-04-14 15:18:14 +08:00
xiekaidong
d1b80d3527 英雄养成 2023-04-13 21:13:43 +08:00
chenxi
8a19ab4781 战斗 2023-04-10 17:09:00 +08:00
chenxi
2698e4044b 整理一下 2023-04-07 15:22:56 +08:00