CloudJ
|
d15e52a41d
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:38:10 +08:00 |
|
CloudJ
|
b64ea50f65
|
审核模式增加mall_treasure表
|
2023-05-30 10:38:07 +08:00 |
|
chenxi
|
bcfd27d6f0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-30 10:17:34 +08:00 |
|
chenxi
|
837f54acda
|
英雄解锁
|
2023-05-30 10:17:31 +08:00 |
|
CloudJ
|
058c2aec8a
|
商城红点
|
2023-05-29 18:06:40 +08:00 |
|
CloudJ
|
2f15a426bc
|
更新配置表
|
2023-05-29 16:25:50 +08:00 |
|
CloudJ
|
81fe73352d
|
商城开启条件
|
2023-05-29 15:38:13 +08:00 |
|
CloudJ
|
792830c90e
|
首充礼包
|
2023-05-29 11:03:43 +08:00 |
|
chenxi
|
dc96cf269e
|
调整侧标栏按钮位置
|
2023-05-26 19:25:41 +08:00 |
|
chenxi
|
3262bb7633
|
七天乐红点
|
2023-05-26 17:01:16 +08:00 |
|
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
|
0b6607d714
|
七天乐
|
2023-05-26 14:51:24 +08:00 |
|
CloudJ
|
8158609a45
|
修复一个拼写报错
|
2023-05-25 18:47:18 +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
|
303b535ded
|
引导处理
|
2023-05-25 14:27:02 +08:00 |
|
chenxi
|
b18187a937
|
主城货币显示
|
2023-05-24 21:50:51 +08:00 |
|
CloudJ
|
eb531423dd
|
章节礼包与新手礼包
|
2023-05-24 16:00:43 +08:00 |
|
CloudJ
|
ca51dddab2
|
章节礼包
|
2023-05-24 11:33:54 +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
|
6f6b8ed3f3
|
金猪
|
2023-05-23 18:21:24 +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
|
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
|
7552e3a946
|
sidebar
|
2023-05-19 23:10:28 +08:00 |
|
chenxi
|
b6da2f4bd6
|
挂机
|
2023-05-18 22:09:43 +08:00 |
|
chenxi
|
8c2d9c26bb
|
多语言
|
2023-05-17 16:26:33 +08:00 |
|
chenxi
|
4a162302ff
|
主城战令显示
|
2023-05-16 22:39:23 +08:00 |
|
chenxi
|
dfc705fbe8
|
商城
|
2023-05-12 21:07:05 +08:00 |
|
chenxi
|
6369eab7f6
|
战令
|
2023-05-12 15:32:53 +08:00 |
|
chenxi
|
2a8dd6bbca
|
主城资源栏
|
2023-05-12 11:54:45 +08:00 |
|
chenxi
|
b5b1ad00e7
|
红点
|
2023-05-12 11:23:06 +08:00 |
|
chenxi
|
482e1a2127
|
任务
|
2023-05-11 18:20:10 +08:00 |
|
chenxi
|
df3a225ebd
|
任务
|
2023-05-09 17:41:27 +08:00 |
|
chenxi
|
8e590c242b
|
任务
|
2023-05-09 15:24:20 +08:00 |
|
chenxi
|
d930b3ded7
|
设置
|
2023-05-08 21:45:28 +08:00 |
|
xiekaidong
|
cb0e613e47
|
Merge branch 'dev' into net
|
2023-05-08 09:48:06 +08:00 |
|
xiekaidong
|
55ec0dd76c
|
联网
|
2023-05-08 09:47:58 +08:00 |
|
chenxi
|
04e6bdcfda
|
主城侧边栏
|
2023-05-06 11:34:41 +08:00 |
|