Commit 8a1a90de authored by Chunchi Che's avatar Chunchi Che

fix ocgAdapter

parent 82168772
......@@ -96,7 +96,7 @@ export default class GameMsgAdapter implements StocAdapter {
break;
}
case GAME_MSG.MSG_SELECT_TRIBUTE: {
gameMsg.select_card = MsgSelectTributeAdapter(gameData);
gameMsg.select_tribute = MsgSelectTributeAdapter(gameData);
break;
}
......
......@@ -50,13 +50,15 @@ export default (data: Uint8Array) => {
const code = reader.inner.readInt32();
const location = reader.readCardShortLocation();
const para = reader.inner.readInt32();
const level1 = para & 0xffff;
const level2 = para >> 16 > 0 ? para >> 16 : level1;
msg.selectable_cards.push(
new MsgSelectSum.Info({
code,
location,
level1: para & 0xffff,
level2: para >> 16,
level1,
level2,
response: i,
})
);
......
import { ygopro } from "../../../idl/ocgcore";
import { BufferReaderExt } from "../../bufferIO";
import MsgSelectCard = ygopro.StocGameMessage.MsgSelectCard;
import MsgSelectTribute = ygopro.StocGameMessage.MsgSelectTribute;
/*
* Msg Select Tribute
......@@ -10,7 +10,6 @@ import MsgSelectCard = ygopro.StocGameMessage.MsgSelectCard;
* */
export default (data: Uint8Array) => {
// FIXME: handle it correctly
const reader = new BufferReaderExt(data);
const player = reader.inner.readUint8();
......@@ -19,25 +18,25 @@ export default (data: Uint8Array) => {
const max = reader.inner.readUint8();
const count = reader.inner.readUint8();
const msg = new MsgSelectCard({ player, cancelable, min, max });
const msg = new MsgSelectTribute({
player,
cancelable,
min,
max,
selectable_cards: [],
});
for (let i = 0; i < count; i++) {
const code = reader.inner.readUint32();
const controler = reader.inner.readUint8();
const location = reader.inner.readUint8();
const sequence = reader.inner.readUint8();
const release_param = reader.inner.readUint8();
const location = reader.readCardShortLocation();
const level = reader.inner.readUint8();
msg.cards.push(
new MsgSelectCard.SelectAbleCard({
msg.selectable_cards.push(
new MsgSelectTribute.Info({
code,
location: new ygopro.CardLocation({
controler,
location,
sequence,
}),
level,
response: i,
release_param,
})
);
}
......
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