Skip to content

Y
YGOProUnity_V2
Commit 464e5d9d authored by mercury233's avatar mercury233
Browse files
Options

sync YGOSharp

parent 0c736027
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 51 deletions
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ 464e5d9d
...@@ -1830,7 +1830,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -1830,7 +1830,7 @@ public class Ocgcore : ServantWithCardDescription
//printDuelLog(derectattack); //printDuelLog(derectattack);
} }
break; break;
case GameMessage.AttackDiabled: case GameMessage.AttackDisabled:
ES_hint = InterString.Get("攻击被无效时"); ES_hint = InterString.Get("攻击被无效时");
//printDuelLog(InterString.Get("攻击被无效")); //printDuelLog(InterString.Get("攻击被无效"));
break; break;
...@@ -3402,7 +3402,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3402,7 +3402,7 @@ public class Ocgcore : ServantWithCardDescription
gameField.setHint(InterString.Get("请选择卡片。") + " " + ES_min.ToString() + "-" + ES_max.ToString()); gameField.setHint(InterString.Get("请选择卡片。") + " " + ES_min.ToString() + "-" + ES_max.ToString());
} }
break; break;
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
if (inIgnoranceReplay() || inTheWorld()) if (inIgnoranceReplay() || inTheWorld())
{ {
break; break;
...@@ -5108,7 +5108,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -5108,7 +5108,7 @@ public class Ocgcore : ServantWithCardDescription
Sleep(40); Sleep(40);
} }
break; break;
case GameMessage.AttackDiabled: case GameMessage.AttackDisabled:
//removeAttackHandler(); //removeAttackHandler();
break; break;
case GameMessage.DamageStepStart: case GameMessage.DamageStepStart:
...@@ -5888,7 +5888,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -5888,7 +5888,7 @@ public class Ocgcore : ServantWithCardDescription
} }
} }
} }
else if (currentMessage != GameMessage.SelectUnselectCard) else if (currentMessage != GameMessage.SelectUnselect)
{ {
gameInfo.removeHashedButton("sendSelected"); gameInfo.removeHashedButton("sendSelected");
} }
...@@ -5900,7 +5900,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -5900,7 +5900,7 @@ public class Ocgcore : ServantWithCardDescription
private void getSelectableCards() private void getSelectableCards()
{ {
if (currentMessage == GameMessage.SelectCard || currentMessage == GameMessage.SelectUnselectCard) if (currentMessage == GameMessage.SelectCard || currentMessage == GameMessage.SelectUnselect)
{ {
for (int i = 0; i < allCardsInSelectMessage.Count; i++) for (int i = 0; i < allCardsInSelectMessage.Count; i++)
{ {
...@@ -6209,7 +6209,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6209,7 +6209,7 @@ public class Ocgcore : ServantWithCardDescription
switch (currentMessage) switch (currentMessage)
{ {
case GameMessage.SelectCard: case GameMessage.SelectCard:
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
case GameMessage.SelectTribute: case GameMessage.SelectTribute:
int c = ES_min; int c = ES_min;
if (cardsSelectable.Count < c) if (cardsSelectable.Count < c)
...@@ -6249,11 +6249,11 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6249,11 +6249,11 @@ public class Ocgcore : ServantWithCardDescription
switch (currentMessage) switch (currentMessage)
{ {
case GameMessage.SelectCard: case GameMessage.SelectCard:
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
case GameMessage.SelectTribute: case GameMessage.SelectTribute:
case GameMessage.SelectSum: case GameMessage.SelectSum:
m = new BinaryMaster(); m = new BinaryMaster();
if (currentMessage == GameMessage.SelectUnselectCard && cardsSelected.Count == 0) if (currentMessage == GameMessage.SelectUnselect && cardsSelected.Count == 0)
{ {
m.writer.Write((Int32)(-1)); m.writer.Write((Int32)(-1));
sendReturn(m.get()); sendReturn(m.get());
...@@ -6814,10 +6814,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6814,10 +6814,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang - 1, curLie - 1]; gameCard card = vvv[curHang - 1, curLie - 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.youshang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.TopRight))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.zuoxia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.BottomLeft))
lighted = true; lighted = true;
} }
...@@ -6826,10 +6826,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6826,10 +6826,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang, curLie - 1]; gameCard card = vvv[curHang, curLie - 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.you) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Right))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.zuo) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Left))
lighted = true; lighted = true;
} }
if (curLie - 1 >= 0) if (curLie - 1 >= 0)
...@@ -6837,10 +6837,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6837,10 +6837,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang + 1, curLie - 1]; gameCard card = vvv[curHang + 1, curLie - 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.youxia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.BottomRight))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.zuoshang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.TopLeft))
lighted = true; lighted = true;
} }
if (curHang - 1 >= 0) if (curHang - 1 >= 0)
...@@ -6848,10 +6848,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6848,10 +6848,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang - 1, curLie]; gameCard card = vvv[curHang - 1, curLie];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.shang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Top))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.xia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Bottom))
lighted = true; lighted = true;
} }
...@@ -6859,10 +6859,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6859,10 +6859,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang + 1, curLie]; gameCard card = vvv[curHang + 1, curLie];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.xia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Bottom))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.shang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Top))
lighted = true; lighted = true;
} }
if (curHang - 1 >= 0) if (curHang - 1 >= 0)
...@@ -6870,10 +6870,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6870,10 +6870,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang - 1, curLie + 1]; gameCard card = vvv[curHang - 1, curLie + 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.zuoshang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.TopLeft))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.youxia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.BottomRight))
lighted = true; lighted = true;
} }
...@@ -6881,10 +6881,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6881,10 +6881,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang, curLie + 1]; gameCard card = vvv[curHang, curLie + 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.zuo) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Left))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.you) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.Right))
lighted = true; lighted = true;
} }
...@@ -6892,10 +6892,10 @@ public class Ocgcore : ServantWithCardDescription ...@@ -6892,10 +6892,10 @@ public class Ocgcore : ServantWithCardDescription
{ {
gameCard card = vvv[curHang + 1, curLie + 1]; gameCard card = vvv[curHang + 1, curLie + 1];
if (card.p.controller == 0) if (card.p.controller == 0)
if ((card.get_data().rDefense & CardFac.zuoxia) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.BottomLeft))
lighted = true; lighted = true;
if (card.p.controller == 1) if (card.p.controller == 1)
if ((card.get_data().rDefense & CardFac.youshang) > 0) if (card.get_data().HasLinkMarker(CardLinkMarker.TopRight))
lighted = true; lighted = true;
} }
...@@ -8246,7 +8246,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -8246,7 +8246,7 @@ public class Ocgcore : ServantWithCardDescription
break; break;
case GameMessage.SelectCard: case GameMessage.SelectCard:
break; break;
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
break; break;
case GameMessage.SelectChain: case GameMessage.SelectChain:
break; break;
...@@ -8318,7 +8318,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -8318,7 +8318,7 @@ public class Ocgcore : ServantWithCardDescription
case GameMessage.SelectEffectYn: case GameMessage.SelectEffectYn:
case GameMessage.SelectYesNo: case GameMessage.SelectYesNo:
case GameMessage.SelectCard: case GameMessage.SelectCard:
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
case GameMessage.SelectTribute: case GameMessage.SelectTribute:
case GameMessage.SelectChain: case GameMessage.SelectChain:
clearAllShowedB = true; clearAllShowedB = true;
...@@ -8537,7 +8537,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -8537,7 +8537,7 @@ public class Ocgcore : ServantWithCardDescription
realizeCardsForSelect(); realizeCardsForSelect();
} }
break; break;
case GameMessage.SelectUnselectCard: case GameMessage.SelectUnselect:
if (card.forSelect) if (card.forSelect)
{ {
cardsSelected.Add(card); cardsSelected.Add(card);
......
Assets/SibylSystem/deckManager/DeckManager.cs
View file @ 464e5d9d
...@@ -748,11 +748,11 @@ public class DeckManager : ServantWithCardDescription ...@@ -748,11 +748,11 @@ public class DeckManager : ServantWithCardDescription
} }
if (ifType(GameStringManager.get_unsafe(1075))) if (ifType(GameStringManager.get_unsafe(1075)))
{ {
returnValue |= (UInt32)CardType.Monster + (UInt32)CardType.sp; returnValue |= (UInt32)CardType.Monster + (UInt32)CardType.SpSummon;
} }
if (ifType(GameStringManager.get_unsafe(1076))) if (ifType(GameStringManager.get_unsafe(1076)))
{ {
returnValue |= (UInt32)CardType.Monster + (UInt32)CardType.link; returnValue |= (UInt32)CardType.Monster + (UInt32)CardType.Link;
} }
} }
if (UIPopupList_main.value == GameStringManager.get_unsafe(1313)) if (UIPopupList_main.value == GameStringManager.get_unsafe(1313))
...@@ -1354,7 +1354,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1354,7 +1354,7 @@ public class DeckManager : ServantWithCardDescription
|| ||
(MonoCardInDeckManager_.cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0 (MonoCardInDeckManager_.cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0
|| ||
(MonoCardInDeckManager_.cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.link) > 0 (MonoCardInDeckManager_.cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Link) > 0
) )
{ {
deck.IExtra.Add(MonoCardInDeckManager_); deck.IExtra.Add(MonoCardInDeckManager_);
...@@ -1393,7 +1393,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1393,7 +1393,7 @@ public class DeckManager : ServantWithCardDescription
|| ||
(data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0 (data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0
|| ||
(data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.link) > 0 (data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Link) > 0
) )
{ {
deck.IExtra.Add(card); deck.IExtra.Add(card);
...@@ -1578,7 +1578,7 @@ public class DeckManager : ServantWithCardDescription ...@@ -1578,7 +1578,7 @@ public class DeckManager : ServantWithCardDescription
|| ||
(deckTemp[i].cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0 (deckTemp[i].cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0
|| ||
(deckTemp[i].cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.link) > 0 (deckTemp[i].cardData.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Link) > 0
) )
{ {
deck.IExtra.Add(deckTemp[i]); deck.IExtra.Add(deckTemp[i]);
......
Assets/YGOSharp/Card.cs
View file @ 464e5d9d
...@@ -100,9 +100,14 @@ namespace YGOSharp ...@@ -100,9 +100,14 @@ namespace YGOSharp
return ((Type & (int)type) != 0); return ((Type & (int)type) != 0);
} }
public bool HasLinkMarker(CardLinkMarker dir)
{
return (rDefense & (int)dir) != 0;
}
public bool IsExtraCard() public bool IsExtraCard()
{ {
return (HasType(CardType.Fusion) || HasType(CardType.Synchro) || HasType(CardType.Xyz) || HasType(CardType.link)); return (HasType(CardType.Fusion) || HasType(CardType.Synchro) || HasType(CardType.Xyz) || HasType(CardType.Link));
} }
internal Card(IDataRecord reader) internal Card(IDataRecord reader)
......
Assets/YGOSharp/Enums/CardLinkMarker.cs 0 → 100644
View file @ 464e5d9d
namespace YGOSharp.OCGWrapper.Enums
{
public enum CardLinkMarker
{
BottomLeft = 0x01,
Bottom = 0x02,
BottomRight = 0x04,
Left = 0x08,
Right = 0x20,
TopLeft = 0x40,
Top = 0x80,
TopRight = 0x100
}
}
\ No newline at end of file
Assets/YGOSharp/Enums/CardLinkMarker.cs.meta 0 → 100644
View file @ 464e5d9d
fileFormatVersion: 2
guid: 15d8ac695c446594ea28abe34e500bf1
timeCreated: 1554560396
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/YGOSharp/Enums/CardPosition.cs
View file @ 464e5d9d
...@@ -12,16 +12,3 @@ ...@@ -12,16 +12,3 @@
Defence = 0xC Defence = 0xC
} }
} }
class CardFac
{
public static int zuoxia = 1 << (1 - 1);
public static int xia = 1 << (2 - 1);
public static int youxia = 1 << (3 - 1);
public static int zuo = 1 << (4 - 1);
public static int you = 1 << (6 - 1);
public static int zuoshang = 1 << (7 - 1);
public static int shang = 1 << (8 - 1);
public static int youshang = 1 << (9 - 1);
}
\ No newline at end of file
Assets/YGOSharp/Enums/CardRace.cs
View file @ 464e5d9d
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
SeaSerpent = 0x40000, SeaSerpent = 0x40000,
Reptile = 0x80000, Reptile = 0x80000,
Psycho = 0x100000, Psycho = 0x100000,
DivineBeast = 0x200000 DivineBeast = 0x200000,
Wyrm = 0x800000,
Cyberse = 0x1000000
} }
} }
\ No newline at end of file
Assets/YGOSharp/Enums/CardType.cs
View file @ 464e5d9d
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
Toon = 0x400000, Toon = 0x400000,
Xyz = 0x800000, Xyz = 0x800000,
Pendulum = 0x1000000, Pendulum = 0x1000000,
sp = 0x2000000, SpSummon = 0x2000000,
link = 0x4000000, Link = 0x4000000
} }
} }
\ No newline at end of file
Assets/YGOSharp/Enums/GameMessage.cs
View file @ 464e5d9d
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
SelectSum = 23, SelectSum = 23,
SelectDisfield = 24, SelectDisfield = 24,
SortCard = 25, SortCard = 25,
SelectUnselectCard = 26, SelectUnselect = 26,
ConfirmDecktop = 30, ConfirmDecktop = 30,
ConfirmCards = 31, ConfirmCards = 31,
ShuffleDeck = 32, ShuffleDeck = 32,
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
RemoveCounter = 102, RemoveCounter = 102,
Attack = 110, Attack = 110,
Battle = 111, Battle = 111,
AttackDiabled = 112, AttackDisabled = 112,
DamageStepStart = 113, DamageStepStart = 113,
DamageStepEnd = 114, DamageStepEnd = 114,
MissedEffect = 120, MissedEffect = 120,
......
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