xiekaidong
|
0c8724a03d
|
bug修复
|
2023-09-20 10:19:02 +08:00 |
|
xiekaidong
|
44356ebb52
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:51:40 +08:00 |
|
xiekaidong
|
10e4e1ffc6
|
音效
|
2023-09-18 16:38:13 +08:00 |
|
xiekaidong
|
c9d73ceaf6
|
优化显示
|
2023-09-18 11:40:42 +08:00 |
|
xiekaidong
|
b60db0e3ef
|
结算界面的表现
|
2023-09-16 20:07:15 +08:00 |
|
xiekaidong
|
2038237e6c
|
界面优化
|
2023-09-16 18:45:50 +08:00 |
|
xiekaidong
|
fd24935c4b
|
优化
|
2023-09-16 18:13:25 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
xiekaidong
|
b20644f4cb
|
显示bug修复
|
2023-09-12 20:26:49 +08:00 |
|
xiekaidong
|
dd62b41f00
|
修复bug
|
2023-09-12 19:46:37 +08:00 |
|
xiekaidong
|
1ef1f34c7a
|
战斗优化调整
|
2023-09-12 12:23:07 +08:00 |
|
xiekaidong
|
61b73d9c8f
|
zancun
|
2023-09-12 11:15:52 +08:00 |
|
xiekaidong
|
94d59731c8
|
Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/const.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/monster_dungeon_rune.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/proto/proto_msg_type.lua
|
2023-09-12 10:07:33 +08:00 |
|
xiekaidong
|
5544693612
|
符文副本
|
2023-09-12 10:07:16 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
Fang
|
874ecfd37b
|
添加容错
|
2023-09-08 10:01:36 +08:00 |
|
xiekaidong
|
f3d7d1c892
|
bug修复
|
2023-09-04 20:06:11 +08:00 |
|
xiekaidong
|
11f982bd04
|
主动结算
|
2023-09-04 17:14:35 +08:00 |
|
xiekaidong
|
d8aa8cce2c
|
bug修复
|
2023-09-04 16:54:44 +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 |
|
xiekaidong
|
fe245efaba
|
接入数据
|
2023-09-01 11:55:16 +08:00 |
|
xiekaidong
|
859bbd42b9
|
增加容错
|
2023-08-29 14:54:54 +08:00 |
|
Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
xiekaidong
|
7fdadd75b4
|
层级调整
|
2023-08-16 11:27:54 +08:00 |
|
xiekaidong
|
5d910f5ebc
|
容错和容错
|
2023-08-15 19:34:02 +08:00 |
|
Fang
|
eb566b7782
|
fix
|
2023-08-11 16:03:00 +08:00 |
|
xiekaidong
|
9c8b20f1fb
|
bug修复
|
2023-08-10 19:27:48 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +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
|
38cd167a9b
|
显示调整
|
2023-08-07 17:21:45 +08:00 |
|
xiekaidong
|
24d90bfd1c
|
战斗血条优化
|
2023-08-02 20:34:25 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
c21607c52e
|
回合数优化
|
2023-08-01 17:38:53 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
Fang
|
0d04b99d3e
|
显示fix
|
2023-07-24 21:39:18 +08:00 |
|
xiekaidong
|
0e2bb42a25
|
一些报错修复
|
2023-07-24 18:32:41 +08:00 |
|
xiekaidong
|
6bc0ce7738
|
添加一些容错
|
2023-07-24 17:04:40 +08:00 |
|
xiekaidong
|
ff21cd5b2b
|
界面调整
|
2023-07-21 16:15:25 +08:00 |
|
xiekaidong
|
026166478e
|
buff机制修改
|
2023-07-21 11:37:29 +08:00 |
|
xiekaidong
|
cd41579159
|
支线副本
|
2023-07-20 21:46:49 +08:00 |
|
xiekaidong
|
ef1b59db67
|
支线副本战斗中的任务
|
2023-07-20 20:41:17 +08:00 |
|
xiekaidong
|
2ffd6e88ba
|
装备副本
|
2023-07-19 20:16:17 +08:00 |
|
xiekaidong
|
8e17ed9850
|
技能显示bug修复
|
2023-07-07 18:00:02 +08:00 |
|
xiekaidong
|
b6171cef38
|
竞技场暂停界面可滑动
|
2023-07-07 11:43:53 +08:00 |
|
Fang
|
e580b332a9
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:04:22 +08:00 |
|
xiekaidong
|
8ee590a831
|
bug修复
|
2023-07-06 17:41:58 +08:00 |
|
Fang
|
47418bab2e
|
竞技场宝箱增加每日次数控制
|
2023-07-06 10:24:53 +08:00 |
|