23 Commits

Author SHA1 Message Date
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
chenxi
5d7771fd87 解锁新功能弹窗 2023-05-30 15:32:58 +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
CloudJ
2fffb5c88a 商城 2023-05-29 15:10:04 +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
Fang
9830ac3cbd 每日挑战 2023-05-26 15:42:35 +08:00
chenxi
fdc400fd8d 基金 2023-05-24 19:19:34 +08:00
chenxi
78e03328ce 邮件 2023-05-22 21:23:07 +08:00
chenxi
deeeedbfaa 金猪 2023-05-19 23:02:02 +08:00
chenxi
dfc705fbe8 商城 2023-05-12 21:07:05 +08:00
chenxi
d930b3ded7 设置 2023-05-08 21:45:28 +08:00
chenxi
04e6bdcfda 主城侧边栏 2023-05-06 11:34:41 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +08:00
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
xiekaidong
867bf72134 引导,更新配置 2023-04-21 16:26:57 +08:00
xiekaidong
eeb0af1262 战斗引导 2023-04-21 16:10:28 +08:00
chenxi
2698e4044b 整理一下 2023-04-07 15:22:56 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00