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
|
97cddfa125
|
复活buff
|
2023-08-08 15:27:21 +08:00 |
|
xiekaidong
|
8b2d0c6046
|
完善一下结算
|
2023-08-07 11:45:16 +08:00 |
|
xiekaidong
|
82823526d9
|
自愈、海洋护盾buff
|
2023-08-04 16:19:59 +08:00 |
|
xiekaidong
|
e954484a13
|
技能机制优化
|
2023-08-01 17:35:58 +08:00 |
|
xiekaidong
|
0e2bb42a25
|
一些报错修复
|
2023-07-24 18:32:41 +08:00 |
|
xiekaidong
|
026166478e
|
buff机制修改
|
2023-07-21 11:37:29 +08:00 |
|
Fang
|
015de6fc70
|
英雄升级显示、战斗报错fix
|
2023-07-20 21:23:02 +08:00 |
|
Fang
|
cc7feea039
|
review
|
2023-07-20 16:20:11 +08:00 |
|
xiekaidong
|
85f016086d
|
层数buff完善
|
2023-07-17 14:46:02 +08:00 |
|
xiekaidong
|
de16d711ec
|
层数护盾
|
2023-07-17 14:28:55 +08:00 |
|
xiekaidong
|
da664585a0
|
Merge branch 'master' into dev
# Conflicts:
# lua/app/module/battle/controller/battle_controller.lua
|
2023-07-07 17:17:01 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
xiekaidong
|
16c0fe7182
|
添加容错
|
2023-06-25 10:30:21 +08:00 |
|
xiekaidong
|
d9a6ccc527
|
bug修复
|
2023-06-20 16:28:51 +08:00 |
|
xiekaidong
|
f1b4a21ae6
|
免控
|
2023-06-19 11:55:10 +08:00 |
|
xiekaidong
|
9a620ae064
|
bug修复
|
2023-06-19 10:13:05 +08:00 |
|
xiekaidong
|
aa5f557c75
|
怪物经验可配置根据血量的分段经验
|
2023-06-16 18:42:41 +08:00 |
|
xiekaidong
|
027809a5bd
|
战斗支持血量换皮肤
|
2023-06-15 18:55:10 +08:00 |
|
xiekaidong
|
4cce3bb36b
|
buff显示修改
|
2023-06-15 14:17:48 +08:00 |
|
xiekaidong
|
5214dd8136
|
伤害数字重叠问题
|
2023-06-14 18:35:20 +08:00 |
|
xiekaidong
|
e664f4ab0a
|
连携提示
|
2023-06-14 18:20:57 +08:00 |
|
xiekaidong
|
e3b8eaa04c
|
显示buff
|
2023-06-14 15:34:21 +08:00 |
|
xiekaidong
|
6cf247d86d
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:21 +08:00 |
|
xiekaidong
|
e010700340
|
技能音效
|
2023-06-13 17:43:55 +08:00 |
|
xiekaidong
|
47ee292697
|
更改近身攻击距离
|
2023-06-12 10:09:42 +08:00 |
|
xiekaidong
|
0441e09d12
|
bug修复
|
2023-06-05 18:24:06 +08:00 |
|
xiekaidong
|
628da8aade
|
音效容错
|
2023-06-05 16:24:06 +08:00 |
|
xiekaidong
|
fd4b60dfd2
|
多段伤害音效
|
2023-06-02 20:22:54 +08:00 |
|
xiekaidong
|
dd86bf5283
|
战斗速度
|
2023-06-02 15:15:10 +08:00 |
|
xiekaidong
|
4c4ae980dc
|
bug修复
|
2023-05-31 18:06:16 +08:00 |
|
xiekaidong
|
12d73fc941
|
特效反转
|
2023-05-31 17:22:48 +08:00 |
|
xiekaidong
|
8c779f826c
|
bug修复
|
2023-05-31 16:04:46 +08:00 |
|
xiekaidong
|
8e8930230f
|
容错
|
2023-05-30 11:54:33 +08:00 |
|
陈希
|
bbc196035c
|
Merge branch 'fang/daily_challenge' into 'dev'
每日挑战
See merge request b6-client/b6-lua!1
|
2023-05-30 03:38:33 +00:00 |
|
xiekaidong
|
c3bcb35a33
|
没有战斗动作的技能
|
2023-05-30 11:29:59 +08:00 |
|
Fang
|
9b3a00e809
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/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
|
2023-05-30 10:35:05 +08:00 |
|
xiekaidong
|
09e8acb915
|
删除空余行
|
2023-05-29 21:00:24 +08:00 |
|
xiekaidong
|
fe6994625c
|
bug修复
|
2023-05-29 20:56:46 +08:00 |
|
xiekaidong
|
c50f92bbc0
|
bug修复
|
2023-05-29 20:21:05 +08:00 |
|
Fang
|
3880dfd3d2
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# lua/app/common/module_manager.lua
# lua/app/config/buff_daily_challenge.lua
# lua/app/config/chapter.lua
# lua/app/config/hero.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/global.lua
|
2023-05-29 18:24:33 +08:00 |
|
xiekaidong
|
550a51efa7
|
死亡时恢复战斗速度
|
2023-05-29 15:21:56 +08:00 |
|
xiekaidong
|
6f084d2c91
|
战斗死亡延迟
|
2023-05-29 09:45:36 +08:00 |
|
xiekaidong
|
fdd5ad08f5
|
反击bug修复
|
2023-05-26 21:36:08 +08:00 |
|
xiekaidong
|
35c56dda72
|
带有流血buff时死亡触发的被动机制
|
2023-05-26 21:22:00 +08:00 |
|
xiekaidong
|
2430e09f7e
|
bug修复
|
2023-05-26 20:03:33 +08:00 |
|
Fang
|
b57318f3a6
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:21 +08:00 |
|
xiekaidong
|
77a9039092
|
多段伤害的更改
|
2023-05-26 15:46:15 +08:00 |
|
xiekaidong
|
7a87210ae3
|
局内任务显示
|
2023-05-26 15:43:01 +08:00 |
|
xiekaidong
|
55983ad95a
|
构建一些任务需要的战斗数据
|
2023-05-26 15:42:35 +08:00 |
|