296 Commits

Author SHA1 Message Date
zhl
60a708f82d 修正SkillMan无法找到loadData的bug 2020-12-03 20:21:10 +08:00
7558e992fa fix param err 2020-12-03 20:10:41 +08:00
12b1ed0160 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-03 19:59:02 +08:00
19d1dbb560 build new pet proto 2020-12-03 19:58:56 +08:00
zhl
fb7aa9fff6 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-03 19:51:18 +08:00
zhl
0f922bbf52 IMsg增加消息类型 2020-12-03 19:51:12 +08:00
b595957a5d get room object 2020-12-03 19:39:58 +08:00
zhl
61fe65bf5b 增加消息队列的粒子 2020-12-03 19:35:10 +08:00
zhl
b6b67d5d38 增加2个消息队列的定义 2020-12-03 19:31:09 +08:00
zhl
3b729fbd73 Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-03 19:22:45 +08:00
zhl
c9f9cb8dd4 增加下发随从信息的消息 2020-12-03 19:22:37 +08:00
19d9714cc4 resolve conflict 2020-12-03 19:06:35 +08:00
2c03bceda4 use card and add pet(not skill yet) 2020-12-03 19:05:03 +08:00
zhl
fc68018a32 选择英雄时增加校验 2020-12-03 15:19:48 +08:00
zhl
4ce55368de Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-03 14:57:32 +08:00
zhl
cb7b1cef6d 封装一些下发消息 2020-12-03 14:57:28 +08:00
15117135d7 update cfg json/ts 2020-12-03 13:43:40 +08:00
0a523df862 resolve confict 2020-12-03 13:23:07 +08:00
51d27a4612 a 2020-12-03 13:21:56 +08:00
zhl
b3fceda525 更新配表的字段名 2020-12-03 12:26:41 +08:00
zhl
12cfa01e29 解决冲突 2020-12-03 12:20:45 +08:00
zhl
fae218a6dc 合并代码 2020-12-03 11:55:44 +08:00
c25a0d5c1c add trigger interface 2020-12-03 11:54:05 +08:00
zhl
203182be0f 修改卡组生成逻辑 2020-12-03 11:42:30 +08:00
zhl
4b6e5bdcb2 过滤配置项中id为0的项 2020-12-03 09:53:59 +08:00
zhl
eb085651d0 完善配置的加载 2020-12-02 23:20:24 +08:00
2c72c2e0de add skill handler(not finish) 2020-12-02 21:16:19 +08:00
zhl
576f22786a card id改为number后, 修改对应的方法 2020-12-02 20:34:14 +08:00
zhl
1e49ef6def Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-02 20:07:45 +08:00
f7d83f8c0b add logic folder 2020-12-02 20:07:32 +08:00
zhl
d83cb61e62 fix conflicts 2020-12-02 20:06:32 +08:00
zhl
f2afa98f51 将OnJoinCommand中的魔法数字改为常量 2020-12-02 20:05:24 +08:00
c24bc2d6b2 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-02 20:04:35 +08:00
85c755577e add skill handler( not finish) 2020-12-02 20:04:24 +08:00
zhl
9b151143e3 检查能否出牌的时候, 如果是一张牌, 直接返回true 2020-12-02 19:31:00 +08:00
zhl
ebe958fde1 增加放弃吃牌的处理 2020-12-02 18:02:46 +08:00
zhl
9cec61b712 完善吃牌逻辑, player增加team 2020-12-02 17:02:39 +08:00
zhl
c3b189bbdf 修改出牌,吃牌规则, 增加一些注释 2020-12-02 16:23:27 +08:00
zhl
0483e1cb0b 增加吃牌逻辑 2020-12-02 14:27:19 +08:00
zhl
18c52f8e84 修正一些错误的路径 2020-12-02 11:17:34 +08:00
zhl
52b21444bf 修改整个游戏流程 2020-12-02 10:14:45 +08:00
zhl
3d6b3b24d8 增加配表 2020-12-01 17:02:01 +08:00
zhl
0a7146d200 player增加英雄id 2020-12-01 09:37:21 +08:00
zhl
d2f5fc8315 修改协议名 2020-11-30 15:58:18 +08:00
zhl
178d72efdd 修改mongodb的uri 2020-11-30 15:27:07 +08:00
zhl
215d09c776 project init 2020-11-30 14:45:21 +08:00