816 Commits

Author SHA1 Message Date
zhl
a836f6f1c6 修正开局第一轮抽卡, playerid设置错误的问题 2020-12-04 15:23:42 +08:00
zhl
6cce9c9688 规范抽卡的下发消息 2020-12-04 15:13:24 +08:00
zhl
ed8f89322e Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-04 14:40:29 +08:00
zhl
127a746b4a 增加几个抽卡相关的方法 2020-12-04 14:40:23 +08:00
b895e8c1c8 import tables 2020-12-04 12:43:11 +08:00
0ec693481d Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 12:42:55 +08:00
zhl
d15c07eadc 增加施法的消息 2020-12-04 12:06:13 +08:00
2c91b7d2a4 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-04 10:55:25 +08:00
zhl
570eb8a214 增加vscode本地启动debug的脚本 2020-12-04 10:18:36 +08:00
zhl
1f1a942eba 修正生成卡组某些卡无法匹配效果卡的bug, 增加vscode的launch配置 2020-12-04 10:07:25 +08:00
f4e36bfb72 Merge branch 'master' of http://git.kingsome.cn/node/card_svr 2020-12-03 21:16:35 +08:00
1c0ecf6c4b add gettarget func 2020-12-03 21:16:22 +08:00
zhl
6f9082c3b2 更新useCard参数 2020-12-03 21:11:10 +08:00
zhl
f4ca2d46c2 修正生成卡组失败的bug 2020-12-03 21:10:45 +08:00
zhl
79f827166e Merge branch 'master' of git.kingsome.cn:node/card_svr 2020-12-03 21:08:33 +08:00
zhl
744d0df50b 跑通下随从流程 2020-12-03 21:08:26 +08:00
f3da8a4c8e add dbpointcard param 2020-12-03 20:45:44 +08:00
a0bb8267b6 resolved conflict 2020-12-03 20:43:13 +08:00
7bcf1b67c2 add check interface 2020-12-03 20:39:31 +08:00
zhl
583aa8b61c 选卡后调用skill处理逻辑 2020-12-03 20:31:52 +08:00
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