xiekaidong
|
2cf8e25ced
|
fix
|
2024-02-21 15:35:43 +08:00 |
|
xiekaidong
|
f2a8e2c8a4
|
竞技场bug修复
|
2023-11-10 10:36:43 +08:00 |
|
xiekaidong
|
a29a9606bf
|
锁定buff修复
|
2023-10-27 16:00:43 +08:00 |
|
xiekaidong
|
7c5a57323e
|
bug修复
|
2023-10-26 10:38:35 +08:00 |
|
xiekaidong
|
0d79e85452
|
容错
|
2023-09-22 09:58:21 +08:00 |
|
xiekaidong
|
a74b0d6f56
|
bug修复
|
2023-09-22 09:46:10 +08:00 |
|
xiekaidong
|
5112645d9d
|
试玩功能属性加成
|
2023-09-20 15:16:23 +08:00 |
|
xiekaidong
|
cbbccaaa63
|
bug修复
|
2023-09-20 11:27:26 +08:00 |
|
xiekaidong
|
2e6541445e
|
复活优化
|
2023-09-20 11:16:33 +08:00 |
|
xiekaidong
|
ca0762659b
|
优化体验
|
2023-09-20 10:56:29 +08:00 |
|
xiekaidong
|
37a3f3bf25
|
优化符文副本重生
|
2023-09-20 10:54:55 +08:00 |
|
xiekaidong
|
7dc298a2bb
|
符文副本复活处理
|
2023-09-20 10:47:30 +08:00 |
|
xiekaidong
|
44356ebb52
|
增加战斗前后上阵英雄参数，方便查询作弊
|
2023-09-19 10:51:40 +08:00 |
|
xiekaidong
|
0211dfe5d0
|
bug修复
|
2023-09-18 20:51:28 +08:00 |
|
xiekaidong
|
45174e1f9f
|
Merge branch 'master' into dev_20230919
|
2023-09-18 14:50:51 +08:00 |
|
xiekaidong
|
28c21af47e
|
bug修复
|
2023-09-18 09:37:43 +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 |
|
Fang
|
4c27243520
|
请求优化
|
2023-09-15 20:11:50 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
37f93d1cd1
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:29 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
xiekaidong
|
ed65ae452b
|
一些优化和审核模式处理
|
2023-09-13 14:55:52 +08:00 |
|
xiekaidong
|
394a7a37ae
|
优化
|
2023-09-13 09:43:32 +08:00 |
|
xiekaidong
|
24b8242de8
|
优化
|
2023-09-13 09:19:02 +08:00 |
|
xiekaidong
|
dd62b41f00
|
修复bug
|
2023-09-12 19:46:37 +08:00 |
|
xiekaidong
|
97cef0d41d
|
bug修复
|
2023-09-12 16:31:27 +08:00 |
|
xiekaidong
|
178de4c506
|
bug修复
|
2023-09-12 16:22:10 +08:00 |
|
陈希
|
0abdb166d2
|
Merge branch 'fang/runes' into 'dev_20230919'
符文功能
See merge request b6-client/b6-lua!15
|
2023-09-12 06:50:28 +00:00 |
|
xiekaidong
|
1687c7fcea
|
回合数提示
|
2023-09-12 14:34:46 +08:00 |
|
xiekaidong
|
1ef1f34c7a
|
战斗优化调整
|
2023-09-12 12:23:07 +08:00 |
|
xiekaidong
|
61b73d9c8f
|
zancun
|
2023-09-12 11:15:52 +08:00 |
|
xiekaidong
|
e151b5329e
|
优化
|
2023-09-12 10:49:44 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
b9b8a10cc4
|
bug修复
|
2023-09-12 10:24:02 +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
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
xiekaidong
|
b3af360cd3
|
buff修改
|
2023-09-11 10:49:18 +08:00 |
|
xiekaidong
|
b510c81e29
|
判定修复
|
2023-09-08 10:37:10 +08:00 |
|
xiekaidong
|
c0a3356cfd
|
符文副本主界面
|
2023-09-07 19:14:39 +08:00 |
|
xiekaidong
|
2266324f94
|
新增属性
|
2023-09-06 16:44:00 +08:00 |
|
xiekaidong
|
297dcded77
|
魅惑、免疫buff，被控状态下，技能cd不递减
|
2023-09-06 16:26:48 +08:00 |
|
xiekaidong
|
2c7ac4fac8
|
bug修复
|
2023-09-05 20:19:51 +08:00 |
|
xiekaidong
|
a0daa1e692
|
更新配置
|
2023-09-05 18:00:32 +08:00 |
|
xiekaidong
|
f839dc3b57
|
buff数值上线
|
2023-09-05 17:14:49 +08:00 |
|
xiekaidong
|
1e918f92f2
|
等级修改
|
2023-09-05 15:29:35 +08:00 |
|
xiekaidong
|
4718656cdb
|
经验
|
2023-09-04 16:45:19 +08:00 |
|
xiekaidong
|
4d79d3ea6c
|
最大等级
|
2023-09-04 16:43:07 +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 |
|