396 Commits

Author SHA1 Message Date
xiekaidong
2959b8db73 弹窗 2023-05-22 10:24:45 +08:00
xiekaidong
fd2c150b19 bug修复 2023-05-19 21:44:36 +08:00
xiekaidong
d4d1249f09 bug修复 2023-05-19 21:37:56 +08:00
xiekaidong
d2eff9d230 随机位置 2023-05-19 20:59:18 +08:00
xiekaidong
4708ed1ae2 随机 2023-05-19 20:55:41 +08:00
xiekaidong
9067a7ffa1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-19 20:44:41 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +08:00
chenxi
e85131f041 任务 2023-05-19 20:43:35 +08:00
xiekaidong
1fcf0137e3 死局问题修改 2023-05-19 20:09:32 +08:00
xiekaidong
b8d7fa533d 战斗内部计数相关任务 2023-05-19 18:18:33 +08:00
xiekaidong
f6d5546d2b 战斗任务数据 2023-05-19 18:00:03 +08:00
xiekaidong
d1fe14d396 删除打印 2023-05-19 16:31:26 +08:00
xiekaidong
ff56360efa 技能机制 2023-05-19 16:27:54 +08:00
xiekaidong
8316e48633 随机技能机制 2023-05-19 15:15:02 +08:00
xiekaidong
aae0f74648 新增消除类型 2023-05-19 10:51:48 +08:00
xiekaidong
91680e5c9a 被动触发时机 2023-05-19 10:00:14 +08:00
xiekaidong
0f8121fea1 增加触发机制 2023-05-18 22:07:35 +08:00
xiekaidong
ccea5fedfa 技能生效条件 2023-05-18 21:20:10 +08:00
xiekaidong
82d95ee5fd 被动、buff触发时机 2023-05-18 20:43:10 +08:00
xiekaidong
170ddb3066 技能效果生效条件判定 2023-05-18 15:34:17 +08:00
xiekaidong
15c315cbed 技能修改 2023-05-18 11:18:51 +08:00
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
xiekaidong
2023930d62 宝箱 2023-05-17 19:19:24 +08:00
xiekaidong
ad0ab2b8ba 宝箱 2023-05-17 18:17:09 +08:00
xiekaidong
97e5506ab2 神灯障碍物 2023-05-16 21:22:52 +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
2775d669ba bug修复 2023-05-12 20:29:30 +08:00
xiekaidong
5f4b142a3f 锁定格子 2023-05-12 19:56:35 +08:00
xiekaidong
9bf1f41725 修改消除逻辑,方便以后扩展 2023-05-12 17:03:14 +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
chenxi
b1ca8106a9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/act_chapter_store.lua.meta
#	lua/app/config/act_gift.lua
#	lua/app/config/act_growup_gift.lua.meta
#	lua/app/config/act_level_fund.lua.meta
#	lua/app/config/act_sevenday_quest.lua
#	lua/app/config/act_sevenday_quest.lua.meta
#	lua/app/config/act_sevenday_quest_reward.lua.meta
#	lua/app/config/buff.lua
#	lua/app/config/player_exp.lua.meta
#	lua/app/config/strings/cn/task.lua.meta
#	lua/app/config/strings/de/task.lua.meta
#	lua/app/config/strings/en/task.lua.meta
#	lua/app/config/strings/fr/task.lua.meta
#	lua/app/config/strings/ja/task.lua.meta
#	lua/app/config/strings/ko/task.lua.meta
#	lua/app/config/strings/zh/task.lua.meta
2023-05-11 21:34:45 +08:00
xiekaidong
4bf948f670 表现修改一下 2023-05-11 20:14:59 +08:00
chenxi
09e3d41928 任务 2023-05-11 20:05:50 +08:00
xiekaidong
240517e04e 调整一下队伍死亡判定逻辑 2023-05-11 19:17:29 +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
d9bf3ee52b 修改影响棋盘的技能的逻辑 2023-05-11 11:22:46 +08:00
xiekaidong
f89e3f1256 调整战斗节奏顺序 2023-05-11 09:59:10 +08:00
xiekaidong
9a9d4447ac 禁锢 2023-05-10 21:04:30 +08:00
xiekaidong
af0c61130d 冻结buff 2023-05-10 20:53:06 +08:00
xiekaidong
530ea14776 禁锢buff 2023-05-10 16:51:45 +08:00