37 Commits

Author SHA1 Message Date
puxuan
200598d7e0 fix bug 2025-10-29 15:16:51 +08:00
puxuan
45e600be69 新加任务 2025-10-07 19:59:53 +08:00
puxuan
3e1693d91d 签到 2025-10-07 17:18:55 +08:00
puxuan
56936f582b 商店 2025-09-24 16:21:47 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
xiekaidong
d311ea14aa Merge branch 'master' into dev_20230815
# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua
2023-08-10 09:39:07 +08:00
xiekaidong
1ecb11124d 补充 2023-08-09 17:18:14 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
Fang
e79f7bcfa0 礼包界面展示冲突处理 2023-08-04 15:56:54 +08:00
xiekaidong
e05f02088c 统一接口,金币不足提示弹窗询问 2023-08-03 14:53:51 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
Fang
6099fe08fb fix 2023-07-04 18:29:05 +08:00
CloudJ
5cbcb29a4d 成长礼包 2023-06-28 09:38:29 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
CloudJ
298a0aaa1b 修复一些商城的bug 2023-05-31 15:41:42 +08:00
CloudJ
23fca8d7bf 更新首充界面 2023-05-29 17:15:54 +08:00
CloudJ
2f15a426bc 更新配置表 2023-05-29 16:25:50 +08:00
CloudJ
c106607a65 成长礼包逻辑 2023-05-26 19:57:13 +08:00
CloudJ
01922a4c0d 成长礼包 2023-05-26 15:44:35 +08:00
CloudJ
4fa2d67de2 礼包 2023-05-25 17:30:57 +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
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
21f1a9cd89 抽奖逻辑 2023-05-24 10:44:11 +08:00
CloudJ
1fb818d12b 提交一波 2023-05-23 18:37:09 +08:00
CloudJ
38a9faffb6 提交一波 2023-05-23 16:37:01 +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
chenxi
aa18b68b20 宝箱界面 2023-05-15 09:36:48 +08:00