97 Commits

Author SHA1 Message Date
Fang
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
xiekaidong
4a4b25e11c 竞技场弹出礼包界面 2023-08-14 14:52:38 +08:00
Fang
34282dc81b 竞技场宝箱弹出规则优化、bugfix 2023-08-11 15:37:26 +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
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
xiekaidong
ef6969c4d9 引导修改 2023-07-28 18:40:11 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
8c3ce37bbe 引导问题 2023-07-12 16:46:21 +08:00
xiekaidong
9f9ee9e1d9 引导问题修复 2023-07-12 16:02:38 +08:00
xiekaidong
62989cb4cf 修改引导逻辑,防止异常卡死 2023-07-12 15:44:54 +08:00
Fang
635a37e3f5 竞技场布阵优化 2023-07-10 18:26:54 +08:00
xiekaidong
b9c9b4d0ce 审核模式不显示竞技场礼包 2023-07-07 14:13:12 +08:00
xiekaidong
870a1e32d0 提审状态不显示竞技场战令 2023-07-07 14:06:01 +08:00
Fang
dfb1967899 竞技场战令文案替换 2023-07-06 14:42:10 +08:00
Fang
c09f030e2a 竞技场战令容错处理 2023-07-06 10:23:56 +08:00
Fang
73b3a451e9 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:48:46 +08:00
xiekaidong
cb34322f99 竞技场解锁动画 2023-07-05 15:33:39 +08:00
Fang
c07a54b828 竞技场fix 2023-07-05 10:51:13 +08:00
xiekaidong
faf1e2487d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-07-04 20:13:28 +08:00
xiekaidong
d7cf21fde6 竞技场波次显示 2023-07-04 20:13:24 +08:00
Fang
5c4cfdcf28 段位图标重叠fix 2023-07-04 18:50:18 +08:00
Fang
5cd90eab7e fix 2023-07-04 15:14:41 +08:00
xiekaidong
a454faa670 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena
# Conflicts:
#	lua/app/config/strings/cn/global.lua
2023-07-03 19:57:49 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
Fang
77b5452d00 动效添加 2023-07-03 17:16:30 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
Fang
83f6a11b03 fix 2023-06-30 18:45:56 +08:00
Fang
9dc155e593 ui动画、结算界面逻辑 2023-06-30 16:50:50 +08:00
Fang
52a1631ad4 逻辑完善 2023-06-29 16:09:54 +08:00
Fang
10f3747396 处理新号报错 2023-06-29 10:03:42 +08:00
Fang
a522015156 逻辑补充 2023-06-28 18:36:53 +08:00
CloudJ
9b9bc72aa1 战令调整 2023-06-28 14:22:37 +08:00
Fang
cd09e79bca 竞技场 2023-06-27 18:27:11 +08:00
Fang
6e3c2523a5 英雄编队拆分出来 2023-06-20 11:02:45 +08:00
Fang
44c81c202d 副本入口显示fix 2023-06-19 14:17:13 +08:00
Fang
a003b22ad4 副本刷新 2023-06-15 17:28:02 +08:00
Fang
097812e730 fix 2023-06-14 10:22:34 +08:00
Fang
1d68846a85 ui细节调整 2023-06-13 18:44:47 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
Fang
e4dad61f52 活动副本 2023-06-12 15:39:52 +08:00
chenxi
bda768c79f bug 2023-06-08 18:05:55 +08:00
xiekaidong
502c73bae8 主界面关卡宝箱领取显示bug修复 2023-06-07 10:30:37 +08:00
Fang
be6d42fe88 战斗退出后显示主界面控制 2023-06-06 17:30:50 +08:00
xiekaidong
24a853e31a 显示优化 2023-06-06 11:32:07 +08:00
Fang
1cebb9f5aa 引导和界面冲突处理 2023-06-06 10:39:13 +08:00
Fang
1bc3b686f5 引导时不主动弹每日挑战任务弹窗 2023-06-06 10:23:36 +08:00
Fang
5d9e8d33de 容错处理 2023-06-05 10:59:10 +08:00
Fang
827c282c62 首次进入每日挑战未显示任务弹窗fix 2023-06-05 10:41:20 +08:00
Fang
a8f727c014 每日挑战首次解锁显示fix 2023-06-05 10:41:20 +08:00