Merge branch 'feat/toss' into 'main'

Feat/toss

See merge request mycard/Neos!225

neos-protobuf @ b67b483c

-Subproject commit e6e23561a0f8e515a0168d87d72c281b7b9cca17
+Subproject commit b67b483ce9db064611619a2e1a8b8767b100d035

src/api/ocgcore/ocgAdapter/protoDecl.ts

@@ -61,3 +61,5 @@ export const MSG_ANNOUNCE_RACE = 140;
 export const MSG_ANNOUNCE_ATTRIB = 141;
 export const MSG_ANNOUNCE_CARD = 142;
 export const MSG_ANNOUNCE_NUMBER = 143;
+export const MSG_TOSS_COIN = 130;
+export const MSG_TOSS_DICE = 131;

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

@@ -35,6 +35,7 @@ import MsgSelectTributeAdapter from "./selectTribute";
 import MsgSelectUnselectCardAdapter from "./selectUnselectCard";
 import MsgSortCard from "./sortCard";
 import MsgStartAdapter from "./start";
+import MsgTossAdapter from "./toss";
 import MsgUpdateDataAdapter from "./updateData";
 import MsgWaitAdapter from "./wait";
 import MsgWin from "./win";
@@ -220,6 +221,22 @@ export default class GameMsgAdapter implements StocAdapter {
 
           break;
         }
+        case GAME_MSG.MSG_TOSS_COIN: {
+          gameMsg.toss = MsgTossAdapter(
+            gameData,
+            ygopro.StocGameMessage.MsgToss.TossType.COIN
+          );
+
+          break;
+        }
+        case GAME_MSG.MSG_TOSS_DICE: {
+          gameMsg.toss = MsgTossAdapter(
+            gameData,
+            ygopro.StocGameMessage.MsgToss.TossType.DICE
+          );
+
+          break;
+        }
         default: {
           gameMsg.unimplemented = new ygopro.StocGameMessage.MsgUnimplemented({
             command: func,

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

+import { BufferReader } from "../../../../../../rust-src/pkg/rust_src";
+import { ygopro } from "../../../idl/ocgcore";
+import MsgToss = ygopro.StocGameMessage.MsgToss;
+
+/*
+ * Msg Toss
+ * @param - TODO
+ *
+ * @usage 骰子/硬币结果
+ * */
+export default (data: Uint8Array, toss_type: MsgToss.TossType) => {
+  const reader = new BufferReader(data);
+  const player = reader.readUint8();
+  const count = reader.readUint8();
+
+  const res = [];
+  for (let i = 0; i < count; i++) {
+    res.push(reader.readUint8());
+  }
+
+  return new MsgToss({
+    player,
+    toss_type,
+    res,
+  });
+};

src/service/duel/gameMsg.ts

@@ -42,6 +42,7 @@ import onMsgStart from "./start";
 import onMsgSummoned from "./summoned";
 import onMsgSummoning from "./summoning";
 import onMsgSwap from "./swap";
+import onMsgToss from "./toss";
 import onUnimplemented from "./unimplemented";
 import onMsgUpdateCounter from "./updateCounter";
 import onMsgUpdateData from "./updateData";
@@ -303,6 +304,11 @@ async function _handleGameMsg(pb: ygopro.YgoStocMsg) {
 
       break;
     }
+    case "toss": {
+      onMsgToss(msg.toss);
+
+      break;
+    }
     case "unimplemented": {
       onUnimplemented(msg.unimplemented);
 

src/service/duel/toss.ts

+import { fetchStrings, ygopro } from "@/api";
+import { sleep } from "@/infra";
+import { matStore } from "@/stores";
+import MsgToss = ygopro.StocGameMessage.MsgToss;
+
+export default async (toss: MsgToss) => {
+  const player = toss.player;
+  const tossType = toss.toss_type;
+
+  const prefix = fetchStrings("!system", matStore.isMe(player) ? 102 : 103);
+
+  for (const x of toss.res) {
+    if (tossType == MsgToss.TossType.DICE) {
+      matStore.tossResult = prefix + fetchStrings("!system", 1624) + x;
+    } else if (tossType == MsgToss.TossType.COIN) {
+      matStore.tossResult =
+        prefix +
+        fetchStrings("!system", 1623) +
+        fetchStrings("!system", 61 - x);
+    } else {
+      console.log(`Unknown tossType = ${tossType}`);
+    }
+
+    // 等待1s，不然多个结果刷新太快了
+    await sleep(1000);
+  }
+};

src/stores/matStore/types.ts

@@ -37,6 +37,8 @@ export interface MatState {
 
   unimplemented: number; // 未处理的`Message`
 
+  tossResult?: string; // 骰子/硬币结果
+
   /**  根据自己的先后手判断是否是自己 */
   isMe: (player: number) => boolean;
 }

src/ui/Duel/Message/HintNotification.tsx

@@ -17,6 +17,7 @@ const NeosConfig = useConfig();
 export const HintNotification = () => {
   const snap = useSnapshot(matStore);
   const hintState = snap.hint;
+  const toss = snap.tossResult;
 
   const currentPhase = snap.phase.currentPhase;
   const waiting = snap.waiting;
@@ -35,6 +36,16 @@ export const HintNotification = () => {
     }
   }, [hintState.msg]);
 
+  useEffect(() => {
+    if (toss) {
+      api.open({
+        message: `${toss}`,
+        placement: "topLeft",
+        style: style,
+      });
+    }
+  }, [toss]);
+
   useEffect(() => {
     if (currentPhase) {
       const message = fetchStrings(