50 Commits

Author SHA1 Message Date
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
CloudJ
5cbcb29a4d 成长礼包 2023-06-28 09:38:29 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
chenxi
9666158491 adjust上报 2023-06-14 21:43:02 +08:00
chenxi
0d916a96e8 Merge branch 'dev_shenhe' into dev 2023-06-12 18:25:37 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
chenxi
cd0f34f5ee 商店页签红点 2023-06-09 15:45:43 +08:00
chenxi
1d163ad8eb 商店 2023-06-09 15:41:54 +08:00
chenxi
4d898cee05 商店页签红点 2023-06-09 15:33:45 +08:00
chenxi
60e6251493 商店页签红点 2023-06-09 15:30:36 +08:00
chenxi
822b6baa75 商店热卖标签红点 2023-06-08 20:51:09 +08:00
CloudJ
a53c617f2a 登录触发的成长礼包增加满级不弹判断 2023-06-06 18:21:54 +08:00
chenxi
ec3ae95cc4 上报相关 2023-06-06 18:14:07 +08:00
CloudJ
f95926cfde 增加一部分上报 2023-06-06 17:11:16 +08:00
CloudJ
2c4aec0178 成长礼包屏蔽满级状态 2023-06-06 12:00:45 +08:00
CloudJ
8f27d79134 配置表 2023-06-05 19:41:10 +08:00
CloudJ
2342df9b36 首充礼包条件修改 2023-06-05 15:20:29 +08:00
CloudJ
6fa649d8f5 金币礼包结构调整 2023-06-05 14:21:40 +08:00
CloudJ
87a178c50d 商城跨天重置逻辑调整 2023-05-31 11:37:48 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
CloudJ
47ad46fba9 审核模式调整 2023-05-30 11:34:38 +08:00
CloudJ
b64ea50f65 审核模式增加mall_treasure表 2023-05-30 10:38:07 +08:00
CloudJ
1d21fd5ff5 红点 2023-05-30 10:13:53 +08:00
CloudJ
08e95f0ff3 商城红点去掉toast 2023-05-30 09:43:29 +08:00
CloudJ
058c2aec8a 商城红点 2023-05-29 18:06:40 +08:00
CloudJ
81fe73352d 商城开启条件 2023-05-29 15:38:13 +08:00
CloudJ
f8a4bf7935 多语言 2023-05-29 14:05:32 +08:00
CloudJ
8ed5c657b1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/module/maincity/maincity_const.lua
2023-05-29 11:04:25 +08:00
CloudJ
792830c90e 首充礼包 2023-05-29 11:03:43 +08:00
chenxi
5ab6aac2b6 代码重命名 2023-05-29 10:54:10 +08:00
CloudJ
c106607a65 成长礼包逻辑 2023-05-26 19:57:13 +08:00
CloudJ
01922a4c0d 成长礼包 2023-05-26 15:44:35 +08:00
CloudJ
9c87bbc5d7 助力礼包逻辑调整 2023-05-25 19:18:46 +08:00
CloudJ
6cbf391728 礼包逻辑调整 2023-05-25 18:18:08 +08:00
CloudJ
4d6bdbed51 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-25 17:31:00 +08:00
CloudJ
4fa2d67de2 礼包 2023-05-25 17:30:57 +08:00
chenxi
189faa4701 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/buff_daily_challenge.lua.meta
#	lua/app/config/chapter_board_daily_challenge.lua.meta
#	lua/app/config/chapter_daily_challenge.lua.meta
#	lua/app/config/monster_daily_challenge.lua.meta
#	lua/app/config/strings/cn/buff_daily_challenge.lua.meta
#	lua/app/config/strings/cn/task_daily_challenge.lua.meta
#	lua/app/config/strings/de/buff_daily_challenge.lua.meta
#	lua/app/config/strings/de/task_daily_challenge.lua.meta
#	lua/app/config/strings/en/buff_daily_challenge.lua.meta
#	lua/app/config/strings/en/task_daily_challenge.lua.meta
#	lua/app/config/strings/fr/buff_daily_challenge.lua.meta
#	lua/app/config/strings/fr/task_daily_challenge.lua.meta
#	lua/app/config/strings/id/buff_daily_challenge.lua.meta
#	lua/app/config/strings/id/task_daily_challenge.lua.meta
#	lua/app/config/strings/ja/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ja/task_daily_challenge.lua.meta
#	lua/app/config/strings/ko/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ko/task_daily_challenge.lua.meta
#	lua/app/config/strings/pt/buff_daily_challenge.lua.meta
#	lua/app/config/strings/pt/task_daily_challenge.lua.meta
#	lua/app/config/strings/ru/buff_daily_challenge.lua.meta
#	lua/app/config/strings/ru/task_daily_challenge.lua.meta
#	lua/app/config/strings/th/buff_daily_challenge.lua.meta
#	lua/app/config/strings/th/task_daily_challenge.lua.meta
#	lua/app/config/strings/vi/buff_daily_challenge.lua.meta
#	lua/app/config/strings/vi/task_daily_challenge.lua.meta
#	lua/app/config/strings/zh/buff_daily_challenge.lua.meta
#	lua/app/config/strings/zh/task_daily_challenge.lua.meta
#	lua/app/config/task_daily_challenge.lua.meta
2023-05-25 17:06:46 +08:00
chenxi
56a4f329c3 紧急 2023-05-25 17:05:55 +08:00
CloudJ
b784b7aeda 金币礼包逻辑调整 2023-05-25 16:30:10 +08:00
CloudJ
cc674c3204 更新配置表与pb 修复一些问题 2023-05-25 15:26:57 +08:00
CloudJ
df62beaafe 金币礼包 2023-05-25 14:42:52 +08:00
CloudJ
095979cd65 容错 2023-05-25 14:32:00 +08:00
CloudJ
423b4a8f78 助力与金币礼包 2023-05-25 12:00:57 +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
CloudJ
13d53c5166 提一波 2023-05-23 14:17:29 +08:00
CloudJ
066b5cdef9 cache 2023-05-22 17:50:02 +08:00
CloudJ
58de179979 每日特惠 2023-05-22 17:27:12 +08:00
CloudJ
aec28d95e8 shop 2023-05-22 16:14:57 +08:00