Merge branch 'fix/chain' into 'main'

Fix/chain

See merge request mycard/Neos!201

neos-protobuf @ 48be6a82

-Subproject commit c83175eb31577752e3ea02100e5f782f4417b654
+Subproject commit 48be6a827024995962fc479db1ec69bde38a72f6

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

@@ -114,6 +114,10 @@
     "protoType": "chain_solved",
     "fields": [{ "fieldName": "solved_index", "fieldType": "uint8"}]
   },
+  "74": {
+    "protoType": "chain_end",
+    "fields": []
+  },
   "75": {
     "protoType": "chain_solved",
     "fields": [{ "fieldName": "solved_index", "fieldType": "uint8"}]

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

@@ -31,6 +31,7 @@ const MsgConstructorMap: Map<string, Constructor> = new Map([
   ["chaining", ygopro.StocGameMessage.MsgChaining],
   ["attack_disable", ygopro.StocGameMessage.MsgAttackDisabled],
   ["chain_solved", ygopro.StocGameMessage.MsgChainSolved],
+  ["chain_end", ygopro.StocGameMessage.MsgChainEnd],
 ]);
 
 export interface penetrateType {

src/service/duel/chainEnd.ts

+import { ygopro } from "@/api";
+import { matStore } from "@/stores";
+
+export default (_chainEnd: ygopro.StocGameMessage.MsgChainEnd) => {
+  while (true) {
+    const chain = matStore.chains.pop();
+    if (chain === undefined) {
+      break;
+    }
+
+    matStore.setChained(chain, undefined);
+  }
+};

src/service/duel/chainSolved.ts

@@ -17,6 +17,8 @@ export default (chainSolved: ygopro.StocGameMessage.MsgChainSolved) => {
     // 设置被连锁状态为空
     matStore.setChained(location, undefined);
   } else {
-    console.warn("pop from chains return null!");
+    console.warn(
+      `pop from chains return null! solved_index=${chainSolved.solved_index}, len of chains in store=${matStore.chains.length}`
+    );
   }
 };

src/service/duel/gameMsg.ts

@@ -3,6 +3,7 @@ import { matStore } from "@/stores";
 
 import onMsgAttack from "./attack";
 import onMsgAttackDisable from "./attackDisable";
+import onMsgChainEnd from "./chainEnd";
 import onMsgChaining from "./chaining";
 import onMsgChainSolved from "./chainSolved";
 import onMsgDraw from "./draw";
@@ -234,6 +235,11 @@ export default async function handleGameMsg(pb: ygopro.YgoStocMsg) {
 
       break;
     }
+    case "chain_end": {
+      onMsgChainEnd(msg.chain_end);
+
+      break;
+    }
     case "summoning": {
       onMsgSummoning(msg.summoning);
 

src/service/duel/move.ts

@@ -48,6 +48,11 @@ export default async (move: MsgMove) => {
         .in(from.location)
         .of(from.controler)
         .remove(from.sequence);
+
+      if (removed === undefined) {
+        console.warn(`remove from matStore return undefined, location=${from}`);
+      }
+
       uuid = removed.uuid;
       chainIndex = removed.chainIndex;
 

src/stores/matStore/store.ts

@@ -292,6 +292,8 @@ export const matStore: MatState = proxy<MatState>({
       .at(location.sequence);
     if (target) {
       target.chainIndex = chainIndex;
+    } else {
+      console.warn(`target is null in setChained, location=${location}`);
     }
   },
 });