Commit b63b4dbd authored by xiaoye's avatar xiaoye

fix

parent d76858d3
Pipeline #41617 passed with stages
in 1 minute and 29 seconds
...@@ -30,3 +30,4 @@ yarn-error.log* ...@@ -30,3 +30,4 @@ yarn-error.log*
*.module.scss.d.ts *.module.scss.d.ts
*.yrp3d *.yrp3d
build.sh
[submodule "neos-protobuf"] [submodule "neos-protobuf"]
path = neos-protobuf path = neos-protobuf
url = https://code.mycard.moe/mycard/neos-protobuf.git url = https://code.moenext.com/mycard/neos-protobuf.git
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
"name": "408", "name": "408",
"ip": "koishi.momobako.com", "ip": "koishi.momobako.com",
"port": "1408" "port": "1408"
},
{
"name": "xiao",
"ip": "ygopro.jwyxym.top",
"port": "50003"
} }
], ],
"assetsPath": "/neos-assets", "assetsPath": "/neos-assets",
......
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
"name": "408", "name": "408",
"ip": "koishi.momobako.com", "ip": "koishi.momobako.com",
"port": "1408" "port": "1408"
},
{
"name": "xiao",
"ip": "ygopro.jwyxym.top",
"port": "50003"
} }
], ],
"assetsPath": "/neos-assets", "assetsPath": "/neos-assets",
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
"vite": "^4.4.9", "vite": "^4.4.9",
"vite-plugin-arraybuffer": "^0.0.6", "vite-plugin-arraybuffer": "^0.0.6",
"vite-plugin-sass-dts": "^1.3.9", "vite-plugin-sass-dts": "^1.3.9",
"vite-plugin-wasm-pack": "^0.1.12",
"vite-tsconfig-paths": "^4.2.0", "vite-tsconfig-paths": "^4.2.0",
"vite-ydk-loader": "^0.0.2" "vite-ydk-loader": "^0.0.2"
} }
...@@ -3844,20 +3843,6 @@ ...@@ -3844,20 +3843,6 @@
"is-callable": "^1.1.3" "is-callable": "^1.1.3"
} }
}, },
"node_modules/fs-extra": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
"universalify": "^2.0.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/fs.realpath": { "node_modules/fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
...@@ -4714,18 +4699,6 @@ ...@@ -4714,18 +4699,6 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/jsonfile": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
"dev": true,
"dependencies": {
"universalify": "^2.0.0"
},
"optionalDependencies": {
"graceful-fs": "^4.1.6"
}
},
"node_modules/levn": { "node_modules/levn": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
...@@ -4882,12 +4855,6 @@ ...@@ -4882,12 +4855,6 @@
"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
} }
}, },
"node_modules/narrowing": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/narrowing/-/narrowing-1.5.0.tgz",
"integrity": "sha512-DUu4XdKgkfAPTAL28k79pdnshDE2W5T24QAnidSPo2F/W1TX6CjNzmEeXQfE5O1lxQvC0GYI6ZRDsLcyzugEYA==",
"dev": true
},
"node_modules/natural-compare": { "node_modules/natural-compare": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
...@@ -6975,15 +6942,6 @@ ...@@ -6975,15 +6942,6 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
"dev": true,
"engines": {
"node": ">= 10.0.0"
}
},
"node_modules/untildify": { "node_modules/untildify": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
...@@ -7179,17 +7137,6 @@ ...@@ -7179,17 +7137,6 @@
"vite": "^2.6.0 || 3 || 4" "vite": "^2.6.0 || 3 || 4"
} }
}, },
"node_modules/vite-plugin-wasm-pack": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/vite-plugin-wasm-pack/-/vite-plugin-wasm-pack-0.1.12.tgz",
"integrity": "sha512-WliYvQp9HXluir4OKGbngkcKxtYtifU11cqLurRRJGsl770Sjr1iIkp5RuvU3IC1poT4A57Z2/YgAKI2Skm7ZA==",
"dev": true,
"dependencies": {
"chalk": "^4.1.2",
"fs-extra": "^10.0.0",
"narrowing": "^1.4.0"
}
},
"node_modules/vite-tsconfig-paths": { "node_modules/vite-tsconfig-paths": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz", "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz",
...@@ -9907,17 +9854,6 @@ ...@@ -9907,17 +9854,6 @@
"is-callable": "^1.1.3" "is-callable": "^1.1.3"
} }
}, },
"fs-extra": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
"dev": true,
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
"universalify": "^2.0.0"
}
},
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
...@@ -10512,16 +10448,6 @@ ...@@ -10512,16 +10448,6 @@
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
}, },
"jsonfile": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.6",
"universalify": "^2.0.0"
}
},
"levn": { "levn": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
...@@ -10636,12 +10562,6 @@ ...@@ -10636,12 +10562,6 @@
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
"integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
}, },
"narrowing": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/narrowing/-/narrowing-1.5.0.tgz",
"integrity": "sha512-DUu4XdKgkfAPTAL28k79pdnshDE2W5T24QAnidSPo2F/W1TX6CjNzmEeXQfE5O1lxQvC0GYI6ZRDsLcyzugEYA==",
"dev": true
},
"natural-compare": { "natural-compare": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
...@@ -12074,12 +11994,6 @@ ...@@ -12074,12 +11994,6 @@
"which-boxed-primitive": "^1.0.2" "which-boxed-primitive": "^1.0.2"
} }
}, },
"universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
"dev": true
},
"untildify": { "untildify": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
...@@ -12166,17 +12080,6 @@ ...@@ -12166,17 +12080,6 @@
"@svgr/plugin-jsx": "^7.0.0" "@svgr/plugin-jsx": "^7.0.0"
} }
}, },
"vite-plugin-wasm-pack": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/vite-plugin-wasm-pack/-/vite-plugin-wasm-pack-0.1.12.tgz",
"integrity": "sha512-WliYvQp9HXluir4OKGbngkcKxtYtifU11cqLurRRJGsl770Sjr1iIkp5RuvU3IC1poT4A57Z2/YgAKI2Skm7ZA==",
"dev": true,
"requires": {
"chalk": "^4.1.2",
"fs-extra": "^10.0.0",
"narrowing": "^1.4.0"
}
},
"vite-tsconfig-paths": { "vite-tsconfig-paths": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz", "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"MCSpectatorListTitle": "MC观战列表", "MCSpectatorListTitle": "MC观战列表",
"MCSpectatorListDesc": "观看萌卡MyCard上正在进行的决斗", "MCSpectatorListDesc": "观看萌卡MyCard上正在进行的决斗",
"SinglePlayerModeTitle": "单人模式", "SinglePlayerModeTitle": "单人模式",
"SinglePlayerModeDesc": "在Koishi 7210服务器上开启一场与AI的决斗,验证自己的卡组,或者只是打发时间。", "SinglePlayerModeDesc": "在宵服上开启一场与AI的决斗,验证自己的卡组,或者只是打发时间。",
"CustomRoomTitle": "自定义房间", "CustomRoomTitle": "自定义房间",
"CustomRoomDesc": "创建自定义规则的房间,与好友约战。", "CustomRoomDesc": "创建自定义规则的房间,与好友约战。",
"ReplayTitle": "录像回放", "ReplayTitle": "录像回放",
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
"KoishiServer": "Koishi服", "KoishiServer": "Koishi服",
"UltraPreemptiveServer": "超先行服", "UltraPreemptiveServer": "超先行服",
"408": "408环境", "408": "408环境",
"xiao": "宵服",
"PlayerNickname": "玩家昵称", "PlayerNickname": "玩家昵称",
"RoomPasswordOptional": "房间密码(可选)", "RoomPasswordOptional": "房间密码(可选)",
"JoinRoom": "加入房间", "JoinRoom": "加入房间",
......
...@@ -19,6 +19,7 @@ const serverConfig = NeosConfig.servers; ...@@ -19,6 +19,7 @@ const serverConfig = NeosConfig.servers;
const KOISHI_INDEX = 0; const KOISHI_INDEX = 0;
const PRERELEASE_INDEX = 3; const PRERELEASE_INDEX = 3;
const ENV_408 = 4; const ENV_408 = 4;
const XIAO = 5;
const { const {
defaults: { defaultPlayer, defaultPassword }, defaults: { defaultPlayer, defaultPassword },
...@@ -42,7 +43,7 @@ export const MatchModal: React.FC = ({}) => { ...@@ -42,7 +43,7 @@ export const MatchModal: React.FC = ({}) => {
const { joined, errorMsg } = useSnapshot(roomStore); const { joined, errorMsg } = useSnapshot(roomStore);
const [player, setPlayer] = useState(user?.name ?? defaultPlayer); const [player, setPlayer] = useState(user?.name ?? defaultPlayer);
const [passwd, setPasswd] = useState(defaultPassword); const [passwd, setPasswd] = useState(defaultPassword);
const [serverId, setServerId] = useState(0); const [serverId, setServerId] = useState(5);
const [confirmLoading, setConfirmLoading] = useState(false); const [confirmLoading, setConfirmLoading] = useState(false);
const navigate = useNavigate(); const navigate = useNavigate();
const { t: i18n } = useTranslation("MatchModal"); const { t: i18n } = useTranslation("MatchModal");
...@@ -133,6 +134,10 @@ export const MatchModal: React.FC = ({}) => { ...@@ -133,6 +134,10 @@ export const MatchModal: React.FC = ({}) => {
value: ENV_408, value: ENV_408,
label: i18n("408"), label: i18n("408"),
}, },
{
value: XIAO,
label: i18n("xiao"),
},
]} ]}
onChange={handleServerChange} onChange={handleServerChange}
/> />
......
...@@ -45,7 +45,7 @@ export const loader: LoaderFunction = () => { ...@@ -45,7 +45,7 @@ export const loader: LoaderFunction = () => {
export const Component: React.FC = () => { export const Component: React.FC = () => {
const { message, modal } = App.useApp(); const { message, modal } = App.useApp();
const server = `${serverList[0].ip}:${serverList[0].port}`; const server = `${serverList[5].ip}:${serverList[5].port}`;
const { decks } = deckStore; const { decks } = deckStore;
const [deckName, setDeckName] = useState(decks.at(0)?.deckName ?? ""); const [deckName, setDeckName] = useState(decks.at(0)?.deckName ?? "");
const user = accountStore.user; const user = accountStore.user;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment