Merge branch 'dev/refactor-duel' into 'main'

Dev/refactor duel

See merge request mycard/Neos!168

.eslintrc.json

@@ -6,7 +6,8 @@
     "plugin:import/typescript"
   ],
   "plugins": [
-    "@typescript-eslint"
+    "@typescript-eslint",
+    "simple-import-sort"
   ],
   "rules": {
     "eqeqeq": 0,
@@ -14,7 +15,9 @@
     "@typescript-eslint/consistent-type-definitions": [
       "error",
       "interface"
-    ]
+    ],
+    "simple-import-sort/imports": "warn",
+    "simple-import-sort/exports": "warn"
   },
   "settings": {
     "import/resolver": {

package.json

@@ -28,7 +28,7 @@
     "react-draggable": "^4.4.5",
     "react-redux": "^8.0.5",
     "react-router-dom": "^6.10.0",
-    "react-scripts": "^5.0.1",
+    "react-scripts": "^2.1.3",
     "socket.io-client": "^4.6.1",
     "sql.js": "^1.8.0",
     "vite-plugin-svgr": "^2.4.0",
@@ -76,6 +76,7 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "prettier": "^2.8.7",
     "sass": "^1.61.0",
     "typescript": "^4.9.5",

src/api/cards.ts

 import axios from "axios";
+
 import sqliteMiddleWare, { sqliteCmd } from "@/middleware/sqlite";
 
 export interface CardMeta {

src/api/ocgcore/ocgAdapter/adapter.ts

-import { YgoProPacket } from "./packet";
 import { ygopro } from "../idl/ocgcore";
+import { YgoProPacket } from "./packet";
 import {
   STOC_CHAT,
+  STOC_DECK_COUNT,
+  STOC_DUEL_START,
+  STOC_GAME_MSG,
+  STOC_HAND_RESULT,
   STOC_HS_PLAYER_CHANGE,
   STOC_HS_PLAYER_ENTER,
   STOC_HS_WATCH_CHANGE,
   STOC_JOIN_GAME,
-  STOC_TYPE_CHANGE,
   STOC_SELECT_HAND,
   STOC_SELECT_TP,
-  STOC_HAND_RESULT,
-  STOC_DECK_COUNT,
-  STOC_DUEL_START,
-  STOC_GAME_MSG,
   STOC_TIME_LIMIT,
+  STOC_TYPE_CHANGE,
 } from "./protoDecl";
 import StocChat from "./stoc/stocChat";
-import StocJoinGame from "./stoc/stocJoinGame";
-import StocHsPlayerEnter from "./stoc/stocHsPlayerEnter";
+import StocDeckCount from "./stoc/stocDeckCount";
+import StocDuelStart from "./stoc/stocDuelStart";
+import StocGameMsg from "./stoc/stocGameMsg/mod";
 import StocHsPlayerChange from "./stoc/stocHsPlayerChange";
+import StocHsPlayerEnter from "./stoc/stocHsPlayerEnter";
 import StocHsWatchChange from "./stoc/stocHsWatchChange";
-import StocTypeChange from "./stoc/stocTypeChange";
+import StocJoinGame from "./stoc/stocJoinGame";
 import StocSelectHand from "./stoc/stocSelectHand";
 import StocSelectTp from "./stoc/stocSelectTp";
-import StocDeckCount from "./stoc/stocDeckCount";
 import StocTimeLimit from "./stoc/stocTimeLimit";
-import StocGameMsg from "./stoc/stocGameMsg/mod";
-import StocDuelStart from "./stoc/stocDuelStart";
+import StocTypeChange from "./stoc/stocTypeChange";
 
 /*
  * 将[`ygoProPacket`]对象转换成[`ygopro.YgoStocMsg`]对象

src/api/ocgcore/ocgAdapter/bufferIO.ts

+import { BufferReader } from "rust-src";
+
 import { ygopro } from "../idl/ocgcore";
 import { numberToCardPosition, numberToCardZone } from "./util";
-import { BufferReader } from "rust-src";
 
 const LOCATION_OVERLAY = 0x80;
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/mod.ts

 import { ygopro } from "../../../idl/ocgcore";
 import { YgoProPacket } from "../../packet";
 import { CTOS_RESPONSE } from "../../protoDecl";
-import adaptSelectIdleCmdResponse from "./selectIdleCmd";
-import adaptSelectPlaceResponse from "./selectPlace";
+import adaptSelectBattleCmdResponse from "./selectBattleCmd";
 import adaptSelectCardResponse from "./selectCard";
 import adaptSelectChainResponse from "./selectChain";
+import adaptSelectCounterResponse from "./selectCounter";
 import adaptSelectEffectYnResponse from "./selectEffectYn";
-import adaptSelectPositionResponse from "./selectPosition";
+import adaptSelectIdleCmdResponse from "./selectIdleCmd";
 import adaptSelectOptionResponse from "./selectOption";
-import adaptSelectBattleCmdResponse from "./selectBattleCmd";
+import adaptSelectPlaceResponse from "./selectPlace";
+import adaptSelectPositionResponse from "./selectPosition";
 import adaptSelectUnselectCardResponse from "./selectUnselectCard";
-import adaptSelectCounterResponse from "./selectCounter";
 import adaptSortCardResponse from "./sortCard";
 
 /*

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectBattleCmd.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (
   response: ygopro.CtosGameMsgResponse.SelectBattleCmdResponse
 ) => {

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectCard.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SelectCardResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectChain.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SelectChainResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectCounter.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SelectCounterResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectEffectYn.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (
   response: ygopro.CtosGameMsgResponse.SelectEffectYnResponse
 ) => {

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectIdleCmd.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SelectIdleCmdResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectOption.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SelectOptionResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectPlace.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
+
+import { ygopro } from "../../../idl/ocgcore";
 import { cardZoneToNumber } from "../../util";
 
 export default (response: ygopro.CtosGameMsgResponse.SelectPlaceResponse) => {

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectPosition.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (
   response: ygopro.CtosGameMsgResponse.SelectPositionResponse
 ) => {

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectUnselectCard.ts

-import { ygopro } from "../../../idl/ocgcore";
-
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (
   response: ygopro.CtosGameMsgResponse.SelectUnselectCardResponse
 ) => {

src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/sortCard.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferWriter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 export default (response: ygopro.CtosGameMsgResponse.SortCardResponse) => {
   const writer = new BufferWriter();
 

src/api/ocgcore/ocgAdapter/stoc/stocChat.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC Chat

src/api/ocgcore/ocgAdapter/stoc/stocDeckCount.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 const LITTLE_ENDIAN = true;
 const INT16_BYTE_OFFSET = 2;

src/api/ocgcore/ocgAdapter/stoc/stocDuelStart.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC DuelStart

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/damage.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { ocgDamageAdapter } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * Msg Damage
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/draw.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * MSG Draw
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/hint.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * Msg Hint
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts

@@ -4,35 +4,35 @@
  * */
 
 import { ygopro } from "../../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../../packet";
+import { StocAdapter, YgoProPacket } from "../../packet";
 import * as GAME_MSG from "../../protoDecl";
-import MsgStartAdapter from "./start";
+import MsgAddCounter from "./addCounter";
+import MsgDamage from "./damage";
 import MsgDrawAdapter from "./draw";
-import MsgNewTurnAdapter from "./newTurn";
-import MsgNewPhaseAdapter from "./newPhase";
 import MsgHintAdapter from "./hint";
-import MsgSelectIdleCmdAdapter from "./selectIdleCmd";
-import MsgSelectPlaceAdapter from "./selectPlace";
+import MsgNewPhaseAdapter from "./newPhase";
+import MsgNewTurnAdapter from "./newTurn";
+import PENETRATE from "./penetrate";
+import MsgRecover from "./recover";
+import MsgReloadFieldAdapter from "./reloadField";
+import MsgRemoveCounter from "./removeCounter";
+import MsgSelectBattleCmdAdapter from "./selectBattleCmd";
 import MsgSelectCardAdapter from "./selectCard";
-import MsgSelectTributeAdapter from "./selectTribute";
 import MsgSelectChainAdapter from "./selectChain";
+import MsgSelectCounter from "./selectCounter";
 import MsgSelectEffectYnAdapter from "./selectEffectYn";
-import MsgSelectPositionAdapter from "./selectPosition";
+import MsgSelectIdleCmdAdapter from "./selectIdleCmd";
 import MsgSelectOptionAdapter from "./selectOption";
-import MsgSelectBattleCmdAdapter from "./selectBattleCmd";
+import MsgSelectPlaceAdapter from "./selectPlace";
+import MsgSelectPositionAdapter from "./selectPosition";
+import MsgSelectSum from "./selectSum";
+import MsgSelectTributeAdapter from "./selectTribute";
 import MsgSelectUnselectCardAdapter from "./selectUnselectCard";
+import MsgSortCard from "./sortCard";
+import MsgStartAdapter from "./start";
+import MsgUpdateDataAdapter from "./updateData";
 import MsgWaitAdapter from "./wait";
-import MsgDamage from "./damage";
-import MsgRecover from "./recover";
 import MsgWin from "./win";
-import MsgUpdateDataAdapter from "./updateData";
-import MsgReloadFieldAdapter from "./reloadField";
-import MsgSelectSum from "./selectSum";
-import MsgAddCounter from "./addCounter";
-import MsgRemoveCounter from "./removeCounter";
-import MsgSelectCounter from "./selectCounter";
-import MsgSortCard from "./sortCard";
-import PENETRATE from "./penetrate";
 
 /*
  * STOC GameMsg

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newPhase.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * Msg New Phase
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newTurn.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * MSG New Turn
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.ts

 //! 透传协议
 
-import PenetrateData from "./penetrate.json";
-import { BufferReaderExt } from "../../bufferIO";
 import { ygopro } from "../../../idl/ocgcore";
+import { BufferReaderExt } from "../../bufferIO";
 import { numberToCardPosition } from "../../util";
+import PenetrateData from "./penetrate.json";
 
 type Constructor<T = any> = new (...args: any[]) => T;
 

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/recover.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../../idl/ocgcore";
+
 /*
  * Msg Recover
  *

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectOption.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
+
+import { ygopro } from "../../../idl/ocgcore";
 import MsgSelectOption = ygopro.StocGameMessage.MsgSelectOption;
 
 /*

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectPlace.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
+
+import { ygopro } from "../../../idl/ocgcore";
 import MsgSelectPlace = ygopro.StocGameMessage.MsgSelectPlace;
 
 /*

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectPosition.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
+
+import { ygopro } from "../../../idl/ocgcore";
 import MsgSelectPosition = ygopro.StocGameMessage.MsgSelectPosition;
 
 /*

src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/win.ts

-import { ygopro } from "../../../idl/ocgcore";
 import { BufferReader } from "rust-src";
+
+import { ygopro } from "../../../idl/ocgcore";
 import MsgWin = ygopro.StocGameMessage.MsgWin;
 
 /*

src/api/ocgcore/ocgAdapter/stoc/stocHsPlayerChange.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC HsPlayerChange

src/api/ocgcore/ocgAdapter/stoc/stocHsPlayerEnter.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
-import { UTF16_BUFFER_MAX_LEN, _cutoff_name } from "../util";
+import { StocAdapter, YgoProPacket } from "../packet";
+import { _cutoff_name, UTF16_BUFFER_MAX_LEN } from "../util";
 
 const UINT8_PER_UINT16 = 2;
 

src/api/ocgcore/ocgAdapter/stoc/stocHsWatchChange.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC HsWatchChange

src/api/ocgcore/ocgAdapter/stoc/stocJoinGame.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC JoinGame

src/api/ocgcore/ocgAdapter/stoc/stocSelectHand.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC SelectHand

src/api/ocgcore/ocgAdapter/stoc/stocSelectTp.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC SelectTp

src/api/ocgcore/ocgAdapter/stoc/stocTimeLimit.ts

-import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
 import { BufferReader } from "rust-src";
 
+import { ygopro } from "../../idl/ocgcore";
+import { StocAdapter, YgoProPacket } from "../packet";
+
 /*
  * STOC TimeLimit
  *

src/api/ocgcore/ocgAdapter/stoc/stocTypeChange.ts

 import { ygopro } from "../../idl/ocgcore";
-import { YgoProPacket, StocAdapter } from "../packet";
+import { StocAdapter, YgoProPacket } from "../packet";
 
 /*
  * STOC TypeChange

src/api/ocgcore/ocgHelper.ts

@@ -2,20 +2,21 @@
  * 一些发ygopro协议数据包的辅助函数，用于简化业务代码。
  *
  * */
-import { ygopro } from "./idl/ocgcore";
 import socketMiddleWare, { socketCmd } from "@/middleware/socket";
+
 import { IDeck } from "../deck";
-import PlayerInfoAdapter from "./ocgAdapter/ctos/ctosPlayerInfo";
-import JoinGameAdapter from "./ocgAdapter/ctos/ctosJoinGame";
-import UpdateDeckAdapter from "./ocgAdapter/ctos/ctosUpdateDeck";
+import { ygopro } from "./idl/ocgcore";
+import Chat from "./ocgAdapter/ctos/ctosChat";
+import GameMsgResponse from "./ocgAdapter/ctos/ctosGameMsgResponse/mod";
+import HandResult from "./ocgAdapter/ctos/ctosHandResult";
 import HsReadyAdapter from "./ocgAdapter/ctos/ctosHsReady";
 import HsStartAdapter from "./ocgAdapter/ctos/ctosHsStart";
-import HandResult from "./ocgAdapter/ctos/ctosHandResult";
-import TpResult from "./ocgAdapter/ctos/ctosTpResult";
-import TimeConfirm from "./ocgAdapter/ctos/ctosTimeConfirm";
+import JoinGameAdapter from "./ocgAdapter/ctos/ctosJoinGame";
+import PlayerInfoAdapter from "./ocgAdapter/ctos/ctosPlayerInfo";
 import Surrender from "./ocgAdapter/ctos/ctosSurrender";
-import GameMsgResponse from "./ocgAdapter/ctos/ctosGameMsgResponse/mod";
-import Chat from "./ocgAdapter/ctos/ctosChat";
+import TimeConfirm from "./ocgAdapter/ctos/ctosTimeConfirm";
+import TpResult from "./ocgAdapter/ctos/ctosTpResult";
+import UpdateDeckAdapter from "./ocgAdapter/ctos/ctosUpdateDeck";
 
 export function sendUpdateDeck(deck: IDeck) {
   const updateDeck = new ygopro.YgoCtosMsg({

src/api/strings.ts

 import axios from "axios";
-import NeosConfig from "../../neos.config.json";
-import { getCardStr, fetchCard } from "./cards";
 
+import { useConfig } from "@/config";
+
+import { fetchCard, getCardStr } from "./cards";
+
+const NeosConfig = useConfig();
 export const DESCRIPTION_LIMIT = 10000;
 
 export async function initStrings() {

src/config/env.ts

 import { useEnv } from "@/hook";
+
 import NeosDevConfig from "../../neos.config.json";
 import NeosProdConfig from "../../neos.config.prod.json";
 

src/hook/index.ts

 export * from "./useApp";
 export * from "./useEnv";
+export * from "./useMeshClick";

src/hook/useApp.ts

 import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
-import type { RootState, AppDispatch } from "@/store";
+
+import type { AppDispatch, RootState } from "@/store";
 
 // Use throughout your app instead of plain `useDispatch` and `useSelector`
 export const useAppDispatch: () => AppDispatch = useDispatch;

src/ui/Duel/hook.ts → src/hook/useMeshClick.ts

 // 一些自定义`Hook`
 
 import { ActionEvent } from "@babylonjs/core";
-import { MutableRefObject, useEffect, useRef } from "react";
-import { Nullable } from "@babylonjs/core/types.js";
-import { Mesh } from "@babylonjs/core/Meshes/mesh.js";
-import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh.js";
-import { ActionManager } from "@babylonjs/core/Actions/actionManager.js";
 import { IAction } from "@babylonjs/core/Actions/action.js";
+import { ActionManager } from "@babylonjs/core/Actions/actionManager.js";
 import { ExecuteCodeAction } from "@babylonjs/core/Actions/directActions.js";
+import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh.js";
+import { Mesh } from "@babylonjs/core/Meshes/mesh.js";
+import { Nullable } from "@babylonjs/core/types.js";
+import { MutableRefObject, useEffect, useRef } from "react";
 
 export interface MeshEventType {
   (env: ActionEvent): void;

src/main.tsx

@@ -19,14 +19,15 @@
  * 在进行代码开发的时候需要注意这点。
  *
  * */
+import { ConfigProvider, theme } from "antd";
+import zhCN from "antd/locale/zh_CN";
 import React from "react";
 import ReactDOM from "react-dom/client";
-import Neos from "./ui/Neos";
-import { BrowserRouter } from "react-router-dom";
 import { Provider } from "react-redux";
+import { BrowserRouter } from "react-router-dom";
+
 import { store } from "./store";
-import { ConfigProvider, theme } from "antd";
-import zhCN from "antd/locale/zh_CN";
+import Neos from "./ui/Neos";
 
 const root = ReactDOM.createRoot(
   document.getElementById("root") as HTMLElement

src/middleware/socket.ts

@@ -4,8 +4,8 @@
  * 所有长连接/Websocket相关的逻辑都应该收敛在这里。
  *
  * */
-import handleSocketOpen from "../service/onSocketOpen";
 import handleSocketMessage from "../service/onSocketMessage";
+import handleSocketOpen from "../service/onSocketOpen";
 
 export enum socketCmd {
   // 建立长连接

src/middleware/sqlite.ts

@@ -6,8 +6,11 @@
  * */
 
 import initSqlJs, { Database } from "sql.js";
-import { CardMeta, CardData, CardText } from "@/api/cards";
-import NeosConfig from "../../neos.config.json";
+
+import { CardData, CardMeta, CardText } from "@/api/cards";
+import { useConfig } from "@/config";
+
+const NeosConfig = useConfig();
 
 export enum sqliteCmd {
   // 初始化

src/reducers/chatSlice.ts

@@ -3,6 +3,7 @@
  *
  * */
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
 
 export interface chatState {

src/reducers/duel/exclusionSlice.ts → src/reducers/duel/banishedZoneSlice.ts

-import { judgeSelf } from "./util";
 import {
-  PayloadAction,
-  CaseReducer,
   ActionReducerMapBuilder,
+  CaseReducer,
+  PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
-import { RootState } from "@/store";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { RootState } from "@/store";
+
 import {
   createAsyncMetaThunk,
   DuelFieldState,
-  extendState,
-  extendMeta,
-  removeCard,
   DuelReducer,
-  Interactivity,
   extendIdleInteractivities,
+  extendMeta,
+  extendState,
+  Interactivity,
+  removeCard,
 } from "./generic";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 
-export interface ExclusionState extends DuelFieldState {}
+export interface BanishedZoneState extends DuelFieldState {}
 
 // 初始化除外区状态
-export const initExclusionImpl: CaseReducer<
+export const initBanishedZoneImpl: CaseReducer<
   DuelState,
   PayloadAction<number>
 > = (state, action) => {
   const player = action.payload;
   if (judgeSelf(player, state)) {
-    state.meExclusion = { inner: [] };
+    state.meBanishedZone = { inner: [] };
   } else {
-    state.opExclusion = { inner: [] };
+    state.opBanishedZone = { inner: [] };
   }
 };
 
 // 增加除外区
-export const fetchExclusionMeta = createAsyncMetaThunk(
-  "duel/fetchExclusionMeta"
+export const fetchBanishedZoneMeta = createAsyncMetaThunk(
+  "duel/fetchBanishedZoneMeta"
 );
 
-export const exclusionCase = (builder: ActionReducerMapBuilder<DuelState>) => {
-  builder.addCase(fetchExclusionMeta.pending, (state, action) => {
+export const banishedZoneCase = (
+  builder: ActionReducerMapBuilder<DuelState>
+) => {
+  builder.addCase(fetchBanishedZoneMeta.pending, (state, action) => {
     // Meta结果没返回之前先更新`ID`
     const controler = action.meta.arg.controler;
     const sequence = action.meta.arg.sequence;
@@ -56,51 +60,51 @@ export const exclusionCase = (builder: ActionReducerMapBuilder<DuelState>) => {
       counters: {},
     };
     if (judgeSelf(controler, state)) {
-      extendState(state.meExclusion, newExclusion);
+      extendState(state.meBanishedZone, newExclusion);
     } else {
-      extendState(state.opExclusion, newExclusion);
+      extendState(state.opBanishedZone, newExclusion);
     }
   });
-  builder.addCase(fetchExclusionMeta.fulfilled, (state, action) => {
+  builder.addCase(fetchBanishedZoneMeta.fulfilled, (state, action) => {
     const controler = action.payload.controler;
     const sequence = action.payload.sequence;
     const meta = action.payload.meta;
 
     if (judgeSelf(controler, state)) {
-      extendMeta(state.meExclusion, meta, sequence);
+      extendMeta(state.meBanishedZone, meta, sequence);
     } else {
-      extendMeta(state.opExclusion, meta, sequence);
+      extendMeta(state.opBanishedZone, meta, sequence);
     }
   });
 };
 
 // 删除除外区
-export const removeExclusionImpl: CaseReducer<
+export const removeBanishedZoneImpl: CaseReducer<
   DuelState,
   PayloadAction<{ controler: number; sequence: number }>
 > = (state, action) => {
-  const exclusion = judgeSelf(action.payload.controler, state)
-    ? state.meExclusion
-    : state.opExclusion;
-  removeCard(exclusion, action.payload.sequence);
+  const banishedZone = judgeSelf(action.payload.controler, state)
+    ? state.meBanishedZone
+    : state.opBanishedZone;
+  removeCard(banishedZone, action.payload.sequence);
 };
 
-export const addExclusionIdleInteractivitiesImpl: DuelReducer<{
+export const addBanishedZoneIdleInteractivitiesImpl: DuelReducer<{
   player: number;
   sequence: number;
   interactivity: Interactivity<number>;
 }> = (state, action) => {
-  const exclusion = judgeSelf(action.payload.player, state)
-    ? state.meExclusion
-    : state.opExclusion;
+  const banishedZone = judgeSelf(action.payload.player, state)
+    ? state.meBanishedZone
+    : state.opBanishedZone;
   extendIdleInteractivities(
-    exclusion,
+    banishedZone,
     action.payload.sequence,
     action.payload.interactivity
   );
 };
 
-export const selectMeExclusion = (state: RootState) =>
-  state.duel.meExclusion || { inner: [] };
-export const selectopExclusion = (state: RootState) =>
-  state.duel.opExclusion || { inner: [] };
+export const selectMeBanishedZone = (state: RootState) =>
+  state.duel.meBanishedZone || { inner: [] };
+export const selectOpBanishedZone = (state: RootState) =>
+  state.duel.opBanishedZone || { inner: [] };

src/reducers/duel/cemeretySlice.ts

-import { judgeSelf } from "./util";
 import {
-  PayloadAction,
-  CaseReducer,
   ActionReducerMapBuilder,
+  CaseReducer,
+  PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
-import { RootState } from "@/store";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { RootState } from "@/store";
+
 import {
   createAsyncMetaThunk,
   DuelFieldState,
-  extendState,
-  extendMeta,
-  removeCard,
   DuelReducer,
-  Interactivity,
   extendIdleInteractivities,
+  extendMeta,
+  extendState,
+  Interactivity,
+  removeCard,
 } from "./generic";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 
-export interface CemeteryState extends DuelFieldState {}
+export interface GraveyardState extends DuelFieldState {}
 
 // 初始化墓地状态
-export const initCemeteryImpl: CaseReducer<DuelState, PayloadAction<number>> = (
-  state,
-  action
-) => {
+export const initGraveyardImpl: CaseReducer<
+  DuelState,
+  PayloadAction<number>
+> = (state, action) => {
   const player = action.payload;
   if (judgeSelf(player, state)) {
-    state.meCemetery = { inner: [] };
+    state.meGraveyard = { inner: [] };
   } else {
-    state.opCemetery = { inner: [] };
+    state.opGraveyard = { inner: [] };
   }
 };
 
 // 增加墓地
-export const fetchCemeteryMeta = createAsyncMetaThunk("duel/fetchCemeteryMeta");
+export const fetchGraveyardMeta = createAsyncMetaThunk(
+  "duel/fetchGraveyardMeta"
+);
 
-export const cemeteryCase = (builder: ActionReducerMapBuilder<DuelState>) => {
-  builder.addCase(fetchCemeteryMeta.pending, (state, action) => {
+export const graveyardCase = (builder: ActionReducerMapBuilder<DuelState>) => {
+  builder.addCase(fetchGraveyardMeta.pending, (state, action) => {
     // Meta结果没返回之前先更新`ID`
     const controler = action.meta.arg.controler;
     const sequence = action.meta.arg.sequence;
     const code = action.meta.arg.code;
 
-    const newCemetery = {
+    const newGraveyard = {
       occupant: { id: code, data: {}, text: {} },
       location: {
         controler,
@@ -54,51 +58,51 @@ export const cemeteryCase = (builder: ActionReducerMapBuilder<DuelState>) => {
       counters: {},
     };
     if (judgeSelf(controler, state)) {
-      extendState(state.meCemetery, newCemetery);
+      extendState(state.meGraveyard, newGraveyard);
     } else {
-      extendState(state.opCemetery, newCemetery);
+      extendState(state.opGraveyard, newGraveyard);
     }
   });
-  builder.addCase(fetchCemeteryMeta.fulfilled, (state, action) => {
+  builder.addCase(fetchGraveyardMeta.fulfilled, (state, action) => {
     const controler = action.payload.controler;
     const sequence = action.payload.sequence;
     const meta = action.payload.meta;
 
     if (judgeSelf(controler, state)) {
-      extendMeta(state.meCemetery, meta, sequence);
+      extendMeta(state.meGraveyard, meta, sequence);
     } else {
-      extendMeta(state.opCemetery, meta, sequence);
+      extendMeta(state.opGraveyard, meta, sequence);
     }
   });
 };
 
 // 删除墓地
-export const removeCemeteryImpl: CaseReducer<
+export const removeGraveyardImpl: CaseReducer<
   DuelState,
   PayloadAction<{ controler: number; sequence: number }>
 > = (state, action) => {
-  const cemetery = judgeSelf(action.payload.controler, state)
-    ? state.meCemetery
-    : state.opCemetery;
-  removeCard(cemetery, action.payload.sequence);
+  const graveyard = judgeSelf(action.payload.controler, state)
+    ? state.meGraveyard
+    : state.opGraveyard;
+  removeCard(graveyard, action.payload.sequence);
 };
 
-export const addCemeteryIdleInteractivitiesImpl: DuelReducer<{
+export const addGraveyardIdleInteractivitiesImpl: DuelReducer<{
   player: number;
   sequence: number;
   interactivity: Interactivity<number>;
 }> = (state, action) => {
-  const cemetery = judgeSelf(action.payload.player, state)
-    ? state.meCemetery
-    : state.opCemetery;
+  const graveyard = judgeSelf(action.payload.player, state)
+    ? state.meGraveyard
+    : state.opGraveyard;
   extendIdleInteractivities(
-    cemetery,
+    graveyard,
     action.payload.sequence,
     action.payload.interactivity
   );
 };
 
-export const selectMeCemetery = (state: RootState) =>
-  state.duel.meCemetery || { inner: [] };
-export const selectOpCemetery = (state: RootState) =>
-  state.duel.opCemetery || { inner: [] };
+export const selectMeGraveyard = (state: RootState) =>
+  state.duel.meGraveyard || { inner: [] };
+export const selectOpGraveyard = (state: RootState) =>
+  state.duel.opGraveyard || { inner: [] };

src/reducers/duel/commonSlice.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+
 import {
   clearIdleInteractivities,
   clearPlaceInteractivities,
@@ -23,16 +24,16 @@ export const clearAllIdleInteractivitiesImpl: DuelReducer<number> = (
         state.meHands,
         state.meMonsters,
         state.meMagics,
-        state.meCemetery,
-        state.meExclusion,
+        state.meGraveyard,
+        state.meBanishedZone,
         state.meExtraDeck,
       ]
     : [
         state.opHands,
         state.opMonsters,
         state.opMagics,
-        state.opCemetery,
-        state.opExclusion,
+        state.opGraveyard,
+        state.opBanishedZone,
         state.opExtraDeck,
       ];
 
@@ -50,15 +51,15 @@ export const clearAllPlaceInteractivitiesImpl: DuelReducer<number> = (
         state.meHands,
         state.meMonsters,
         state.meMagics,
-        state.meCemetery,
-        state.meExclusion,
+        state.meGraveyard,
+        state.meBanishedZone,
       ]
     : [
         state.opHands,
         state.opMonsters,
         state.opMagics,
-        state.opCemetery,
-        state.opExclusion,
+        state.opGraveyard,
+        state.opBanishedZone,
       ];
 
   states.forEach((item) => clearPlaceInteractivities(item));
@@ -105,18 +106,18 @@ export const updateFieldDataImpl: DuelReducer<MsgUpdateData> = (
         break;
       }
       case ygopro.CardZone.GRAVE: {
-        const cemetery = judgeSelf(player, state)
-          ? state.meCemetery
-          : state.opCemetery;
-        updateCardData(cemetery, actions);
+        const graveyard = judgeSelf(player, state)
+          ? state.meGraveyard
+          : state.opGraveyard;
+        updateCardData(graveyard, actions);
 
         break;
       }
       case ygopro.CardZone.REMOVED: {
-        const exclusion = judgeSelf(player, state)
-          ? state.meExclusion
-          : state.opExclusion;
-        updateCardData(exclusion, actions);
+        const BanishedZone = judgeSelf(player, state)
+          ? state.meBanishedZone
+          : state.opBanishedZone;
+        updateCardData(BanishedZone, actions);
 
         break;
       }
@@ -139,10 +140,10 @@ export const reloadFieldImpl: DuelReducer<MsgReloadField> = (state, action) => {
   state.opMonsters = { inner: [] };
   state.meMagics = { inner: [] };
   state.opMagics = { inner: [] };
-  state.meCemetery = { inner: [] };
-  state.opCemetery = { inner: [] };
-  state.meExclusion = { inner: [] };
-  state.opExclusion = { inner: [] };
+  state.meGraveyard = { inner: [] };
+  state.opGraveyard = { inner: [] };
+  state.meBanishedZone = { inner: [] };
+  state.opBanishedZone = { inner: [] };
   state.meHands = { inner: [] };
   state.opHands = { inner: [] };
 
@@ -182,20 +183,20 @@ export const reloadFieldImpl: DuelReducer<MsgReloadField> = (state, action) => {
       player
     );
     // GRAVE
-    const cemetery = judgeSelf(player, state)
-      ? state.meCemetery
-      : state.opCemetery;
+    const graveyard = judgeSelf(player, state)
+      ? state.meGraveyard
+      : state.opGraveyard;
     reloadFieldMeta(
-      cemetery,
+      graveyard,
       reload.zone_actions.filter((item) => item.zone == ygopro.CardZone.GRAVE),
       player
     );
     // REMOVED
-    const exclusion = judgeSelf(player, state)
-      ? state.meExclusion
-      : state.opExclusion;
+    const banishedZone = judgeSelf(player, state)
+      ? state.meBanishedZone
+      : state.opBanishedZone;
     reloadFieldMeta(
-      exclusion,
+      banishedZone,
       reload.zone_actions.filter(
         (item) => item.zone == ygopro.CardZone.REMOVED
       ),

src/reducers/duel/deckSlice.ts

-import { judgeSelf } from "./util";
-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
-import { RootState } from "@/store";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { DuelFieldState, CardState } from "./generic";
+import { RootState } from "@/store";
+
+import { CardState, DuelFieldState } from "./generic";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 
 export interface DeckState extends DuelFieldState {}
 

src/reducers/duel/extraDeckSlice.ts

 import { ActionReducerMapBuilder } from "@reduxjs/toolkit";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import {
   createAsyncMetaThunk,
   createAsyncRepeatedMetaThunk,

src/reducers/duel/generic.ts

@@ -4,8 +4,10 @@ import {
   createAsyncThunk,
   PayloadAction,
 } from "@reduxjs/toolkit";
+
 import { CardMeta, fetchCard } from "@/api/cards";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+
 import { DuelState } from "./mod";
 import ReloadFieldAction = ygopro.StocGameMessage.MsgReloadField.ZoneAction;
 type UpdateDataAction = ReturnType<

src/reducers/duel/handsSlice.ts

@@ -3,20 +3,22 @@ import {
   CaseReducer,
   PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
+
+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
-import { judgeSelf } from "./util";
+
 import {
-  Interactivity,
-  DuelFieldState,
-  removeCard,
   createAsyncMetaThunk,
-  insertCard,
-  extendMeta,
   createAsyncRepeatedMetaThunk,
+  DuelFieldState,
+  extendMeta,
+  insertCard,
+  Interactivity,
+  removeCard,
   updateCardMeta,
 } from "./generic";
-import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 
 export interface HandState extends DuelFieldState {}
 

src/reducers/duel/hintSlice.ts

-import { createAsyncThunk, ActionReducerMapBuilder } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
-import { RootState } from "@/store";
-import { DESCRIPTION_LIMIT, fetchStrings, getStrings } from "@/api/strings";
-import { findCardByLocation } from "./util";
+import { ActionReducerMapBuilder, createAsyncThunk } from "@reduxjs/toolkit";
+
 import { fetchCard } from "@/api/cards";
-import { DuelReducer } from "./generic";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { DESCRIPTION_LIMIT, fetchStrings, getStrings } from "@/api/strings";
+import { RootState } from "@/store";
+
+import { DuelReducer } from "./generic";
+import { DuelState } from "./mod";
+import { findCardByLocation } from "./util";
 
 export interface HintState {
   code: number;

src/reducers/duel/initInfoSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import { DuelState } from "./mod";
 import { judgeSelf } from "./util";
 import MsgUpdateHp = ygopro.StocGameMessage.MsgUpdateHp;

src/reducers/duel/magicSlice.ts

-import { judgeSelf } from "./util";
 import {
-  PayloadAction,
-  CaseReducer,
   ActionReducerMapBuilder,
+  CaseReducer,
+  PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import {
+  clearIdleInteractivities,
+  clearPlaceInteractivities,
   createAsyncMetaThunk,
   DuelFieldState,
+  extendIdleInteractivities,
   extendOccupant,
   extendPlaceInteractivity,
-  clearPlaceInteractivities,
-  removeOccupant,
   Interactivity,
-  extendIdleInteractivities,
-  clearIdleInteractivities,
+  removeOccupant,
   setPosition,
 } from "./generic";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 
 export interface MagicState extends DuelFieldState {}
 

src/reducers/duel/mod.ts

@@ -3,121 +3,123 @@
  *
  * */
 
-import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { InitInfo, infoInitImpl, updateHpImpl } from "./initInfoSlice";
-import { TimeLimit, updateTimeLimitImpl } from "./timeLimit";
+
+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { RootState } from "@/store";
+
+import {
+  addBanishedZoneIdleInteractivitiesImpl,
+  banishedZoneCase,
+  BanishedZoneState,
+  initBanishedZoneImpl,
+  removeBanishedZoneImpl,
+} from "./banishedZoneSlice";
+import {
+  addGraveyardIdleInteractivitiesImpl,
+  graveyardCase,
+  GraveyardState,
+  initGraveyardImpl,
+  removeGraveyardImpl,
+} from "./cemeretySlice";
+import {
+  clearAllIdleInteractivitiesImpl,
+  clearAllPlaceInteractivitiesImpl,
+  reloadFieldImpl,
+  updateFieldDataImpl,
+} from "./commonSlice";
+import { DeckState, initDeckImpl } from "./deckSlice";
+import {
+  addExtraDeckIdleInteractivitiesImpl,
+  extraDeckCase,
+  ExtraDeckState,
+  removeExtraDeckImpl,
+} from "./extraDeckSlice";
 import {
-  HandState,
-  handsCase,
-  clearHandsIdleInteractivityImpl,
   addHandsIdleInteractivityImpl,
+  clearHandsIdleInteractivityImpl,
+  handsCase,
+  HandState,
   removeHandImpl,
 } from "./handsSlice";
-import { newTurnImpl } from "./turnSlice";
+import { hintCase, HintState, initHintImpl } from "./hintSlice";
+import { infoInitImpl, InitInfo, updateHpImpl } from "./initInfoSlice";
 import {
-  newPhaseImpl,
-  PhaseState,
-  setEnableBpImpl,
-  setEnableM2Impl,
-  setEnableEpImpl,
-} from "./phaseSlice";
-import { RootState } from "@/store";
-import { HintState, hintCase, initHintImpl } from "./hintSlice";
+  addMagicIdleInteractivitiesImpl,
+  addMagicPlaceInteractivitiesImpl,
+  clearMagicIdleInteractivitiesImpl,
+  clearMagicPlaceInteractivitiesImpl,
+  initMagicsImpl,
+  magicCase,
+  MagicState,
+  removeMagicImpl,
+  setMagicPositionImpl,
+} from "./magicSlice";
 import {
+  checkCardModalCase,
+  checkCardModalV2Case,
+  checkCardModalV3Case,
+  clearCheckCounterImpl,
   ModalState,
+  optionModalCase,
+  resetCheckCardModalImpl,
+  resetCheckCardModalV2Impl,
+  resetCheckCardModalV3Impl,
+  resetOptionModalImpl,
+  resetPositionModalImpl,
+  resetSortCardModalImpl,
+  setCardListModalInfoImpl,
+  setCardListModalIsOpenImpl,
+  setCardModalCountersImpl,
+  setCardModalInteractiviesImpl,
   setCardModalIsOpenImpl,
   setCardModalMetaImpl,
-  setCardModalInteractiviesImpl,
-  setCardListModalIsOpenImpl,
-  setCardListModalInfoImpl,
+  setCheckCardMOdalCancelAbleImpl,
+  setCheckCardModalCancelResponseImpl,
   setCheckCardModalIsOpenImpl,
   setCheckCardModalMinMaxImpl,
   setCheckCardModalOnSubmitImpl,
-  setCheckCardMOdalCancelAbleImpl,
-  setCheckCardModalCancelResponseImpl,
-  resetCheckCardModalImpl,
-  setYesNoModalIsOpenImpl,
-  checkCardModalCase,
-  YesNoModalCase,
-  setPositionModalIsOpenImpl,
-  setPositionModalPositionsImpl,
-  resetPositionModalImpl,
-  setOptionModalIsOpenImpl,
-  resetOptionModalImpl,
-  optionModalCase,
-  setCheckCardModalV2IsOpenImpl,
   setCheckCardModalV2CancelAbleImpl,
-  setCheckCardModalV2MinMaxImpl,
   setCheckCardModalV2FinishAbleImpl,
-  resetCheckCardModalV2Impl,
+  setCheckCardModalV2IsOpenImpl,
+  setCheckCardModalV2MinMaxImpl,
   setCheckCardModalV2ResponseAbleImpl,
-  checkCardModalV2Case,
+  setCheckCardModalV3AllLevelImpl,
   setCheckCardModalV3IsOpenImpl,
   setCheckCardModalV3MinMaxImpl,
-  setCheckCardModalV3AllLevelImpl,
   setCheckCardModalV3OverFlowImpl,
   setCheckCardModalV3ResponseAbleImpl,
-  resetCheckCardModalV3Impl,
-  checkCardModalV3Case,
-  setCardModalCountersImpl,
   setCheckCounterImpl,
-  clearCheckCounterImpl,
+  setOptionModalIsOpenImpl,
+  setPositionModalIsOpenImpl,
+  setPositionModalPositionsImpl,
   setSortCardModalIsOpenImpl,
-  resetSortCardModalImpl,
+  setYesNoModalIsOpenImpl,
   sortCardModalCase,
+  YesNoModalCase,
 } from "./modal/mod";
 import {
-  MonsterState,
-  initMonstersImpl,
-  addMonsterPlaceInteractivitiesImpl,
-  clearMonsterPlaceInteractivitiesImpl,
   addMonsterIdleInteractivitiesImpl,
+  addMonsterPlaceInteractivitiesImpl,
   clearMonsterIdleInteractivitiesImpl,
+  clearMonsterPlaceInteractivitiesImpl,
+  initMonstersImpl,
+  monsterCase,
+  MonsterState,
   removeMonsterImpl,
-  setMonsterPositionImpl,
   removeOverlayImpl,
+  setMonsterPositionImpl,
   updateMonsterCountersImpl,
-  monsterCase,
 } from "./monstersSlice";
 import {
-  MagicState,
-  initMagicsImpl,
-  addMagicPlaceInteractivitiesImpl,
-  clearMagicPlaceInteractivitiesImpl,
-  addMagicIdleInteractivitiesImpl,
-  clearMagicIdleInteractivitiesImpl,
-  removeMagicImpl,
-  setMagicPositionImpl,
-  magicCase,
-} from "./magicSlice";
-import {
-  CemeteryState,
-  initCemeteryImpl,
-  removeCemeteryImpl,
-  cemeteryCase,
-  addCemeteryIdleInteractivitiesImpl,
-} from "./cemeretySlice";
-import {
-  ExclusionState,
-  initExclusionImpl,
-  removeExclusionImpl,
-  exclusionCase,
-  addExclusionIdleInteractivitiesImpl,
-} from "./exclusionSlice";
-import { DeckState, initDeckImpl } from "./deckSlice";
-import {
-  clearAllIdleInteractivitiesImpl,
-  clearAllPlaceInteractivitiesImpl,
-  updateFieldDataImpl,
-  reloadFieldImpl,
-} from "./commonSlice";
-import {
-  ExtraDeckState,
-  extraDeckCase,
-  removeExtraDeckImpl,
-  addExtraDeckIdleInteractivitiesImpl,
-} from "./extraDeckSlice";
+  newPhaseImpl,
+  PhaseState,
+  setEnableBpImpl,
+  setEnableEpImpl,
+  setEnableM2Impl,
+} from "./phaseSlice";
+import { TimeLimit, updateTimeLimitImpl } from "./timeLimit";
+import { newTurnImpl } from "./turnSlice";
 import MsgWin = ygopro.StocGameMessage.MsgWin;
 
 export interface DuelState {
@@ -134,11 +136,11 @@ export interface DuelState {
   meMagics?: MagicState; // 自己的魔法陷阱区状态
   opMagics?: MagicState; // 对手的魔法陷阱区状态
 
-  meCemetery?: CemeteryState; // 自己的墓地状态
-  opCemetery?: CemeteryState; // 对手的墓地状态
+  meGraveyard?: GraveyardState; // 自己的墓地状态
+  opGraveyard?: GraveyardState; // 对手的墓地状态
 
-  meExclusion?: ExclusionState; // 自己的除外区状态
-  opExclusion?: ExclusionState; // 对手的除外区状态
+  meBanishedZone?: BanishedZoneState; // 自己的除外区状态
+  opBanishedZone?: BanishedZoneState; // 对手的除外区状态
 
   meDeck?: DeckState; // 自己的卡组状态
   opDeck?: DeckState; // 对手的卡组状态
@@ -237,14 +239,14 @@ const duelSlice = createSlice({
     removeMagic: removeMagicImpl,
 
     // 墓地相关`Reducer`
-    initCemetery: initCemeteryImpl,
-    removeCemetery: removeCemeteryImpl,
-    addCemeteryIdleInteractivities: addCemeteryIdleInteractivitiesImpl,
+    initGraveyard: initGraveyardImpl,
+    removeGraveyard: removeGraveyardImpl,
+    addGraveyardIdleInteractivities: addGraveyardIdleInteractivitiesImpl,
 
     // 除外区相关`Reducer`
-    initExclusion: initExclusionImpl,
-    removeExclusion: removeExclusionImpl,
-    addExclusionIdleInteractivities: addExclusionIdleInteractivitiesImpl,
+    initBanishedZone: initBanishedZoneImpl,
+    removeBanishedZone: removeBanishedZoneImpl,
+    addBanishedZoneIdleInteractivities: addBanishedZoneIdleInteractivitiesImpl,
 
     // 卡组相关`Reducer`
     initDeck: initDeckImpl,
@@ -324,8 +326,8 @@ const duelSlice = createSlice({
     hintCase(builder);
     monsterCase(builder);
     magicCase(builder);
-    cemeteryCase(builder);
-    exclusionCase(builder);
+    graveyardCase(builder);
+    banishedZoneCase(builder);
     extraDeckCase(builder);
     checkCardModalCase(builder);
     YesNoModalCase(builder);
@@ -368,9 +370,9 @@ export const {
   setMagicPosition,
   removeMagic,
   removeHand,
-  initCemetery,
-  removeCemetery,
-  addCemeteryIdleInteractivities,
+  initGraveyard,
+  removeGraveyard,
+  addGraveyardIdleInteractivities,
   setCardListModalIsOpen,
   setCardListModalInfo,
   setCheckCardModalIsOpen,
@@ -388,9 +390,9 @@ export const {
   initDeck,
   removeExtraDeck,
   addExtraDeckIdleInteractivities,
-  initExclusion,
-  removeExclusion,
-  addExclusionIdleInteractivities,
+  initBanishedZone,
+  removeBanishedZone,
+  addBanishedZoneIdleInteractivities,
   setCheckCardModalV2IsOpen,
   setCheckCardModalV2MinMax,
   setCheckCardModalV2CancelAble,

src/reducers/duel/modal/cardListModalSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
-import { DuelState } from "../mod";
-import { RootState } from "@/store";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { CardMeta } from "@/api/cards";
+import { RootState } from "@/store";
+
+import { DuelState } from "../mod";
 
 // 更新卡牌列表弹窗打开状态
 export const setCardListModalIsOpenImpl: CaseReducer<

src/reducers/duel/modal/cardModalSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
-import { DuelState } from "../mod";
-import { RootState } from "@/store";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { CardMeta } from "@/api/cards";
+import { RootState } from "@/store";
+
+import { DuelState } from "../mod";
 
 // 更新卡牌弹窗打开状态
 export const setCardModalIsOpenImpl: CaseReducer<

src/reducers/duel/modal/checkCardModalSlice.ts

 import {
-  PayloadAction,
+  ActionReducerMapBuilder,
   CaseReducer,
   createAsyncThunk,
-  ActionReducerMapBuilder,
+  PayloadAction,
 } from "@reduxjs/toolkit";
+
+import { fetchCard, getCardStr } from "@/api/cards";
+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import { DuelState } from "../mod";
 import { cmpCardLocation, findCardByLocation, judgeSelf } from "../util";
-import { fetchCard, getCardStr } from "@/api/cards";
-import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 
 // 更新卡牌选择弹窗打开状态
 export const setCheckCardModalIsOpenImpl: CaseReducer<

src/reducers/duel/modal/checkCardModalV2Slice.ts

-import { DuelState } from "../mod";
-import { DuelReducer } from "../generic";
 import {
   ActionReducerMapBuilder,
   CaseReducer,
   createAsyncThunk,
 } from "@reduxjs/toolkit";
+
 import { fetchCard } from "@/api/cards";
-import { RootState } from "@/store";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { RootState } from "@/store";
+
+import { DuelReducer } from "../generic";
+import { DuelState } from "../mod";
 import { findCardByLocation } from "../util";
 
 // 更新打开状态

src/reducers/duel/modal/checkCardModalV3Slice.ts

-import { DuelState } from "../mod";
-import { DuelReducer } from "../generic";
 import {
   ActionReducerMapBuilder,
   CaseReducer,
   createAsyncThunk,
 } from "@reduxjs/toolkit";
+
 import { fetchCard } from "@/api/cards";
-import { RootState } from "@/store";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { RootState } from "@/store";
+
+import { DuelReducer } from "../generic";
+import { DuelState } from "../mod";
 import { findCardByLocation } from "../util";
 
 // 更新打开状态

src/reducers/duel/modal/checkCounterModalSlice.ts

 // 后续对于`MSG_SELECT_XXX`的处理UI都尽量用`Babylon.js`实现而不会通过`Antd`的`Modal`实现，因此这里不追求工程质量，暂时简单实现下。
-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import { DuelState } from "../mod";
 import { findCardByLocation } from "../util";
-import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 type SelectCounter = ReturnType<
   typeof ygopro.StocGameMessage.MsgSelectCounter.prototype.toObject
 >;

src/reducers/duel/modal/mod.ts

@@ -114,13 +114,13 @@ export interface ModalState {
   };
 }
 
-export * from "./cardModalSlice";
 export * from "./cardListModalSlice";
+export * from "./cardModalSlice";
 export * from "./checkCardModalSlice";
-export * from "./yesNoModalSlice";
-export * from "./positionModalSlice";
-export * from "./optionModalSlice";
 export * from "./checkCardModalV2Slice";
 export * from "./checkCardModalV3Slice";
 export * from "./checkCounterModalSlice";
+export * from "./optionModalSlice";
+export * from "./positionModalSlice";
 export * from "./sortCardModalSlice";
+export * from "./yesNoModalSlice";

src/reducers/duel/modal/optionModalSlice.ts

 import {
-  PayloadAction,
+  ActionReducerMapBuilder,
   CaseReducer,
   createAsyncThunk,
-  ActionReducerMapBuilder,
+  PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "../mod";
+
 import { fetchCard, getCardStr } from "@/api/cards";
 import { RootState } from "@/store";
 
+import { DuelState } from "../mod";
+
 export const setOptionModalIsOpenImpl: CaseReducer<
   DuelState,
   PayloadAction<boolean>

src/reducers/duel/modal/positionModalSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
+import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import { DuelState } from "../mod";
-import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 
 export const setPositionModalIsOpenImpl: CaseReducer<
   DuelState,

src/reducers/duel/modal/sortCardModalSlice.ts

@@ -3,9 +3,11 @@ import {
   CaseReducer,
   createAsyncThunk,
 } from "@reduxjs/toolkit";
+
 import { fetchCard } from "@/api/cards";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import { DuelReducer } from "../generic";
 import { DuelState } from "../mod";
 type SortCard = ReturnType<

src/reducers/duel/modal/yesNoModalSlice.ts

 import {
-  PayloadAction,
+  ActionReducerMapBuilder,
   CaseReducer,
   createAsyncThunk,
-  ActionReducerMapBuilder,
+  PayloadAction,
 } from "@reduxjs/toolkit";
+
 import { CardMeta, fetchCard } from "@/api/cards";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { fetchStrings, getStrings } from "@/api/strings";
 import { RootState } from "@/store";
+
 import { DuelState } from "../mod";
 
 // 更新YesNo弹窗是否打开状态

src/reducers/duel/monstersSlice.ts

-import { judgeSelf } from "./util";
 import {
-  PayloadAction,
-  CaseReducer,
   ActionReducerMapBuilder,
+  CaseReducer,
   createAsyncThunk,
+  PayloadAction,
 } from "@reduxjs/toolkit";
-import { DuelState } from "./mod";
+
+import { fetchCard } from "@/api/cards";
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { RootState } from "@/store";
+
 import {
-  DuelFieldState,
-  Interactivity,
+  clearIdleInteractivities,
+  clearPlaceInteractivities,
   createAsyncMetaThunk,
+  DuelFieldState,
+  extendIdleInteractivities,
   extendOccupant,
   extendPlaceInteractivity,
-  clearPlaceInteractivities,
+  Interactivity,
   removeOccupant,
-  extendIdleInteractivities,
-  clearIdleInteractivities,
-  setPosition,
   removeOverlay,
+  setPosition,
 } from "./generic";
-import { fetchCard } from "@/api/cards";
+import { DuelState } from "./mod";
+import { judgeSelf } from "./util";
 type MsgUpdateCounter = ReturnType<
   typeof ygopro.StocGameMessage.MsgUpdateCounter.prototype.toObject
 >;

src/reducers/duel/phaseSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
+
 import { DuelState } from "./mod";
 
 export interface PhaseState {

src/reducers/duel/timeLimit.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { DuelState } from "./mod";
 import { judgeSelf } from "./util";
 

src/reducers/duel/turnSlice.ts

-import { PayloadAction, CaseReducer } from "@reduxjs/toolkit";
+import { CaseReducer, PayloadAction } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
+
 import { DuelState } from "./mod";
 import { judgeSelf } from "./util";
 

src/reducers/duel/util.ts

@@ -3,10 +3,12 @@
  *
  * */
 
-import { DuelState } from "./mod";
 import { Draft } from "@reduxjs/toolkit";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+
 import { CardState } from "./generic";
+import { DuelState } from "./mod";
 
 type Location =
   | ygopro.CardLocation
@@ -59,15 +61,15 @@ export function findCardByLocation(
       return magics?.inner.find(finder);
     }
     case ygopro.CardZone.REMOVED: {
-      const exclusions = judgeSelf(controler, state)
-        ? state.meExclusion
-        : state.opExclusion;
-      return exclusions?.inner.find(finder);
+      const banishedZones = judgeSelf(controler, state)
+        ? state.meBanishedZone
+        : state.opBanishedZone;
+      return banishedZones?.inner.find(finder);
     }
     case ygopro.CardZone.GRAVE: {
       const cemerety = judgeSelf(controler, state)
-        ? state.meCemetery
-        : state.opCemetery;
+        ? state.meGraveyard
+        : state.opGraveyard;
       return cemerety?.inner.find(finder);
     }
     default: {

src/reducers/joinSlice.ts

@@ -3,6 +3,7 @@
  *
  * */
 import { createSlice } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
 
 export interface JoinState {

src/reducers/moraSlice.ts

@@ -3,6 +3,7 @@
  *
  * */
 import { createSlice } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
 
 export interface moraState {

src/reducers/playerSlice.ts

@@ -3,6 +3,7 @@
  *
  * */
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
 import { RootState } from "@/store";
 
 export interface Player {

src/service/duel/draw.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import { fetchHandsMeta } from "@/reducers/duel/handsSlice";
 import { fetchEsHintMeta } from "@/reducers/duel/hintSlice";
+import { AppDispatch } from "@/store";
 
 export default (
   draw: ygopro.StocGameMessage.MsgDraw,

src/service/duel/gameMsg.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { setWaiting } from "@/reducers/duel/mod";
 import { store } from "@/store";
-import onMsgStart from "./start";
+
+import onMsgAttack from "./attack";
+import onMsgAttackDisable from "./attackDisable";
+import onMsgChaining from "./chaining";
 import onMsgDraw from "./draw";
-import onMsgNewTurn from "./newTurn";
-import onMsgNewPhase from "./newPhase";
+import onMsgFilpSummoned from "./flipSummoned";
+import onMsgFlipSummoning from "./flipSummoning";
 import onMsgHint from "./hint";
-import onMsgSelectIdleCmd from "./selectIdleCmd";
-import onMsgSelectPlace from "./selectPlace";
 import onMsgMove from "./move";
+import onMsgNewPhase from "./newPhase";
+import onMsgNewTurn from "./newTurn";
+import onMsgPosChange from "./posChange";
+import onMsgReloadField from "./reloadField";
+import onMsgSelectBattleCmd from "./selectBattleCmd";
 import onMsgSelectCard from "./selectCard";
 import onMsgSelectChain from "./selectChain";
+import onMsgSelectCounter from "./selectCounter";
 import onMsgSelectEffectYn from "./selectEffectYn";
-import onMsgSelectPosition from "./selectPosition";
+import onMsgSelectIdleCmd from "./selectIdleCmd";
 import onMsgSelectOption from "./selectOption";
-import onMsgShuffleHand from "./shuffleHand";
-import onMsgSelectBattleCmd from "./selectBattleCmd";
-import onMsgPosChange from "./posChange";
-import onMsgSelectUnselectCard from "./selectUnselectCard";
-import onMsgSelectYesNo from "./selectYesNo";
-import onMsgUpdateHp from "./updateHp";
-import onMsgWin from "./win";
-import onMsgWait from "./wait";
-import onUnimplemented from "./unimplemented";
-import onMsgUpdateData from "./updateData";
-import onMsgReloadField from "./reloadField";
+import onMsgSelectPlace from "./selectPlace";
+import onMsgSelectPosition from "./selectPosition";
 import onMsgSelectSum from "./selectSum";
 import onMsgSelectTribute from "./selectTribute";
-import onMsgUpdateCounter from "./updateCounter";
-import onMsgSelectCounter from "./selectCounter";
-import onMsgSortCard from "./sortCard";
+import onMsgSelectUnselectCard from "./selectUnselectCard";
+import onMsgSelectYesNo from "./selectYesNo";
 import onMsgSet from "./set";
-import onMsgSwap from "./swap";
-import onMsgAttack from "./attack";
-import onMsgAttackDisable from "./attackDisable";
-import onMsgChaining from "./chaining";
-import onMsgFlipSummoning from "./flipSummoning";
-import onMsgFilpSummoned from "./flipSummoned";
-import onMsgSpSummoning from "./spSummoning";
+import onMsgShuffleHand from "./shuffleHand";
+import onMsgSortCard from "./sortCard";
 import onMsgSpSummoned from "./spSummoned";
-import onMsgSummoning from "./summoning";
+import onMsgSpSummoning from "./spSummoning";
+import onMsgStart from "./start";
 import onMsgSummoned from "./summoned";
-import { setWaiting } from "@/reducers/duel/mod";
+import onMsgSummoning from "./summoning";
+import onMsgSwap from "./swap";
+import onUnimplemented from "./unimplemented";
+import onMsgUpdateCounter from "./updateCounter";
+import onMsgUpdateData from "./updateData";
+import onMsgUpdateHp from "./updateHp";
+import onMsgWait from "./wait";
+import onMsgWin from "./win";
 
 const ActiveList = [
   "select_idle_cmd",

src/service/duel/hint.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import {
   fetchCommonHintMeta,
   fetchEsHintMeta,
   fetchSelectHintMeta,
 } from "@/reducers/duel/hintSlice";
+import { AppDispatch } from "@/store";
 import MsgHint = ygopro.StocGameMessage.MsgHint;
 
 export default (hint: MsgHint, dispatch: AppDispatch) => {

src/service/duel/move.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import MsgMove = ygopro.StocGameMessage.MsgMove;
-import { AppDispatch } from "@/store";
-import {
-  fetchMonsterMeta,
-  fetchOverlayMeta,
-} from "@/reducers/duel/monstersSlice";
+import { fetchBanishedZoneMeta } from "@/reducers/duel/banishedZoneSlice";
+import { fetchGraveyardMeta } from "@/reducers/duel/cemeretySlice";
+import { fetchExtraDeckMeta } from "@/reducers/duel/extraDeckSlice";
+import { insertHandMeta } from "@/reducers/duel/handsSlice";
+import { fetchMagicMeta } from "@/reducers/duel/magicSlice";
 import {
-  removeCemetery,
-  removeExclusion,
+  removeBanishedZone,
   removeExtraDeck,
+  removeGraveyard,
   removeHand,
   removeMagic,
   removeMonster,
   removeOverlay,
 } from "@/reducers/duel/mod";
-import { fetchMagicMeta } from "@/reducers/duel/magicSlice";
-import { fetchCemeteryMeta } from "@/reducers/duel/cemeretySlice";
-import { insertHandMeta } from "@/reducers/duel/handsSlice";
-import { fetchExclusionMeta } from "@/reducers/duel/exclusionSlice";
-import { fetchExtraDeckMeta } from "@/reducers/duel/extraDeckSlice";
+import {
+  fetchMonsterMeta,
+  fetchOverlayMeta,
+} from "@/reducers/duel/monstersSlice";
+import { AppDispatch } from "@/store";
+
 import { REASON_MATERIAL } from "../../common";
 
 const OVERLAY_STACK: { code: number; sequence: number }[] = [];
@@ -51,14 +52,17 @@ export default (move: MsgMove, dispatch: AppDispatch) => {
     }
     case ygopro.CardZone.GRAVE: {
       dispatch(
-        removeCemetery({ controler: from.controler, sequence: from.sequence })
+        removeGraveyard({ controler: from.controler, sequence: from.sequence })
       );
 
       break;
     }
     case ygopro.CardZone.REMOVED: {
       dispatch(
-        removeExclusion({ controler: from.controler, sequence: from.sequence })
+        removeBanishedZone({
+          controler: from.controler,
+          sequence: from.sequence,
+        })
       );
 
       break;
@@ -127,7 +131,7 @@ export default (move: MsgMove, dispatch: AppDispatch) => {
     }
     case ygopro.CardZone.GRAVE: {
       dispatch(
-        fetchCemeteryMeta({
+        fetchGraveyardMeta({
           controler: to.controler,
           sequence: to.sequence,
           code,
@@ -145,7 +149,7 @@ export default (move: MsgMove, dispatch: AppDispatch) => {
     }
     case ygopro.CardZone.REMOVED: {
       dispatch(
-        fetchExclusionMeta({
+        fetchBanishedZoneMeta({
           controler: to.controler,
           sequence: to.sequence,
           code,

src/service/duel/newPhase.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import { updatePhase } from "@/reducers/duel/mod";
+import { AppDispatch } from "@/store";
 
 export default (
   newPhase: ygopro.StocGameMessage.MsgNewPhase,

src/service/duel/newTurn.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import { updateTurn } from "@/reducers/duel/mod";
+import { AppDispatch } from "@/store";
 
 export default (
   newTurn: ygopro.StocGameMessage.MsgNewTurn,

src/service/duel/selectBattleCmd.ts

 import { ActionCreatorWithPayload } from "@reduxjs/toolkit";
+
 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { Interactivity, InteractType } from "@/reducers/duel/generic";
 import {

src/service/duel/selectCard.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import {
   setCheckCardModalIsOpen,
   setCheckCardModalMinMax,
   setCheckCardModalOnSubmit,
 } from "@/reducers/duel/mod";
 import { fetchCheckCardMeta } from "@/reducers/duel/modal/mod";
+import { AppDispatch } from "@/store";
 import MsgSelectCard = ygopro.StocGameMessage.MsgSelectCard;
 import { CardZoneToChinese } from "./util";
 

src/service/duel/selectChain.ts

@@ -10,6 +10,7 @@ import {
 } from "@/reducers/duel/mod";
 import { fetchCheckCardMeta } from "@/reducers/duel/modal/mod";
 import { AppDispatch } from "@/store";
+
 import { CardZoneToChinese } from "./util";
 import MsgSelectChain = ygopro.StocGameMessage.MsgSelectChain;
 

src/service/duel/selectEffectYn.ts

@@ -3,6 +3,7 @@ import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { setYesNoModalIsOpen } from "@/reducers/duel/mod";
 import { fetchYesNoMeta } from "@/reducers/duel/modal/mod";
 import { AppDispatch } from "@/store";
+
 import { CardZoneToChinese } from "./util";
 import MsgSelectEffectYn = ygopro.StocGameMessage.MsgSelectEffectYn;
 

src/service/duel/selectIdleCmd.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import { Interactivity, InteractType } from "@/reducers/duel/generic";
 import {
+  addBanishedZoneIdleInteractivities,
+  addExtraDeckIdleInteractivities,
+  addGraveyardIdleInteractivities,
   addHandsIdleInteractivity,
-  addMonsterIdleInteractivities,
   addMagicIdleInteractivities,
+  addMonsterIdleInteractivities,
+  clearAllIdleInteractivities,
   setEnableBp,
   setEnableEp,
-  addCemeteryIdleInteractivities,
-  clearAllIdleInteractivities,
-  addExclusionIdleInteractivities,
-  addExtraDeckIdleInteractivities,
 } from "@/reducers/duel/mod";
+import { AppDispatch } from "@/store";
 import MsgSelectIdleCmd = ygopro.StocGameMessage.MsgSelectIdleCmd;
 import { ActionCreatorWithPayload } from "@reduxjs/toolkit";
 
@@ -83,12 +83,12 @@ export default (selectIdleCmd: MsgSelectIdleCmd, dispatch: AppDispatch) => {
           break;
         }
         case ygopro.CardZone.GRAVE: {
-          dispatcher(data, interactType, addCemeteryIdleInteractivities);
+          dispatcher(data, interactType, addGraveyardIdleInteractivities);
 
           break;
         }
         case ygopro.CardZone.REMOVED: {
-          dispatcher(data, interactType, addExclusionIdleInteractivities);
+          dispatcher(data, interactType, addBanishedZoneIdleInteractivities);
 
           break;
         }

src/service/duel/selectPlace.ts

@@ -2,8 +2,8 @@ import { ygopro } from "@/api/ocgcore/idl/ocgcore";
 import { AppDispatch } from "@/store";
 import MsgSelectPlace = ygopro.StocGameMessage.MsgSelectPlace;
 import {
-  addMonsterPlaceInteractivities,
   addMagicPlaceInteractivities,
+  addMonsterPlaceInteractivities,
 } from "@/reducers/duel/mod";
 
 export default (selectPlace: MsgSelectPlace, dispatch: AppDispatch) => {

src/service/duel/start.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { AppDispatch } from "@/store";
 import {
   infoInit,
-  setSelfType,
-  initMonsters,
-  initMagics,
-  initCemetery,
+  initBanishedZone,
   initDeck,
-  initExclusion,
+  initGraveyard,
   initHint,
+  initMagics,
+  initMonsters,
+  setSelfType,
 } from "@/reducers/duel/mod";
+import { AppDispatch } from "@/store";
 
 export default (
   start: ygopro.StocGameMessage.MsgStart,
@@ -40,11 +40,11 @@ export default (
   dispatch(initMonsters(1));
   dispatch(initMagics(0));
   dispatch(initMagics(1));
-  dispatch(initCemetery(0));
-  dispatch(initCemetery(1));
+  dispatch(initGraveyard(0));
+  dispatch(initGraveyard(1));
   dispatch(initDeck({ player: 0, deskSize: start.deckSize1 }));
   dispatch(initDeck({ player: 1, deskSize: start.deckSize2 }));
-  dispatch(initExclusion(0));
-  dispatch(initExclusion(1));
+  dispatch(initBanishedZone(0));
+  dispatch(initBanishedZone(1));
   dispatch(initHint());
 };

src/service/duel/timeLimit.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { store } from "@/store";
-import { updateTimeLimit } from "@/reducers/duel/mod";
 import { sendTimeConfirm } from "@/api/ocgcore/ocgHelper";
+import { updateTimeLimit } from "@/reducers/duel/mod";
+import { store } from "@/store";
 
 export default function handleTimeLimit(timeLimit: ygopro.StocTimeLimit) {
   const dispatch = store.dispatch;

src/service/duel/unimplemented.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
+import { useConfig } from "@/config";
 import { setUnimplemented } from "@/reducers/duel/mod";
 import { AppDispatch } from "@/store";
-import NeosConfig from "../../../neos.config.json";
+
+const NeosConfig = useConfig();
 
 export default (
   unimplemented: ygopro.StocGameMessage.MsgUnimplemented,

src/service/mora/deckCount.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { store } from "@/store";
 import { player0DeckInfo, player1DeckInfo } from "@/reducers/playerSlice";
+import { store } from "@/store";
 
 // FIXME: player0 不一定是当前玩家
 export default function handleDeckCount(pb: ygopro.YgoStocMsg) {

src/service/mora/selectHand.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { store } from "@/store";
 import { selectHandAble } from "@/reducers/moraSlice";
+import { store } from "@/store";
 
 export default function handleSelectHand(_: ygopro.YgoStocMsg) {
   const dispatch = store.dispatch;

src/service/mora/selectTp.ts

 import { ygopro } from "@/api/ocgcore/idl/ocgcore";
-import { store } from "@/store";
 import { selectTpAble } from "@/reducers/moraSlice";
+import { store } from "@/store";
 
 export default function handleSelectTp(_: ygopro.YgoStocMsg) {
   const dispatch = store.dispatch;

src/service/onSocketMessage.ts

@@ -2,20 +2,21 @@
  * 长连接消息事件订阅处理逻辑
  *
  * */
-import handleHsPlayerChange from "./room/hsPlayerChange";
-import handleTypeChange from "./room/typeChange";
-import handleHsPlayerEnter from "./room/hsPlayerEnter";
-import handleJoinGame from "./room/joinGame";
-import handleChat from "./room/chat";
-import handleHsWatchChange from "./room/hsWatchChange";
-import { YgoProPacket } from "@/api/ocgcore/ocgAdapter/packet";
 import { adaptStoc } from "@/api/ocgcore/ocgAdapter/adapter";
-import handleSelectHand from "./mora/selectHand";
-import handleSelectTp from "./mora/selectTp";
-import handleDeckCount from "./mora/deckCount";
+import { YgoProPacket } from "@/api/ocgcore/ocgAdapter/packet";
+
 import handleGameMsg from "./duel/gameMsg";
 import handleTimeLimit from "./duel/timeLimit";
+import handleDeckCount from "./mora/deckCount";
+import handleSelectHand from "./mora/selectHand";
+import handleSelectTp from "./mora/selectTp";
+import handleChat from "./room/chat";
 import handleDuelStart from "./room/duelStart";
+import handleHsPlayerChange from "./room/hsPlayerChange";
+import handleHsPlayerEnter from "./room/hsPlayerEnter";
+import handleHsWatchChange from "./room/hsWatchChange";
+import handleJoinGame from "./room/joinGame";
+import handleTypeChange from "./room/typeChange";
 
 /*
  * 先将从长连接中读取到的二进制数据通过Adapter转成protobuf结构体，