xiekaidong
|
d4c7cf71b0
|
优化一下断线续关，并增加上报
|
2023-09-12 19:43:58 +08:00 |
|
xiekaidong
|
1f85dc4681
|
配置
|
2023-09-05 23:42:01 +08:00 |
|
xiekaidong
|
d003c8a551
|
bug修复
|
2023-09-04 16:51:34 +08:00 |
|
xiekaidong
|
3e06b26e1f
|
侧边栏
|
2023-09-04 16:48:15 +08:00 |
|
xiekaidong
|
0cdb8515ca
|
侧边栏
|
2023-09-04 16:06:42 +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 |
|
xiekaidong
|
211d7cc71e
|
boss_rush
|
2023-08-30 19:11:38 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
4d5c23a6b6
|
容错
|
2023-08-24 14:30:39 +08:00 |
|
xiekaidong
|
b2a829741b
|
界面调整
|
2023-08-23 17:35:27 +08:00 |
|
Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
xiekaidong
|
57682466f6
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:20 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
xiekaidong
|
b5fb7a7e28
|
英雄基金
|
2023-08-18 14:39:01 +08:00 |
|
Fang
|
e85bf4888d
|
优化夏日活动请求
|
2023-08-17 12:06:56 +08:00 |
|
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 |
|