296 Commits

Author SHA1 Message Date
y.x
4c080c1141 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-08 12:08:08 +08:00
y.x
26bfd6a378 增加触发技能处理 2020-12-08 12:07:53 +08:00
zhl
1a3117a2ad 增加房间认证代码 2020-12-08 11:34:05 +08:00
zhl
3288cb74a0 吃牌后清除吃牌的定时 2020-12-07 20:52:19 +08:00
zhl
34a713a8ee 修正结算对阵错误的bug 2020-12-07 20:37:03 +08:00
zhl
47d5e01ac6 选择随从时,同时判断player和pos是否存在 2020-12-07 20:21:47 +08:00
zhl
cffd7f8db1 增加吃牌的超时设置 2020-12-07 20:17:27 +08:00
zhl
a8c44ea05a 增加出牌和吃牌的超时限制 2020-12-07 19:47:35 +08:00
zhl
04b3e87901 调整结算对战顺序 2020-12-07 17:41:43 +08:00
zhl
09480cd4c0 增加抽卡后超时自动出卡的设定 2020-12-07 17:36:07 +08:00
zhl
3e506bad45 玩家可看到自己牌的详情 2020-12-07 17:04:47 +08:00
zhl
10cb2a1362 删除无用代码 2020-12-07 16:43:34 +08:00
zhl
7f59ffe0a5 修改获取换卡数量限制的字段 2020-12-07 16:34:22 +08:00
zhl
a6ae526b56 换卡数量超过限制后, 返回错误提示 2020-12-07 16:32:14 +08:00
zhl
9a2c417f84 换卡增加超时限制 2020-12-07 16:26:09 +08:00
zhl
56feded001 初始化player时, pet state置为0 2020-12-07 15:25:56 +08:00
zhl
0bb7e45e56 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-07 14:35:16 +08:00
zhl
1febf4ee13 增加一些流程中对BattleHandler的回调 2020-12-07 14:33:46 +08:00
312537e47a Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-07 14:05:37 +08:00
fa74b0ec51 import tables 2020-12-07 14:05:32 +08:00
zhl
b130453718 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-07 14:01:45 +08:00
zhl
3319eefc15 修改轮空玩家的逻辑 2020-12-07 14:01:42 +08:00
y.x
05c53de3d9 接口处理(委婉) 2020-12-07 14:00:31 +08:00
y.x
7694c788c8 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-07 13:43:09 +08:00
y.x
2633d19724 condition handle(not finish) 2020-12-07 13:43:03 +08:00
zhl
7dc9f2ae99 修正游戏结束广播参数缺少的bug 2020-12-07 13:41:53 +08:00
zhl
626524eecf 增加游戏结束的广播 2020-12-07 13:25:34 +08:00
zhl
4c0aa66ca2 实现移除随从的方法 2020-12-07 13:21:59 +08:00
zhl
edc9d78a36 修正一些编译时的错误提示 2020-12-07 13:16:28 +08:00
zhl
2c3afe6e28 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-07 13:05:58 +08:00
zhl
83ae363332 pet增加state值, 用于区分该位置是否已有随从, player增加计数的字段 2020-12-07 13:05:54 +08:00
zhl
8ea45162cc 增加游戏中的结算消息 2020-12-07 12:46:14 +08:00
y.x
8d013767de usecard callback 2020-12-07 12:39:16 +08:00
y.x
a90a4ddccc Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-07 11:46:59 +08:00
y.x
0d245751ed skill msg add errorcode 2020-12-07 11:46:51 +08:00
zhl
05ef1d2111 修正吃牌时, 随从血量无法正确设置的bug 2020-12-07 11:27:42 +08:00
y.x
37b8c37918 send skill msgs 2020-12-07 11:03:34 +08:00
y.x
3e3b359e79 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-07 10:54:41 +08:00
zhl
7f982dc343 修正消息队列中数据结构定义错误 2020-12-07 10:54:07 +08:00
y.x
32827a6d7b Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-07 10:50:47 +08:00
y.x
8bf6e4ecca handle skill logic (not test) 2020-12-07 10:50:30 +08:00
zhl
5443d0a307 技能消息增加result字段 2020-12-07 10:49:33 +08:00
zhl
6c5336ba02 pet增加字段isHero, 用于区分普通pet和英雄pet 2020-12-07 09:51:59 +08:00
24b62f39dd fix: pet from pos 1 2020-12-04 21:36:45 +08:00
f3c619f162 fix player undefined 2020-12-04 21:25:12 +08:00
7ca339319f fix player undefined 2020-12-04 21:04:36 +08:00
a3fbd6002a Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 19:53:38 +08:00
5a808d92f8 use magic card 2020-12-04 19:53:33 +08:00
zhl
7f26c7b253 2 2020-12-04 19:48:13 +08:00
zhl
1db9931fcc 暂时移除结算代码 2020-12-04 19:47:39 +08:00