Merge branch 'fix/win' into 'main'

Fix/win

See merge request mycard/Neos!221

neos-protobuf @ b38ac93e

-Subproject commit 44727f7136ec5708c86d6ed09d5bec8b48f13efc
+Subproject commit b38ac93eef4ec235d1be4cfb689754a0e360e2ab

neos.config.json

@@ -23,8 +23,6 @@
       1,
       6,
       7,
-      30,
-      31,
       32,
       34,
       54,

neos.config.prod.json

@@ -23,8 +23,6 @@
       1,
       6,
       7,
-      30,
-      31,
       32,
       34,
       54,

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

@@ -12,18 +12,11 @@ import MsgWin = ygopro.StocGameMessage.MsgWin;
 export default (data: Uint8Array) => {
   const reader = new BufferReader(data);
 
-  const player = reader.readUint8();
-  const winType = reader.readUint8();
-
-  const type_ =
-    player == 0 || winType == 4
-      ? MsgWin.ActionType.Win
-      : player == 1
-      ? MsgWin.ActionType.Defeated
-      : MsgWin.ActionType.UNKNOWN;
+  const win_player = reader.readUint8();
+  const reason = reader.readUint8();
 
   return new MsgWin({
-    player,
-    type_,
+    win_player,
+    reason,
   });
 };

src/service/duel/win.ts

-import { ygopro } from "@/api";
+import { fetchStrings, ygopro } from "@/api";
 import { matStore } from "@/stores";
 import MsgWin = ygopro.StocGameMessage.MsgWin;
 
 export default (win: MsgWin) => {
-  const player = win.player;
-  if (matStore.isMe(player)) {
-    matStore.result = win.type_;
-  } else {
-    matStore.result =
-      win.type_ == MsgWin.ActionType.Win
-        ? MsgWin.ActionType.Defeated
-        : MsgWin.ActionType.Win;
-  }
+  const { win_player, reason } = win;
+  matStore.result = {
+    isWin: matStore.isMe(win_player),
+    reason: fetchStrings("!victory", `0x${reason.toString(16)}`),
+  };
 };

src/stores/matStore/store.ts

@@ -80,7 +80,6 @@ export const matStore: MatState = proxy<MatState>({
     enableM2: false, // 允许进入M2阶段
     enableEp: false, // 允许回合结束
   },
-  result: ygopro.StocGameMessage.MsgWin.ActionType.UNKNOWN,
   waiting: false,
   unimplemented: 0,
   // methods

src/stores/matStore/types.ts

@@ -28,7 +28,10 @@ export interface MatState {
 
   phase: PhaseState;
 
-  result: ygopro.StocGameMessage.MsgWin.ActionType;
+  result?: {
+    isWin: boolean;
+    reason: string;
+  };
 
   waiting: boolean;
 

src/ui/Duel/Message/CheckCounterModal.tsx

@@ -20,7 +20,7 @@ export const CheckCounterModal = () => {
   const counterName = fetchStrings(
     "!counter",
     `0x${snapCheckCounterModal.counterType!}`
-  );
+  ); // FIXME: 这里转十六进制的逻辑有问题
 
   const [selected, setSelected] = useState(new Array(options.length));
   const sum = selected.reduce((sum, current) => sum + current, 0);

src/ui/Duel/Message/HintNotification.tsx

@@ -2,7 +2,7 @@ import { notification } from "antd";
 import React, { useEffect } from "react";
 import { useSnapshot } from "valtio";
 
-import { fetchStrings, ygopro } from "@/api";
+import { fetchStrings } from "@/api";
 import { Phase2StringCodeMap } from "@/common";
 import { useConfig } from "@/config";
 import { matStore } from "@/stores";
@@ -13,8 +13,6 @@ const style = {
   backgroundColor: "#303030",
 };
 
-const MsgWin = ygopro.StocGameMessage.MsgWin;
-
 const NeosConfig = useConfig();
 export const HintNotification = () => {
   const snap = useSnapshot(matStore);
@@ -67,12 +65,7 @@ export const HintNotification = () => {
 
   useEffect(() => {
     if (result) {
-      const message =
-        result == MsgWin.ActionType.Win
-          ? "胜利"
-          : MsgWin.ActionType.Defeated
-          ? "失败"
-          : "未知结果";
+      const message = result.isWin ? "Win" : "Defeated" + " " + result.reason;
       api.open({
         message,
         placement: "bottom",