70 Commits

Author SHA1 Message Date
puxuan
69dc46402f fix bug 2025-10-27 18:35:17 +08:00
puxuan
6f87b9f938 fix bug 2025-10-21 14:51:28 +08:00
puxuan
e6afcd0ccd fix bug 2025-10-18 18:05:05 +08:00
puxuan
578124257e . 2025-10-10 15:13:55 +08:00
puxuan
acc06f613a fix bug 2025-10-09 19:57:12 +08:00
puxuan
933bbc243f 活动整理 2025-10-07 11:18:52 +08:00
puxuan
0736e58c5f 主界面图标 2025-09-28 16:09:37 +08:00
puxuan
0e0e36522d fix bug 2025-09-16 14:59:56 +08:00
puxuan
54e59862e5 2025-09-05 15:10:45 +08:00
puxuan
77d01818ed fix bug 2025-09-05 14:26:16 +08:00
puxuan
66c6437612 抽卡 2025-08-11 20:37:29 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
0d979c5275 bug修复 2023-08-11 10:05:28 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
6bc0ce7738 添加一些容错 2023-07-24 17:04:40 +08:00
xiekaidong
d96adead75 修改评价弹窗关卡 2023-07-21 09:55:47 +08:00
xiekaidong
c3e62e4bc2 修改一下命名 2023-07-18 17:04:09 +08:00
xiekaidong
6f85752093 firebase、af、fb日志上报 2023-07-18 15:06:30 +08:00
xiekaidong
c0c0c8f93e 优化章节礼包弹出逻辑 2023-07-13 16:52:38 +08:00
xiekaidong
f527141d7b Merge branch 'master' into dev_20230712 2023-07-12 09:48:18 +08:00
xiekaidong
0157ca5d27 一些日志上报混乱修复 2023-07-11 11:02:14 +08:00
xiekaidong
460a60a34f 木兰试玩 2023-07-10 12:00:32 +08:00
Fang
b16f75f42e 竞技场挑战前判断阵容、超框 2023-07-07 11:54:27 +08:00
xiekaidong
ce97be9b65 Merge branch 'dev' into arena
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/module/battle/controller/battle_controller.lua
#	lua/app/ui/main_city/main_city_ui.lua
2023-07-04 15:36:04 +08:00
xiekaidong
1cd1d31d98 评价弹窗 2023-07-03 11:33:17 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
Fang
b2be4d375e fix 2023-06-29 10:18:39 +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
CloudJ
5cbcb29a4d 成长礼包 2023-06-28 09:38:29 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
Fang
1d68846a85 ui细节调整 2023-06-13 18:44:47 +08:00
xiekaidong
71b4b2b4e0 战斗任务参数修改 2023-06-12 16:30:04 +08:00
xiekaidong
99694fc1d8 整合一下战斗任务参数 2023-06-12 16:25:11 +08:00
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