170 Commits

Author SHA1 Message Date
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +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
35c56dda72 带有流血buff时死亡触发的被动机制 2023-05-26 21:22:00 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
xiekaidong
db985c714c 相互反击的bug 2023-05-24 11:02:26 +08:00
xiekaidong
c5609f4867 新增的buff 2023-05-23 19:08:26 +08:00
xiekaidong
e5bcfa3f09 冰冻状态、昏睡状态 2023-05-23 18:35:08 +08:00
xiekaidong
637264f383 格挡动作表现、反击界面表现 2023-05-23 16:39:29 +08:00
xiekaidong
1e6e99de9a 伤害数字 2023-05-23 15:05:23 +08:00
chenxi
e85131f041 任务 2023-05-19 20:43:35 +08:00
xiekaidong
b8d7fa533d 战斗内部计数相关任务 2023-05-19 18:18:33 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00
xiekaidong
aae0f74648 新增消除类型 2023-05-19 10:51:48 +08:00
xiekaidong
0f8121fea1 增加触发机制 2023-05-18 22:07:35 +08:00
xiekaidong
82d95ee5fd 被动、buff触发时机 2023-05-18 20:43:10 +08:00
xiekaidong
170ddb3066 技能效果生效条件判定 2023-05-18 15:34:17 +08:00
xiekaidong
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
xiekaidong
91cd324e44 神灯 2023-05-16 20:39:21 +08:00
xiekaidong
4605282d53 障碍物 2023-05-16 19:13:08 +08:00
xiekaidong
5140ca0824 锁定buff 2023-05-15 11:03:35 +08:00
xiekaidong
fa0b4a354a Merge branch 'battle' into dev 2023-05-12 20:29:39 +08:00
xiekaidong
673bfccc40 增加一个技能 2023-05-12 14:44:01 +08:00
xiekaidong
39a2eee61a 格子类型的一些配置改为配置表控制 2023-05-12 11:43:49 +08:00
xiekaidong
af3fc811ff 技能机制修改 2023-05-12 10:55:40 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +08:00
xiekaidong
7a7bde728e 消灭随机1种颜色的棋子并回血技能机制 2023-05-11 17:21:53 +08:00
xiekaidong
bea9daf0bc 随机消灭x行列空闲元素技能机制 2023-05-11 16:57:39 +08:00
xiekaidong
5f7cca6351 打乱棋盘的技能机制 2023-05-11 15:31:06 +08:00
xiekaidong
9d70b5b8b1 随机消除x个技能元素 的技能机制 2023-05-11 15:17:42 +08:00
xiekaidong
5fc337e78b 改变棋盘所有元素的技能机制 2023-05-11 14:31:24 +08:00
xiekaidong
f89e3f1256 调整战斗节奏顺序 2023-05-11 09:59:10 +08:00
xiekaidong
af0c61130d 冻结buff 2023-05-10 20:53:06 +08:00
xiekaidong
b7dda49394 主动技能伤害增加 2023-05-10 15:17:30 +08:00
xiekaidong
1c6ff387fc 反击 2023-05-10 11:53:44 +08:00
xiekaidong
e6ee7b0093 先手buff 2023-05-10 10:10:58 +08:00
xiekaidong
c9558d872e 反伤 2023-05-09 20:39:00 +08:00
xiekaidong
fd44822cd7 不死buff 2023-05-09 20:05:37 +08:00
xiekaidong
199ff4a7a2 bug修复 2023-05-09 19:40:47 +08:00
xiekaidong
1f911a21a7 昏睡buff 2023-05-09 16:49:27 +08:00
xiekaidong
187a7ee6bd 灼烧、易伤、中毒、腐败、削弱、诅咒buff提交 2023-05-09 15:15:07 +08:00
xiekaidong
518aabb829 buff叠加机制和然烧buff 2023-05-08 16:31:44 +08:00
xiekaidong
07b11eea6f 节奏调整 2023-05-04 18:06:03 +08:00
xiekaidong
c0fea24029 技能回收最多3个 2023-04-27 17:43:27 +08:00
chenxi
fe39dbe13c 连击bug 2023-04-27 11:27:31 +08:00
chenxi
ecd18170cc combo表现 2023-04-26 21:35:24 +08:00
xiekaidong
6d4e23616d bug修复 2023-04-25 21:10:28 +08:00
xiekaidong
51f600d11c 增加一个生效对象 2023-04-25 18:12:37 +08:00
xiekaidong
99d6318442 bug修复 2023-04-25 17:50:41 +08:00
xiekaidong
09e85e9dba 棋盘技能 2023-04-25 09:56:03 +08:00