375 Commits

Author SHA1 Message Date
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
a864b53830 Merge branch 'dev' into battle_buff
# Conflicts:
#	lua/app/config/act_gift.lua
#	lua/app/config/act_gift.lua.meta
#	lua/app/config/bounty_level.lua.meta
#	lua/app/config/bounty_time.lua.meta
#	lua/app/config/buff.lua
#	lua/app/config/task.lua.meta
#	lua/app/config/task_daily.lua.meta
2023-05-10 21:11:51 +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
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
chenxi
df3a225ebd 任务 2023-05-09 17:41:27 +08:00
xiekaidong
1f911a21a7 昏睡buff 2023-05-09 16:49:27 +08:00
xiekaidong
607d9d9d65 流血buff 2023-05-09 15:47:38 +08:00
xiekaidong
187a7ee6bd 灼烧、易伤、中毒、腐败、削弱、诅咒buff提交 2023-05-09 15:15:07 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
chenxi
d930b3ded7 设置 2023-05-08 21:45:28 +08:00
xiekaidong
518aabb829 buff叠加机制和然烧buff 2023-05-08 16:31:44 +08:00
chenxi
eb1d1b9fbf 联网 2023-05-08 14:39:11 +08:00
chenxi
1a117affae Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-08 11:38:53 +08:00
chenxi
d0687f7d37 数据 2023-05-08 11:35:35 +08:00
xiekaidong
925c8ffdea gm命令 2023-05-08 11:17:18 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
xiekaidong
cb0e613e47 Merge branch 'dev' into net 2023-05-08 09:48:06 +08:00
xiekaidong
55ec0dd76c 联网 2023-05-08 09:47:58 +08:00
chenxi
04e6bdcfda 主城侧边栏 2023-05-06 11:34:41 +08:00
xiekaidong
2c341db47c 关卡修改 2023-05-06 10:37:02 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +08:00
chenxi
5e50f54e74 log使用不正确 2023-05-05 20:13:25 +08:00
xiekaidong
8801943ae3 整理一下代码,接入联网 2023-05-05 18:27:33 +08:00
xiekaidong
fc39a3487d 修改战斗逻辑 2023-05-05 17:05:38 +08:00
xiekaidong
e31bdec852 接入登录,但是暂时不接入数据 2023-05-05 16:37:12 +08:00
xiekaidong
476333add6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-05 16:17:16 +08:00
xiekaidong
bee5e556bf 服务器列表 2023-05-05 16:17:13 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
d3b033ecd7 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-05 11:57:43 +08:00
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
xiekaidong
7de12f99e5 搬运一下b5的网络模块 2023-05-05 10:42:56 +08:00
chenxi
d37872ad7b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-05 10:32:54 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
xiekaidong
07b11eea6f 节奏调整 2023-05-04 18:06:03 +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
dfdd798a0a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 20:15:28 +08:00
xiekaidong
8ef8955972 棋盘死局 2023-04-27 20:15:25 +08:00
chenxi
e45900ee6f 删除不用的代码 2023-04-27 20:06:36 +08:00