xiekaidong
|
4a4b25e11c
|
竞技场弹出礼包界面
|
2023-08-14 14:52:38 +08:00 |
|
Fang
|
34282dc81b
|
竞技场宝箱弹出规则优化、bugfix
|
2023-08-11 15:37:26 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +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
|
a6b05117b7
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/userdata/dungeon/dungeon_armor_entity.lua
|
2023-08-08 11:41:34 +08:00 |
|
xiekaidong
|
1620d69548
|
英雄竞技场段位解锁
|
2023-08-03 18:07:24 +08:00 |
|
xiekaidong
|
a47f18db07
|
日志上报
|
2023-08-03 14:20:16 +08:00 |
|
Fang
|
591aee945b
|
增加优惠入口红点逻辑
|
2023-08-01 18:19:29 +08:00 |
|
xiekaidong
|
e954484a13
|
技能机制优化
|
2023-08-01 17:35:58 +08:00 |
|
xiekaidong
|
0c840c0cc8
|
Merge branch 'battle' into dev_20230809
|
2023-07-31 16:25:48 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
xiekaidong
|
ef6969c4d9
|
引导修改
|
2023-07-28 18:40:11 +08:00 |
|
Fang
|
7ffd2ee992
|
英雄图鉴红点fix
|
2023-07-27 10:32:52 +08:00 |
|
xiekaidong
|
37482eb2ca
|
副本引导
|
2023-07-24 17:10:39 +08:00 |
|
xiekaidong
|
3148733679
|
更新配置，上传资源
|
2023-07-21 17:17:51 +08:00 |
|
xiekaidong
|
f204a47316
|
试玩弹窗优化
|
2023-07-21 16:24:04 +08:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
6249f3bd3e
|
引导bug修复
|
2023-07-17 10:34:10 +08:00 |
|
Fang
|
fe2f7de08b
|
礼包入口spine
|
2023-07-14 15:26:38 +08:00 |
|
xiekaidong
|
99a26d953d
|
侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug
|
2023-07-13 15:52:18 +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 |
|
xiekaidong
|
061ac748ec
|
试玩
|
2023-07-12 09:43:49 +08:00 |
|
xiekaidong
|
dba2cf5b42
|
Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-lua into dev_20230712
|
2023-07-10 18:43:43 +08:00 |
|
xiekaidong
|
a15e60d6fe
|
英雄试玩
|
2023-07-10 18:43:40 +08:00 |
|
Fang
|
635a37e3f5
|
竞技场布阵优化
|
2023-07-10 18:26:54 +08:00 |
|
xiekaidong
|
460a60a34f
|
木兰试玩
|
2023-07-10 12:00:32 +08:00 |
|
Fang
|
c4aed1b62d
|
主界面英雄页图标显示处理
|
2023-07-07 15:39:50 +08:00 |
|
xiekaidong
|
b9c9b4d0ce
|
审核模式不显示竞技场礼包
|
2023-07-07 14:13:12 +08:00 |
|
xiekaidong
|
870a1e32d0
|
提审状态不显示竞技场战令
|
2023-07-07 14:06:01 +08:00 |
|
xiekaidong
|
a34edc2fd7
|
快捷切换多语言
|
2023-07-07 11:39:30 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
7d8b58cef3
|
bug修复
|
2023-07-06 17:28:23 +08:00 |
|
Fang
|
dfb1967899
|
竞技场战令文案替换
|
2023-07-06 14:42:10 +08:00 |
|
Fang
|
c09f030e2a
|
竞技场战令容错处理
|
2023-07-06 10:23:56 +08:00 |
|
xiekaidong
|
d90bff1941
|
引导
|
2023-07-06 09:57:57 +08:00 |
|
Fang
|
73b3a451e9
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:48:46 +08:00 |
|
xiekaidong
|
7c3f2cd890
|
竞技场开启引导
|
2023-07-05 15:45:28 +08:00 |
|
xiekaidong
|
cb34322f99
|
竞技场解锁动画
|
2023-07-05 15:33:39 +08:00 |
|
xiekaidong
|
9ae7f3d8a0
|
英雄红点
|
2023-07-05 11:45:41 +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 |
|
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 |
|
Fang
|
5cd90eab7e
|
fix
|
2023-07-04 15:14:41 +08:00 |
|