Skip to content

N
Neos
Commit 2017af9b authored by Chunchi Che's avatar Chunchi Che
Browse files
Options

Revert "add env 408 cdb" 

This reverts commit 2264b8a3.
parent a7d6c103
Show whitespace changes
Inline Side-by-side
Showing with 280 additions and 295 deletions
neos.config.json
View file @ 2017af9b
{
"version": 4961,
"servers": [{
"servers": [
{
"name": "koishi",
"ip": "koishi.momobako.com",
"port": "7211"
......@@ -19,16 +20,29 @@
"name": "pre-release",
"ip": "koishi.momobako.com",
"port": "889"
},
{
"name": "408",
"ip": "koishi.momobako.com",
"port": "1408"
}
],
"assetsPath": "/neos-assets",
"releaseImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"preReleaseImgUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
"releaseDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"preReleaseDbUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
"preReleaseConfig": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json",
"releaseResource": {
"img": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"cdb": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"lflist": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf"
},
"preReleaseResource": {
"img": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
"cdb": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
"lflist": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
"config": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json"
},
"env408Resource": {
"lflist": "https://cdn02.moecube.com:444/cn-database/env408-zh-CN/expansions/lflist.conf"
},
"stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
"lflistUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
"replayUrl": "replay.neos.moe",
"loginUrl": "https://accounts.moecube.com/signin",
"logoutUrl": "https://accounts.moecube.com/signout",
......@@ -38,65 +52,10 @@
"userApi": "https://sapi.moecube.com:444/accounts/users/{username}.json",
"mdproServer": "https://rarnu.xyz:38443",
"agentServer": "https://sapi.moecube.com:444/neos-ai-agent",
"streamInterval": 20,
"startDelay": 1000,
"ui": {
"hint": {
"maxCount": 1
}
},
"unimplementedWhiteList": [
1,
6,
7,
34,
54,
55,
56,
60,
61,
62,
63,
64,
65,
70,
71,
72,
73,
74,
75,
76,
80,
81,
83,
93,
95,
96,
97,
101,
102,
110,
111,
112,
113,
114,
120,
121,
122,
123,
130,
131,
132,
133,
160,
161,
163,
164,
165,
170,
180,
230,
231,
236
]
}
}
neos.config.prod.json
View file @ 2017af9b
{
"version": 4961,
"servers": [{
"servers": [
{
"name": "koishi",
"ip": "koishi.momobako.com",
"port": "7211"
......@@ -19,16 +20,29 @@
"name": "pre-release",
"ip": "koishi.momobako.com",
"port": "889"
},
{
"name": "408",
"ip": "koishi.momobako.com",
"port": "1408"
}
],
"assetsPath": "/neos-assets",
"releaseImgUrl": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"preReleaseImgUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
"releaseDbUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"preReleaseDbUrl": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
"preReleaseConfig": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json",
"releaseResource": {
"img": "https://cdn02.moecube.com:444/images/ygopro-images-zh-CN",
"cdb": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/cards.cdb",
"lflist": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf"
},
"preReleaseResource": {
"img": "https://cdn02.moecube.com:444/ygopro-super-pre/data/pics",
"cdb": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.cdb",
"lflist": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
"config": "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release-v2.json"
},
"env408Resource": {
"lflist": "https://cdn02.moecube.com:444/cn-database/env408-zh-CN/expansions/lflist.conf"
},
"stringsUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/strings.conf",
"lflistUrl": "https://cdn02.moecube.com:444/ygopro-database/zh-CN/lflist.conf",
"replayUrl": "replay.neos.moe",
"loginUrl": "https://accounts.moecube.com/signin",
"logoutUrl": "https://accounts.moecube.com/signout",
......@@ -38,65 +52,10 @@
"userApi": "https://sapi.moecube.com:444/accounts/users/{username}.json",
"mdproServer": "https://rarnu.xyz:38443",
"agentServer": "https://sapi.moecube.com:444/neos-ai-agent",
"streamInterval": 20,
"startDelay": 1000,
"ui": {
"hint": {
"maxCount": 1
}
},
"unimplementedWhiteList": [
1,
6,
7,
34,
54,
55,
56,
60,
61,
62,
63,
64,
65,
70,
71,
72,
73,
74,
75,
76,
80,
81,
83,
93,
95,
96,
97,
101,
102,
110,
111,
112,
113,
114,
120,
121,
122,
123,
130,
131,
132,
133,
160,
161,
163,
164,
165,
170,
180,
230,
231,
236
]
}
}
src/api/cards.ts
View file @ 2017af9b
......@@ -4,7 +4,7 @@ import { FtsParams } from "@/middleware/sqlite/fts";
import { isSuperReleaseCard } from "./superPreRelease";
const NeosConfig = useConfig();
const { assetsPath, releaseResource, preReleaseResource } = useConfig();
export interface CardMeta {
id: number;
......@@ -80,12 +80,13 @@ export function getCardStr(meta: CardMeta, idx: number): string | undefined {
export function getCardImgUrl(code: number, back = false) {
const ASSETS_BASE =
import.meta.env.BASE_URL === "/"
? NeosConfig.assetsPath
: `${import.meta.env.BASE_URL}${NeosConfig.assetsPath}`;
? assetsPath
: `${import.meta.env.BASE_URL}${assetsPath}`;
if (back || code === 0) {
return `${ASSETS_BASE}/card_back.jpg`;
}
} else if (isSuperReleaseCard(code)) {
return `${preReleaseResource.img}/${code}.jpg`;
} else {
// Define translations for different languages (I18N)
const language = localStorage.getItem("language");
let imgUrl;
......@@ -96,17 +97,14 @@ export function getCardImgUrl(code: number, back = false) {
case "pt":
case "fr":
case "es":
imgUrl = NeosConfig.releaseImgUrl.replace("zh-CN", "en-US");
imgUrl = releaseResource.img.replace("zh-CN", "en-US");
break;
default:
imgUrl = NeosConfig.releaseImgUrl;
imgUrl = releaseResource.img;
break;
}
/* End of definition (I18N) */
if (isSuperReleaseCard(code)) {
return `${NeosConfig.preReleaseImgUrl}/${code}.jpg`;
} else {
return `${imgUrl}/${code}.jpg`;
}
}
src/api/forbiddens.ts
View file @ 2017af9b
import { isNil } from "lodash-es";
import { useConfig } from "@/config";
import { CardMeta } from "./cards";
const { lflistUrl } = useConfig();
class Forbidden {
private data: Map<number, number> = new Map<number, number>();
public time: string = "?";
public async init(): Promise<void> {
const text = await (await fetch(lflistUrl)).text();
public async init(lflist: string): Promise<void> {
const text = await (await fetch(lflist)).text();
const { time, forbiddens } = this.extractForbiddensFromText(text);
this.time = time;
this.setForbiddens(forbiddens);
......@@ -43,7 +40,7 @@ class Forbidden {
function parseCardInfo(
input: string,
): { cardId: number; limitCount: number } | null {
const match = input.match(/^(\d+)\s+(\d+)\s+--/);
const match = input.match(/^(\d+)\s+(\d+)/);
if (match) {
const cardId = parseInt(match[1]);
const limitCount = parseInt(match[2]);
......@@ -85,3 +82,4 @@ class Forbidden {
}
export const forbidden = new Forbidden();
export const forbidden_408 = new Forbidden();
src/api/superPreRelease.ts
View file @ 2017af9b
import { useConfig } from "@/config";
const { preReleaseConfig } = useConfig();
const {
preReleaseResource: { config },
} = useConfig();
interface SuperPreInfo {
/* only use id currently, other fields see:
......@@ -12,7 +14,7 @@ interface SuperPreInfo {
let superPreList: SuperPreInfo[] = [];
export async function initSuperPrerelease() {
const json = await (await fetch(preReleaseConfig)).text();
const json = await (await fetch(config)).text();
const list: SuperPreInfo[] = JSON.parse(json);
superPreList = list;
}
......
src/infra/stream.ts
View file @ 2017af9b
......@@ -8,10 +8,13 @@ export class WebSocketStream {
public ws: WebSocket;
stream: ReadableStream;
constructor(ip: string, onWsOpen?: (ws: WebSocket, ev: Event) => any) {
constructor(
ip: string,
onWsOpen?: (conn: WebSocketStream, ev: Event) => any,
) {
this.ws = new WebSocket("wss://" + ip);
if (onWsOpen) {
this.ws.onopen = (e) => onWsOpen(this.ws, e);
this.ws.onopen = (e) => onWsOpen(this, e);
}
this.ws.onerror = (e) => {
if (e instanceof ErrorEvent) {
......@@ -69,7 +72,6 @@ export class WebSocketStream {
// but now it seems that we don't need wait any more,
// so comment the following line and check if it's ok without it.
//
// await sleep(useConfig().streamInterval);
await onMessage(value);
} else {
console.warn("value from ReadableStream is undefined!");
......
src/middleware/socket.ts
View file @ 2017af9b
......@@ -13,11 +13,13 @@ export function initSocket(initInfo: {
ip: string;
player: string;
passWd: string;
customOnConnected?: (conn: WebSocketStream) => void;
}): WebSocketStream {
const { ip, player, passWd } = initInfo;
return new WebSocketStream(ip, (conn, _event) =>
handleSocketOpen(conn, ip, player, passWd),
);
const { ip, player, passWd, customOnConnected } = initInfo;
return new WebSocketStream(ip, (conn, _event) => {
handleSocketOpen(conn, ip, player, passWd);
customOnConnected && customOnConnected(conn);
});
}
export function initReplaySocket(replayInfo: {
......@@ -27,8 +29,8 @@ export function initReplaySocket(replayInfo: {
const { url, data } = replayInfo;
return new WebSocketStream(url, (conn, _event) => {
console.info("replay websocket open.");
conn.binaryType = "arraybuffer";
conn.send(data);
conn.ws.binaryType = "arraybuffer";
conn.ws.send(data);
});
}
......
src/service/duel/unimplemented.ts
View file @ 2017af9b
import { ygopro } from "@/api";
import { useConfig } from "@/config";
import { Container } from "@/container";
const NeosConfig = useConfig();
const UNIMPLEMENTED_WHITE_LIST = [
1, 6, 7, 34, 54, 55, 56, 60, 61, 62, 63, 64, 65, 70, 71, 72, 73, 74, 75, 76,
80, 81, 83, 93, 95, 96, 97, 101, 102, 110, 111, 112, 113, 114, 120, 121, 122,
123, 130, 131, 132, 133, 160, 161, 163, 164, 165, 170, 180, 230, 231, 236,
];
export default (
container: Container,
unimplemented: ygopro.StocGameMessage.MsgUnimplemented,
) => {
if (!NeosConfig.unimplementedWhiteList.includes(unimplemented.command)) {
if (!UNIMPLEMENTED_WHITE_LIST.includes(unimplemented.command)) {
container.context.matStore.unimplemented = unimplemented.command;
}
};
src/service/onSocketOpen.ts
View file @ 2017af9b
......@@ -4,6 +4,7 @@
* */
import { sendJoinGame, sendPlayerInfo } from "@/api";
import { useConfig } from "@/config";
import { WebSocketStream } from "@/infra";
const NeosConfig = useConfig();
/*
......@@ -12,17 +13,17 @@ const NeosConfig = useConfig();
*
* */
export default function handleSocketOpen(
ws: WebSocket | undefined,
conn: WebSocketStream | undefined,
_ip: string,
player: string,
passWd: string,
) {
console.log("WebSocket opened.");
if (ws && ws.readyState === 1) {
ws.binaryType = "arraybuffer";
if (conn && conn.ws.readyState === 1) {
conn.ws.binaryType = "arraybuffer";
sendPlayerInfo(ws, player);
sendJoinGame(ws, NeosConfig.version, passWd);
sendPlayerInfo(conn.ws, player);
sendJoinGame(conn.ws, NeosConfig.version, passWd);
}
}
src/ui/BuildDeck/index.tsx
View file @ 2017af9b
......@@ -26,6 +26,7 @@ import {
DeckZone,
Loading,
ScrollableArea,
Select,
} from "@/ui/Shared";
import { Type } from "@/ui/Shared/DeckZone";
......@@ -41,6 +42,9 @@ import {
iDeckToEditingDeck,
} from "./utils";
const ENV_OCG = 0;
const ENV_408 = 1;
export const loader: LoaderFunction = async () => {
// 必须先加载卡组，不然页面会崩溃
if (!initStore.decks) {
......@@ -182,6 +186,9 @@ export const DeckEditor: React.FC<{
}> = ({ deck, onClear, onReset, onSave, onShuffle, onSort }) => {
const snapEditDeck = useSnapshot(editDeckStore);
const [deckName, setDeckName] = useState(editDeckStore.deckName);
const [env, setEnv] = useState(ENV_OCG);
const handleEnvChange = (value: any) => setEnv(value);
useEffect(() => {
iDeckToEditingDeck(deck).then(editDeckStore.set);
......@@ -249,6 +256,21 @@ export const DeckEditor: React.FC<{
value={deckName}
/>
<Space style={{ marginRight: "0.4rem" }} size={5}>
<Select
title={i18n("Environment")}
value={env}
options={[
{
value: ENV_OCG,
label: "OCG",
},
{
value: ENV_408,
label: "408",
},
]}
onChange={handleEnvChange}
/>
<Button
type="text"
size="small"
......@@ -313,6 +335,7 @@ export const DeckEditor: React.FC<{
editDeckStore.add(type, card);
}
}}
is408={env === ENV_408}
/>
))}
</ScrollableArea>
......
src/ui/I18N/Source/Chinese/translation.json
View file @ 2017af9b
......@@ -42,6 +42,7 @@
},
"BuildDeck": {
"EnterTheDeckName": "请输入卡组名字",
"Environment": "环境",
"Shuffle": "打乱",
"Sort": "排序",
"Clear": "清空",
......@@ -165,6 +166,7 @@
"Server": "服务器",
"KoishiServer": "Koishi服",
"UltraPreemptiveServer": "超先行服",
"408": "408环境",
"PlayerNickname": "玩家昵称",
"RoomPasswordOptional": "房间密码(可选)",
"JoinRoom": "加入房间",
......
src/ui/I18N/Source/English/translation.json
View file @ 2017af9b
......@@ -42,6 +42,7 @@
},
"BuildDeck": {
"EnterTheDeckName": "Deck name",
"Environment": "Environment",
"Shuffle": "Shuffle",
"Sort": "Sort",
"Clear": "Clear",
......@@ -165,6 +166,7 @@
"Server": "Server",
"KoishiServer": "Koishi Server",
"UltraPreemptiveServer": "Ultra Preemptive Server",
"408": "408 Environment",
"PlayerNickname": "Player Nickname",
"RoomPasswordOptional": "Room Password (optional)",
"JoinRoom": "Join the Room"
......
src/ui/I18N/Source/Japanese/translation.json
View file @ 2017af9b
......@@ -40,6 +40,7 @@
},
"BuildDeck": {
"EnterTheDeckName": "デッキ名を入力",
"Environment": "環境",
"Shuffle": "シャッフル",
"Sort": "ソート",
"Clear": "クリア",
......@@ -163,6 +164,7 @@
"Server": "サーバー",
"KoishiServer": "コイシサーバー",
"UltraPreemptiveServer": "超先行サーバー",
"408": "408環境",
"PlayerNickname": "プレイヤーニックネーム",
"RoomPasswordOptional": "ルームパスワード（任意）",
"JoinRoom": "ルームに参加"
......
src/ui/Layout/utils.ts
View file @ 2017af9b
......@@ -3,6 +3,7 @@ import rustInit from "rust-src";
import {
CookieKeys,
forbidden,
forbidden_408,
getCookie,
initStrings,
initSuperPrerelease,
......@@ -12,7 +13,7 @@ import { useConfig } from "@/config";
import { useEnv } from "@/hook";
import sqliteMiddleWare, { sqliteCmd } from "@/middleware/sqlite";
import { accountStore, deckStore, initStore, type User } from "@/stores";
const { releaseDbUrl, preReleaseDbUrl } = useConfig();
const { releaseResource, preReleaseResource, env408Resource } = useConfig();
const { BASE_URL } = useEnv();
/** 加载ygodb */
......@@ -24,7 +25,11 @@ export const initSqlite = async () => {
sqlite.progress = 0.01;
await sqliteMiddleWare({
cmd: sqliteCmd.INIT,
initInfo: { releaseDbUrl, preReleaseDbUrl, progressCallback },
initInfo: {
releaseDbUrl: releaseResource.cdb,
preReleaseDbUrl: preReleaseResource.cdb,
progressCallback,
},
});
sqlite.progress = 1;
}
......@@ -51,7 +56,8 @@ export const initWASM = async () => {
/** 加载禁限卡表 */
export const initForbidden = async () => {
if (!initStore.forbidden) {
await forbidden.init();
await forbidden.init(releaseResource.lflist);
await forbidden_408.init(env408Resource.lflist);
initStore.forbidden = true;
}
};
......
src/ui/Match/MatchModal/index.tsx
View file @ 2017af9b
......@@ -4,7 +4,9 @@ import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
import { proxy, useSnapshot } from "valtio";
import { sendChat } from "@/api";
import { useConfig } from "@/config";
import { WebSocketStream } from "@/infra";
import { accountStore, roomStore } from "@/stores";
import { Select } from "@/ui/Shared";
......@@ -16,6 +18,7 @@ const serverConfig = NeosConfig.servers;
const KOISHI_INDEX = 0;
const PRERELEASE_INDEX = 3;
const ENV_408 = 4;
const {
defaults: { defaultPlayer, defaultPassword },
......@@ -54,6 +57,16 @@ export const MatchModal: React.FC = ({}) => {
const handlePasswdChange = (event: ChangeEvent<HTMLInputElement>) => {
setPasswd(event.target.value);
};
const send408Hint = (conn: WebSocketStream) => {
setTimeout(
() =>
sendChat(
conn,
"由于技术原因，408环境卡池内可用卡牌暂无法直接标出，某些卡片实际使用的是旧效果，例如混沌之黑魔术师、多尔·多拉、死之卡组破坏病毒...",
),
1000,
);
};
const handleSubmit = async () => {
setConfirmLoading(true);
......@@ -62,6 +75,7 @@ export const MatchModal: React.FC = ({}) => {
ip: genServerAddress(serverId),
passWd: passwd,
enableKuriboh,
customOnConnected: serverId === ENV_408 ? send408Hint : undefined,
});
};
......@@ -115,6 +129,10 @@ export const MatchModal: React.FC = ({}) => {
value: PRERELEASE_INDEX,
label: i18n("UltraPreemptiveServer"),
},
{
value: ENV_408,
label: i18n("408"),
},
]}
onChange={handleServerChange}
/>
......
src/ui/Match/util.ts
View file @ 2017af9b
......@@ -3,6 +3,7 @@ import rustInit from "rust-src";
import { initStrings, initSuperPrerelease } from "@/api";
import { useConfig } from "@/config";
import { getUIContainer, initUIContainer } from "@/container/compat";
import { WebSocketStream } from "@/infra";
import { initReplaySocket, initSocket } from "@/middleware/socket";
import {
pollSocketLooper,
......@@ -21,6 +22,7 @@ export const connectSrvpro = async (params: {
enableKuriboh?: boolean;
replay?: boolean;
replayData?: ArrayBuffer;
customOnConnected?: (conn: WebSocketStream) => void;
}) => {
// 初始化wasm
const url =
......
src/ui/Shared/DeckCard/index.tsx
View file @ 2017af9b
import React, { memo, useRef, useState } from "react";
import { useDrag } from "react-dnd";
import { CardMeta, forbidden } from "@/api";
import { CardMeta, forbidden, forbidden_408 } from "@/api";
import { useConfig } from "@/config";
import { Type } from "../DeckZone";
......@@ -22,7 +22,9 @@ export const DeckCard: React.FC<{
onMouseUp?: (event: DeckCardMouseUpEvent) => void;
onMouseEnter?: () => void;
onDoubleClick?: (card: CardMeta) => void;
}> = memo(({ value, source, onMouseUp, onMouseEnter, onDoubleClick }) => {
is408?: boolean;
}> = memo(
({ value, source, onMouseUp, onMouseEnter, onDoubleClick, is408 }) => {
const ref = useRef<HTMLDivElement>(null);
const [{ isDragging }, drag] = useDrag({
type: "Card",
......@@ -33,7 +35,7 @@ export const DeckCard: React.FC<{
});
drag(ref);
const [showText, setShowText] = useState(true);
const limitCnt = forbidden.get(value);
const limitCnt = is408 ? forbidden_408.get(value) : forbidden.get(value);
return (
<div
......@@ -66,4 +68,5 @@ export const DeckCard: React.FC<{
)}
</div>
);
});
},
);
src/ui/Shared/DeckZone/index.tsx
View file @ 2017af9b
......@@ -26,6 +26,7 @@ export const DeckZone: React.FC<{
) => void;
onElementMouseUp: (event: DeckCardMouseUpEvent) => void;
onDoubleClick?: (card: CardMeta) => void;
is408?: boolean;
}> = ({
type,
cards,
......@@ -33,6 +34,7 @@ export const DeckZone: React.FC<{
onChange,
onElementMouseUp: onElementMouseUp,
onDoubleClick,
is408,
}) => {
const { message } = App.useApp();
const [allowToDrop, setAllowToDrop] = useState(false);
......@@ -74,6 +76,7 @@ export const DeckZone: React.FC<{
source={type}
onMouseUp={onElementMouseUp}
onDoubleClick={onDoubleClick}
is408={is408}
/>
))}
<div className={styles["editing-zone-name"]}>
......
src/ui/Shared/Select/index.module.scss
View file @ 2017af9b
......@@ -2,8 +2,8 @@
display: flex;
align-items: center;
.prefix {
height: 40px;
line-height: 40px;
height: 2rem;
line-height: 2rem;
padding: 0 1rem;
border-radius: 6px;
border-right: none;
......
src/ui/Shared/Select/index.tsx
View file @ 2017af9b
......@@ -10,7 +10,7 @@ export const Select: React.FC<
{title && <span className={styles.prefix}>{title}</span>}
<AntdSelect
className={classNames(styles.select, className)}
size="large"
size="middle"
dropdownStyle={{
backdropFilter: "blur(20px)",
...dropdownStyle,
......
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