ulith/webxoss-fixed
1
0
Fork 0
forked from mirrors/webxoss-core
Code Activity

add MX14 Mayu's room && update client

Browse source
This commit is contained in:
WEBXOSS 2016-12-03 00:57:06 +08:00
parent 18cb7eede6
commit 8f29352fec
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CardInfo.js
View file

@ -399,7 +399,7 @@ var CardInfo = {
cid: 6, cid: 6,
"timestamp": 1419092135495, "timestamp": 1419092135495,
"wxid": "WX01-006", "wxid": "WX01-006",
name: "四式戦帝女　緑姫　", name: "四式戦帝女　緑姫",
name_zh_CN: "四式战帝女 绿姬", name_zh_CN: "四式战帝女 绿姬",
name_en: "Midoriko, War Empress Type Four", name_en: "Midoriko, War Empress Type Four",
"kana": "シシキセンテイジョミドリコ", "kana": "シシキセンテイジョミドリコ",
@ -1184,7 +1184,7 @@ var CardInfo = {
cid: 20, cid: 20,
"timestamp": 1419092349369, "timestamp": 1419092349369,
"wxid": "WX01-020", "wxid": "WX01-020",
name: "三型雌々娘　緑姫　", name: "三型雌々娘　緑姫",
name_zh_CN: "三型雌雌娘 绿姬", name_zh_CN: "三型雌雌娘 绿姬",
name_en: "Midoriko, Feminine Girl Type Three", name_en: "Midoriko, Feminine Girl Type Three",
"kana": "サンガタシシキミドリコ", "kana": "サンガタシシキミドリコ",
@ -1234,7 +1234,7 @@ var CardInfo = {
cid: 21, cid: 21,
"timestamp": 1419092399126, "timestamp": 1419092399126,
"wxid": "WX01-021", "wxid": "WX01-021",
name: "二型闘婚娘　緑姫　", name: "二型闘婚娘　緑姫",
name_zh_CN: "二型斗婚娘 绿姬", name_zh_CN: "二型斗婚娘 绿姬",
name_en: "Midoriko, Bridal Combat Girl Type Two", name_en: "Midoriko, Bridal Combat Girl Type Two",
"kana": "ニガタトウコンキミドリコ", "kana": "ニガタトウコンキミドリコ",
@ -1288,7 +1288,7 @@ var CardInfo = {
cid: 22, cid: 22,
"timestamp": 1419092404829, "timestamp": 1419092404829,
"wxid": "WX01-022", "wxid": "WX01-022",
name: "一型舞闘娘　緑姫　", name: "一型舞闘娘　緑姫",
name_zh_CN: "一型舞斗娘 绿姬", name_zh_CN: "一型舞斗娘 绿姬",
name_en: "Midoriko, Dancing Combat Girl Type One", name_en: "Midoriko, Dancing Combat Girl Type One",
"kana": "イチガタブトウキミドリコ", "kana": "イチガタブトウキミドリコ",

11
Game.js
View file

@ -155,6 +155,14 @@ Game.checkMayusRoom = function (infos) {
})) { })) {
return false; return false;
} }
// 禁止 台风蛇
if (infos.some(function (info) {
return info.cid === 957; // 台風一過
}) && infos.some(function (info) {
return (info.cid === 1652); // コードアンシエンツ　ヘルボロス
})) {
return false;
}
// 限制 // 限制
var limitMap = { var limitMap = {
37: 2, // <忘得ぬ幻想　ヴァルキリー> 37: 2, // <忘得ぬ幻想　ヴァルキリー>
@ -164,6 +172,9 @@ Game.checkMayusRoom = function (infos) {
689: 1, // <ＲＡＩＮＹ> 689: 1, // <ＲＡＩＮＹ>
474: 0, // <ノー・ゲイン> 474: 0, // <ノー・ゲイン>
23: 0, // <大器晩成> 23: 0, // <大器晩成>
689: 0, // <ＲＡＩＮＹ>
1030: 0, // <四面楚火>
1457: 0, // <サーバント　Ｚ>
}; };
for (var i = 0; i < infos.length; i++) { for (var i = 0; i < infos.length; i++) {
var info = infos[i]; var info = infos[i];

2
webxoss-client

@ -1 +1 @@
Subproject commit 58f32b7d820097eae66cb082879173be4bcab094 Subproject commit 1ab691f0fd5a38994546966e99c01e8bdaed4ded