36 Commits

Author SHA1 Message Date
Fang
a8f727c014 每日挑战首次解锁显示fix 2023-06-05 10:41:20 +08:00
chenxi
2f2a993c12 打完第二章后七天乐没有开启的bug 2023-06-02 18:20:15 +08:00
chenxi
b609f796ba 只有主线关卡战斗结算显示金猪 2023-06-02 12:11:29 +08:00
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
chenxi
5d7771fd87 解锁新功能弹窗 2023-05-30 15:32:58 +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
837f54acda 英雄解锁 2023-05-30 10:17:31 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
xiekaidong
cff917cac8 显示优化 2023-05-26 16:32:13 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
CloudJ
6cbf391728 礼包逻辑调整 2023-05-25 18:18:08 +08:00
CloudJ
4fa2d67de2 礼包 2023-05-25 17:30:57 +08:00
CloudJ
eb531423dd 章节礼包与新手礼包 2023-05-24 16:00:43 +08:00
chenxi
ee23cd83ad 金猪和邮件 2023-05-23 17:02:14 +08:00
chenxi
78e03328ce 邮件 2023-05-22 21:23:07 +08:00
chenxi
a47b2bdf2c 先屏蔽金猪 2023-05-22 11:21:55 +08:00
xiekaidong
b8d7fa533d 战斗内部计数相关任务 2023-05-19 18:18:33 +08:00
xiekaidong
58d366ba9d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-19 18:00:05 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00
chenxi
af59a3f9a2 体力不足的时候弹出来购买体力 2023-05-19 17:05:28 +08:00
xiekaidong
2023930d62 宝箱 2023-05-17 19:19:24 +08:00
xiekaidong
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
xiekaidong
2c341db47c 关卡修改 2023-05-06 10:37:02 +08:00
xiekaidong
8801943ae3 整理一下代码,接入联网 2023-05-05 18:27:33 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
chenxi
7508f219d2 体力 2023-04-24 10:30:40 +08:00
chenxi
b378de406c fix bug 2023-04-21 21:21:51 +08:00
chenxi
3abfa8ce27 打赢最新的关卡去下一关 2023-04-21 10:56:25 +08:00
chenxi
79bad73dfe 打赢后去下一关 2023-04-21 10:55:13 +08:00
xiekaidong
9be9feefbd 英雄解锁和强制上阵的判定 2023-04-19 22:20:22 +08:00
xiekaidong
dc5a37ac0f 一些细节调整 2023-04-15 16:47:18 +08:00
xiekaidong
328515c82a 开宝箱 2023-04-15 14:57:34 +08:00
xiekaidong
f74a7f6080 关卡宝箱 2023-04-15 14:45:42 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00