60 Commits

Author SHA1 Message Date
Fang
1b610b9e72 礼包红点刷新fix 2023-09-06 16:53:58 +08:00
xiekaidong
35d84fead7 bug修复 2023-09-05 15:28:24 +08:00
xiekaidong
9e75ea15c3 安卓返回键 2023-09-05 15:24:24 +08:00
xiekaidong
d67a0a8b69 优化 2023-09-05 12:01:42 +08:00
xiekaidong
950ecacee5 bug修复和优化 2023-09-05 11:47:28 +08:00
xiekaidong
c6e44efbd6 bug修复 2023-09-04 19:25:50 +08:00
xiekaidong
b47d779cfc 修复一些bug 2023-09-04 18:21:17 +08:00
xiekaidong
b9beea2c45 倒计时优化 2023-09-04 17:24:28 +08:00
xiekaidong
b5204ce133 跳转 2023-09-04 16:31:04 +08:00
xiekaidong
4e5021741d Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
2023-09-01 21:18:54 +08:00
xiekaidong
e182698950 红点 2023-09-01 21:16:56 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
Fang
3dbfc8458c review 2023-09-01 17:45:29 +08:00
Fang
6eea9de2e5 代码调整 2023-09-01 15:58:52 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
xiekaidong
6c5f5a16c2 显示修复 2023-08-28 18:36:01 +08:00
xiekaidong
787b04bfc7 动画 2023-08-24 18:28:56 +08:00
xiekaidong
19399ae3a6 更改基金开启时间 2023-08-24 18:25:46 +08:00
xiekaidong
bc42d8e4a8 界面处理 2023-08-23 17:46:31 +08:00
xiekaidong
b2a829741b 界面调整 2023-08-23 17:35:27 +08:00
xiekaidong
0137884ad9 一些描述 2023-08-18 18:35:38 +08:00
xiekaidong
c880279be1 英雄基金 2023-08-18 18:08:48 +08:00
xiekaidong
b5fb7a7e28 英雄基金 2023-08-18 14:39:01 +08:00
xiekaidong
d284ed0bc4 英雄基金 2023-08-18 11:38:21 +08:00
xiekaidong
9fa692f53f 英雄基金 2023-08-18 09:50:44 +08:00
xiekaidong
5b119201cf 界面和协议 2023-08-17 18:16:06 +08:00
xiekaidong
4ffcda7f0e 优化 2023-08-15 19:41:17 +08:00
Fang
1ccef0858b 红点遮挡处理 2023-08-15 16:17:21 +08:00
Fang
8cfd6358d8 bug fix 2023-08-15 15:08:07 +08:00
Fang
e802a03550 活动等级达到最大报错fix 2023-08-15 10:28:20 +08:00
Fang
a1a13036c9 夏日活动战令购买spine动画调换 2023-08-14 09:58:26 +08:00
Fang
391e171497 资源替换 2023-08-11 17:02:08 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
Fang
ba449382a9 细节完善 2023-08-11 14:26:52 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
1eb1295c1c 金猪 2023-08-09 10:21:13 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
chenxi
823dac78f8 金猪倒计时 2023-06-13 11:59:35 +08:00
chenxi
9c94d29418 几个上报 2023-06-06 17:41:29 +08:00
chenxi
a0da15d140 七天乐界面 2023-06-05 18:07:40 +08:00
chenxi
38aa2b8ffa 七天乐替换界面 2023-06-05 17:56:35 +08:00
chenxi
aa1fe04d66 金猪bug 2023-06-05 15:07:54 +08:00
chenxi
2d22311031 金猪购买后提示异常的bug 2023-05-31 21:16:30 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
chenxi
ad9f510a1e 七天乐 2023-05-30 22:22:46 +08:00
chenxi
afc0b58e39 七天乐天数没解锁的表现 2023-05-30 19:14:14 +08:00
chenxi
40fef6069a 七天乐打开界面的时候自动去最新的天数 2023-05-30 17:45:09 +08:00
chenxi
2b496c8c19 七天乐tips 2023-05-30 16:07:45 +08:00