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 |
|
xiekaidong
|
fe245efaba
|
接入数据
|
2023-09-01 11:55:16 +08:00 |
|
xiekaidong
|
0498aaf75f
|
战斗波次加密
|
2023-09-01 10:41:55 +08:00 |
|
xiekaidong
|
b6b342c435
|
boss_rush战斗
|
2023-09-01 10:23:48 +08:00 |
|
xiekaidong
|
211d7cc71e
|
boss_rush
|
2023-08-30 19:11:38 +08:00 |
|
xiekaidong
|
594910154b
|
优化
|
2023-08-29 21:32:00 +08:00 |
|
xiekaidong
|
8b47e90f54
|
bug修复
|
2023-08-29 21:03:39 +08:00 |
|
xiekaidong
|
eb73910628
|
Merge branch 'master' into dev_20230829
|
2023-08-29 16:02:05 +08:00 |
|
xiekaidong
|
20eb5d0a41
|
bug修复
|
2023-08-28 19:15:27 +08:00 |
|
xiekaidong
|
33673c2f17
|
逻辑调整
|
2023-08-28 19:11:47 +08:00 |
|
xiekaidong
|
a24e64ba74
|
调整一下填充和格子效果的逻辑顺序
|
2023-08-28 14:50:14 +08:00 |
|
xiekaidong
|
d05cec484a
|
bug修复
|
2023-08-28 11:11:04 +08:00 |
|
xiekaidong
|
381a4477bd
|
bug修复
|
2023-08-21 11:22:31 +08:00 |
|
xiekaidong
|
0549a8b37b
|
bug修复
|
2023-08-21 10:33:14 +08:00 |
|
xiekaidong
|
08553687ae
|
Merge branch 'master' into dev_20230829
# Conflicts:
# lua/app/common/event_manager.lua
|
2023-08-21 09:48:11 +08:00 |
|
xiekaidong
|
1bb5bb0fb3
|
诅咒回血被腐败影响
|
2023-08-18 18:55:46 +08:00 |
|
xiekaidong
|
8ad104e38d
|
选技能buf修复
|
2023-08-18 11:44:57 +08:00 |
|
xiekaidong
|
eeeadeace0
|
复活判定逻辑
|
2023-08-15 17:32:54 +08:00 |
|
xiekaidong
|
aff0c425bf
|
背景特效
|
2023-08-15 14:59:15 +08:00 |
|
xiekaidong
|
27388b3238
|
bug修复
|
2023-08-15 11:51:36 +08:00 |
|
xiekaidong
|
75be639da9
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/module/battle/controller/battle_base_controller.lua
|
2023-08-15 09:36:53 +08:00 |
|
xiekaidong
|
9249ee3210
|
重生处理
|
2023-08-14 16:27:52 +08:00 |
|
xiekaidong
|
b99ec64aa0
|
删除打印
|
2023-08-14 14:11:24 +08:00 |
|
xiekaidong
|
c94018809f
|
一个容错
|
2023-08-14 11:15:21 +08:00 |
|
Fang
|
69790fd563
|
新加颜色生命值加成
|
2023-08-11 18:15:27 +08:00 |
|
xiekaidong
|
de16254cb0
|
bug修复
|
2023-08-11 17:50:15 +08:00 |
|