180 Commits

Author SHA1 Message Date
xiekaidong
4605282d53 障碍物 2023-05-16 19:13:08 +08:00
xiekaidong
5140ca0824 锁定buff 2023-05-15 11:03:35 +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
39a2eee61a 格子类型的一些配置改为配置表控制 2023-05-12 11:43:49 +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
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
530ea14776 禁锢buff 2023-05-10 16:51:45 +08:00
xiekaidong
1c6ff387fc 反击 2023-05-10 11:53:44 +08:00
xiekaidong
e6ee7b0093 先手buff 2023-05-10 10:10:58 +08:00
xiekaidong
fc39a3487d 修改战斗逻辑 2023-05-05 17:05:38 +08:00
xiekaidong
bee5e556bf 服务器列表 2023-05-05 16:17:13 +08:00
xiekaidong
f9f5587e0c 多指操作的bug修复 2023-04-28 09:57:11 +08:00
xiekaidong
165a4a3226 bug修复 2023-04-28 00:07:38 +08:00
xiekaidong
8ef8955972 棋盘死局 2023-04-27 20:15:25 +08:00
xiekaidong
c251d1c3cf 不冻结棋盘 2023-04-27 19:25:46 +08:00
xiekaidong
c01cc5c9db bug修复 2023-04-27 15:24:24 +08:00
chenxi
5f8c7e2295 combo 2023-04-26 20:47:02 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
chenxi
9b28cded0f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 14:17:11 +08:00
chenxi
54174019ee 技能加速 2023-04-26 14:17:08 +08:00
xiekaidong
e232a344cc 关闭一些特效,节省一下性能 2023-04-26 12:05:43 +08:00
xiekaidong
5a97438c08 怪物丢棋盘技能的动画 2023-04-26 09:47:56 +08:00
xiekaidong
a6bf141658 技能选择界面改到战斗界面中 2023-04-25 23:27:19 +08:00
xiekaidong
d52d40d741 显示优化 2023-04-25 22:24:01 +08:00
chenxi
399cfbfe92 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 21:30:42 +08:00
chenxi
65db643867 防守方buff消除 2023-04-25 21:30:36 +08:00
xiekaidong
6d4e23616d bug修复 2023-04-25 21:10:28 +08:00
chenxi
cae53d753f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 19:51:54 +08:00
chenxi
4bf666b800 fix bug 2023-04-25 19:51:48 +08:00
xiekaidong
d71c41b40c bug修复 2023-04-25 18:46:24 +08:00
xiekaidong
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +08:00
xiekaidong
99d6318442 bug修复 2023-04-25 17:50:41 +08:00
xiekaidong
c1ed407a0f 显示修改 2023-04-25 15:49:24 +08:00
xiekaidong
9479a931f6 技能生成特效 2023-04-25 15:08:28 +08:00
xiekaidong
32c6f2824d 棋盘消除特效 2023-04-25 11:50:00 +08:00
xiekaidong
274552a558 bug修复 2023-04-24 21:46:16 +08:00
xiekaidong
6c9483b1aa 修复一些bug 2023-04-24 20:18:17 +08:00
xiekaidong
4bda42441f 死局问题修复 2023-04-24 19:29:07 +08:00
xiekaidong
bbcaeea573 bug修复 2023-04-24 18:08:15 +08:00