408 Commits

Author SHA1 Message Date
xiekaidong
cbba15794a 增加一下受击动画容错 2023-05-25 10:37:49 +08:00
xiekaidong
f7a4a0fe31 表现bug修复 2023-05-24 12:07:20 +08:00
xiekaidong
db985c714c 相互反击的bug 2023-05-24 11:02:26 +08:00
xiekaidong
bff772a1de 技能刷新接入联网 2023-05-24 10:01:36 +08:00
xiekaidong
715408f15f 反击表现 2023-05-23 20:09:09 +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
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
3f747de9aa boss的buff自动提示 2023-05-22 17:23:36 +08:00
xiekaidong
8ae7df28e2 通用技能tips 2023-05-22 16:38:04 +08:00
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