puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,115 Commits 6 Branches 94 Tags
Commit Graph

92 Commits

Author SHA1 Message Date
chenxi
fd8151dfa6 成就可以领的时候的处理 2023-06-01 11:57:21 +08:00
Fang
7ff0afed6c 主界面按钮切换动画替换 2023-05-31 17:56:01 +08:00
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
Fang
325d906a3c 每日挑战跨天请求时机优化 2023-05-31 11:59:50 +08:00
CloudJ
14b1f256c9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 11:37:51 +08:00
CloudJ
87a178c50d 商城跨天重置逻辑调整 2023-05-31 11:37:48 +08:00
Fang
17b5f1129c 每日挑战界面调整、扣除次数修复 2023-05-31 10:24:51 +08:00
chenxi
284f7ce3c7 设置界面里的邮箱加一个开启限制 2023-05-30 18:17:51 +08:00
chenxi
5d7771fd87 解锁新功能弹窗 2023-05-30 15:32:58 +08:00
chenxi
a4ace76f2f 主城战令名字 2023-05-30 14:30:02 +08:00
陈希
bbc196035c Merge branch 'fang/daily_challenge' into 'dev' 
每日挑战

See merge request b6-client/b6-lua!1
 2023-05-30 03:38:33 +00:00
CloudJ
47ad46fba9 审核模式调整 2023-05-30 11:34:38 +08:00
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
Fang
9b3a00e809 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 
# Conflicts:
#	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
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
 2023-05-30 10:35:05 +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
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
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +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
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +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
Fang
d473cbc537 提示逻辑补全 2023-05-26 15:43:01 +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