26 Commits

Author SHA1 Message Date
xiekaidong
99a26d953d 侧边栏增加前往优惠商城的按钮,修改战斗内技能链接显示bug 2023-07-13 15:52:18 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
CloudJ
519dc9822e Merge branch 'arena' of git.juzugame.com:b6-client/b6-lua into arena
# Conflicts:
#	lua/app/common/module_manager.lua
2023-06-28 09:38:58 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
Fang
bf1e7b7885 活动副本 2023-06-09 18:46:22 +08:00
chenxi
30d134ecc8 调整一下侧边栏的按钮顺序 2023-06-05 16:25:41 +08:00
chenxi
5216c8ff69 侧边栏优化 2023-06-05 16:23:55 +08:00
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +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
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
chenxi
2698e4044b 整理一下 2023-04-07 15:22:56 +08:00
xiekaidong
ccdd6a778b 棋盘 2023-04-06 10:38:04 +08:00