Commit b1d1b754 authored by 無名の凝泪's avatar 無名の凝泪 Committed by Unicorn369

Update OCG/TCG/Custom mark

parent c7a2bd22
...@@ -123,16 +123,16 @@ public class GameStringHelper ...@@ -123,16 +123,16 @@ public class GameStringHelper
switch(card.Ot) switch(card.Ot)
{ {
case 1: case 1:
limitot = "[OCG] "; limitot = GameStringManager.get_unsafe(1240);
break; break;
case 2: case 2:
limitot = "[TCG] "; limitot = GameStringManager.get_unsafe(1241);
break; break;
case 3: case 3:
limitot = "[OCG/TCG] "; limitot = GameStringManager.get_unsafe(1242);
break; break;
case 4: case 4:
limitot = "[Anime] "; limitot = GameStringManager.get_unsafe(1243);
break; break;
} }
string re = ""; string re = "";
...@@ -140,7 +140,7 @@ public class GameStringHelper ...@@ -140,7 +140,7 @@ public class GameStringHelper
{ {
re += "[b]" + card.Name + "[/b]"; re += "[b]" + card.Name + "[/b]";
re += "\n"; re += "\n";
re += "[sup]" + limitot + "[/sup]"; re += "[sup][" + limitot + "] [/sup]";
re += "\r"; re += "\r";
re += "[sup]" + card.Id.ToString() + "[/sup]"; re += "[sup]" + card.Id.ToString() + "[/sup]";
re += "\n"; re += "\n";
......
...@@ -22,9 +22,9 @@ namespace YGOSharp ...@@ -22,9 +22,9 @@ namespace YGOSharp
nullString += "欢迎使用:\r\nYGOPro2 For Android"; nullString += "欢迎使用:\r\nYGOPro2 For Android";
nullString += "\r\n\r\n"; nullString += "\r\n\r\n";
nullString += "源码:"; nullString += "源码:";
nullString += "\r\n「Android」\r\n[url=https://github.com/Unicorn369/YGOPro2_Droid][u]https://github.com/Unicorn369/YGOPro2_Droid[/u][/url]"; nullString += "\r\n「Android」\r\n[url=https://github.com/Unicorn369/YGOPro2_Droid][u]https://github.com/Unicorn369/YGOPro2_Droid[/u][/url]";
//nullString += "\r\nWindows:[url=https://github.com/lllyasviel/YGOProUnity_V2][u]https://github.com/lllyasviel/YGOProUnity_V2[/u][/url]"; //nullString += "\r\nWindows:[url=https://github.com/lllyasviel/YGOProUnity_V2][u]https://github.com/lllyasviel/YGOProUnity_V2[/u][/url]";
nullString += "\r\n\r\n「Windows」\r\n[url=https://github.com/mercury233/ygopro2][u]https://github.com/mercury233/ygopro2[/u][/url]"; nullString += "\r\n\r\n「Windows」\r\n[url=https://github.com/mercury233/ygopro2][u]https://github.com/mercury233/ygopro2[/u][/url]";
nullString += "\r\n\r\n\r\n"; nullString += "\r\n\r\n\r\n";
nullString += "欢迎加入QQ群:"; nullString += "欢迎加入QQ群:";
nullString += "\r\n①:[url=https://jq.qq.com/?_wv=1027&k=5nq6xJe][u]649612818[/u][/url]"; nullString += "\r\n①:[url=https://jq.qq.com/?_wv=1027&k=5nq6xJe][u]649612818[/u][/url]";
...@@ -103,6 +103,7 @@ namespace YGOSharp ...@@ -103,6 +103,7 @@ namespace YGOSharp
int getDefence_UP, int getDefence_UP,
int getP_UP, int getP_UP,
int getYear_UP, int getYear_UP,
int getOT,
string getPack, string getPack,
int getBAN, int getBAN,
Banlist banlist, Banlist banlist,
...@@ -127,7 +128,7 @@ namespace YGOSharp ...@@ -127,7 +128,7 @@ namespace YGOSharp
{ {
if (((card.Type & getTypeFilter)) == getTypeFilter || getTypeFilter == 0) if (((card.Type & getTypeFilter)) == getTypeFilter || getTypeFilter == 0)
{ {
if ((card.Race & getRaceFilter) >0 || getRaceFilter == 0) if ((card.Race & getRaceFilter) > 0 || getRaceFilter == 0)
{ {
if ((card.Attribute & getAttributeFilter) > 0 || getAttributeFilter == 0) if ((card.Attribute & getAttributeFilter) > 0 || getAttributeFilter == 0)
{ {
...@@ -145,9 +146,12 @@ namespace YGOSharp ...@@ -145,9 +146,12 @@ namespace YGOSharp
{ {
if (getBAN == -233 || banlist == null || banlist.GetQuantity(card.Id) == getBAN) if (getBAN == -233 || banlist == null || banlist.GetQuantity(card.Id) == getBAN)
{ {
if (getPack == "" || card.packFullName == getPack) if (getOT == 0 || getOT == card.Ot)
{ {
returnValue.Add(card); if (getPack == "" || card.packFullName == getPack)
{
returnValue.Add(card);
}
} }
} }
} }
......
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