816 Commits

Author SHA1 Message Date
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
zhl
f94e391510 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-04 19:41:52 +08:00
zhl
a548509405 增加结算的部分代码 2020-12-04 19:41:49 +08:00
87f0b24ff6 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 19:40:04 +08:00
8927efab0a add dsttype limit 2020-12-04 19:39:59 +08:00
zhl
21ad172aa8 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-04 18:27:41 +08:00
f97fe76644 import tables 2020-12-04 18:27:27 +08:00
zhl
d9c9590712 修正下发随从的时, 无法获取随从的bug 2020-12-04 18:15:05 +08:00
fe533f72e6 import table 2020-12-04 18:13:36 +08:00
f32117aa05 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 18:06:27 +08:00
b670832ca6 skill logic, playerid 2020-12-04 18:06:22 +08:00
zhl
315499b6b1 根据配表,设置英雄unit 2020-12-04 17:43:17 +08:00
zhl
7740507c3c Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-04 17:19:35 +08:00
zhl
69b271f610 移除英雄的ap 2020-12-04 17:19:29 +08:00
4d4169c32d add player to petinfomsg 2020-12-04 17:18:43 +08:00
1008d2aa07 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 17:16:19 +08:00
427e9746d6 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 17:15:38 +08:00
33d2195e76 a 2020-12-04 17:15:33 +08:00
zhl
3af415b0f5 更新pet的数据结构 2020-12-04 17:14:46 +08:00
zhl
5d322627c5 下发随从的信息增加player 2020-12-04 17:00:04 +08:00
zhl
13041f4f41 bug fix 2020-12-04 16:54:45 +08:00
zhl
1ad636dfeb Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-04 16:51:43 +08:00
zhl
69c364c0f9 player增加id 2020-12-04 16:51:38 +08:00
a5e03f2bf4 add pos 2020-12-04 16:45:32 +08:00
e57a452e26 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 16:42:42 +08:00
72ed627263 handle card end, but no test 2020-12-04 16:42:34 +08:00
zhl
43c60b415b petinfo增加pos 2020-12-04 16:39:32 +08:00
zhl
5f7990ed8c 完善下随从逻辑 2020-12-04 16:25:50 +08:00
2f223351cc Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 15:45:31 +08:00
99497bf4e4 handle card... 2020-12-04 15:45:25 +08:00
zhl
78298aebe2 将抽卡消息改为统一的方法 2020-12-04 15:36:55 +08:00