xiekaidong
|
c03e46432f
|
修复
|
2023-09-19 11:20:48 +08:00 |
|
Fang
|
33526b2d2f
|
review
|
2023-09-15 19:22:15 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
xiekaidong
|
24a88cf05a
|
bug修复
|
2023-09-05 17:34:17 +08:00 |
|
xiekaidong
|
9e75ea15c3
|
安卓返回键
|
2023-09-05 15:24:24 +08:00 |
|
xiekaidong
|
9ce3168f39
|
bug修复
|
2023-09-05 10:06:52 +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
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
xiekaidong
|
049d7508ea
|
bossrush
|
2023-08-31 20:18:14 +08:00 |
|
Fang
|
b40d1acf9d
|
点击英雄卡面，不显示皮肤fix
|
2023-08-31 18:10:01 +08:00 |
|
Fang
|
aeb1c8e24a
|
更换皮肤卡面变化
|
2023-08-30 17:31:56 +08:00 |
|
Fang
|
c22b887d48
|
加载资源优化
|
2023-08-29 17:11:27 +08:00 |
|
xiekaidong
|
eb73910628
|
Merge branch 'master' into dev_20230829
|
2023-08-29 16:02:05 +08:00 |
|
Fang
|
36bb8eede2
|
段位奖励添加奖励光效
|
2023-08-28 17:41:52 +08:00 |
|
Fang
|
7b0f71065f
|
fix
|
2023-08-21 15:53:22 +08:00 |
|
Fang
|
a68c4c79f2
|
连续快速扫荡显示fix
|
2023-08-21 14:55:07 +08:00 |
|
Fang
|
bff1f50a2b
|
连续快速扫荡显示fix
|
2023-08-21 14:37:53 +08:00 |
|
xiekaidong
|
dd3d4d812a
|
一些优化和容错
|
2023-08-18 10:55:51 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
d311ea14aa
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board.lua
# lua/app/config/grid_type.lua
# lua/app/config/strings/cn/avatar.lua
# lua/app/config/strings/cn/avatar_frame.lua
# lua/app/config/strings/en/avatar.lua
# lua/app/config/strings/en/avatar_frame.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/avatar.lua
# lua/app/config/strings/es/avatar_frame.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/id/avatar.lua
# lua/app/config/strings/id/avatar_frame.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/avatar.lua
# lua/app/config/strings/ja/avatar_frame.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ko/avatar.lua
# lua/app/config/strings/ko/avatar_frame.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/avatar.lua
# lua/app/config/strings/pt/avatar_frame.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/th/avatar.lua
# lua/app/config/strings/th/avatar_frame.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/avatar.lua
# lua/app/config/strings/vi/avatar_frame.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/avatar.lua
# lua/app/config/strings/zh/avatar_frame.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/summon.lua
# lua/app/module/battle/component/battle_unit_comp.lua
# lua/app/module/battle/team/battle_team.lua
|
2023-08-10 09:39:07 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
a81f9de468
|
装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:19:42 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
1620d69548
|
英雄竞技场段位解锁
|
2023-08-03 18:07:24 +08:00 |
|
Fang
|
d30f382d40
|
道具获取的头像品质颜色错误fix
|
2023-08-01 10:28:22 +08:00 |
|
Fang
|
d89238a763
|
抽卡界面不展示装备升级红点
|
2023-07-28 12:05:32 +08:00 |
|
xiekaidong
|
0fd125dcfc
|
增加容错
|
2023-07-28 10:49:14 +08:00 |
|
Fang
|
9740e4b4f6
|
红点修改
|
2023-07-27 12:02:48 +08:00 |
|
Fang
|
e688bfd26d
|
英雄红点fix
|
2023-07-26 18:23:12 +08:00 |
|
Fang
|
a80e0b5e90
|
装备红点、文案
|
2023-07-26 15:14:44 +08:00 |
|
Fang
|
01c2ed492c
|
拼写错误fix
|
2023-07-25 20:28:20 +08:00 |
|
Fang
|
0d04b99d3e
|
显示fix
|
2023-07-24 21:39:18 +08:00 |
|
Fang
|
9ea10ea0c7
|
防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画
|
2023-07-24 21:07:05 +08:00 |
|
Fang
|
fd863d414c
|
道具获取扫荡文案修改
|
2023-07-24 15:57:58 +08:00 |
|
xiekaidong
|
b1df62d3a4
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:15:46 +08:00 |
|
Fang
|
bafb8673ec
|
装备升级材料获取
|
2023-07-21 09:50:45 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
xiekaidong
|
854ce2b986
|
通用扫荡弹窗
|
2023-07-19 10:39:22 +08:00 |
|
xiekaidong
|
27ef576c8f
|
副本入口
|
2023-07-18 21:00:12 +08:00 |
|
xiekaidong
|
0a78db2330
|
竞技场匹配阵容提示优化
|
2023-07-10 15:39:39 +08:00 |
|
xiekaidong
|
0b747a1071
|
二确认弹窗修复
|
2023-07-07 16:10:02 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
xiekaidong
|
f13f1f3e3a
|
引导处理一下
|
2023-07-05 21:58:38 +08:00 |
|
Fang
|
c2843e5a88
|
完善细节
|
2023-07-03 18:34:51 +08:00 |
|
Fang
|
52a1631ad4
|
逻辑完善
|
2023-06-29 16:09:54 +08:00 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
Fang
|
a522015156
|
逻辑补充
|
2023-06-28 18:36:53 +08:00 |
|