Skip to content

Y
ygopro2
Commit bd251b82 authored by hex's avatar hex
Browse files
Options

Revert "fix confirm decktop card mapping consistency" 

This reverts commit dd164def.
parent dd164def
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 3 deletions
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ bd251b82
...@@ -2471,12 +2471,20 @@ public class Ocgcore : ServantWithCardDescription ...@@ -2471,12 +2471,20 @@ public class Ocgcore : ServantWithCardDescription
case GameMessage.ConfirmDecktop: case GameMessage.ConfirmDecktop:
player = localPlayer(r.ReadByte()); player = localPlayer(r.ReadByte());
count = r.ReadByte(); count = r.ReadByte();
int countOfDeck = countLocation(player, CardLocation.Deck);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
code = r.ReadInt32(); code = r.ReadInt32();
gps = r.ReadShortGPS(); gps = r.ReadShortGPS();
gps.controller = (UInt32)player; card = GCS_cardGet(
card = GCS_cardGet(gps, false); new GPS
{
controller = (UInt32)player,
location = (UInt32)CardLocation.Deck,
sequence = (UInt32)(countOfDeck - 1 - i),
},
false
);
if (card != null) if (card != null)
{ {
card.set_code(code); card.set_code(code);
...@@ -4803,11 +4811,17 @@ public class Ocgcore : ServantWithCardDescription ...@@ -4803,11 +4811,17 @@ public class Ocgcore : ServantWithCardDescription
case GameMessage.ConfirmDecktop: case GameMessage.ConfirmDecktop:
player = localPlayer(r.ReadByte()); player = localPlayer(r.ReadByte());
count = r.ReadByte(); count = r.ReadByte();
int countOfDeck = countLocation(player, CardLocation.Deck);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
code = r.ReadInt32(); code = r.ReadInt32();
gps = r.ReadShortGPS(); gps = r.ReadShortGPS();
gps.controller = (UInt32)player; gps = new GPS
{
controller = (UInt32)player,
location = (UInt32)CardLocation.Deck,
sequence = (UInt32)(countOfDeck - 1 - i),
};
card = GCS_cardGet(gps, false); card = GCS_cardGet(gps, false);
if (card != null) if (card != null)
{ {
......
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