Skip to content

Y
ygopro2
Commit 1cfb22c7 authored by Unicorn369's avatar Unicorn369
Browse files
Options

Set Version to 2.2

parents 36bb6653 6781d4e0
Hide whitespace changes
Inline Side-by-side
Showing with 12777 additions and 12774 deletions
Assets/Plugins/Android/libs/armeabi-v7a/libandroid-support.so.meta deleted 100644 → 0
View file @ 36bb6653
fileFormatVersion: 2
guid: 525668a10207e01479f714805f90b484
timeCreated: 1552877171
licenseType: Free
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
data:
first:
Any:
second:
enabled: 0
settings: {}
data:
first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/libs/x86/libandroid-support.so.meta deleted 100644 → 0
View file @ 36bb6653
fileFormatVersion: 2
guid: 3b9863256c9b945478284255d8d40a67
timeCreated: 1552877171
licenseType: Free
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Android: Android
second:
enabled: 1
settings:
CPU: x86
data:
first:
Any:
second:
enabled: 0
settings: {}
data:
first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/SibylSystem/Ocgcore/Ocgcore.cs
View file @ 1cfb22c7
......@@ -739,6 +739,7 @@ public class Ocgcore : ServantWithCardDescription
public void onHome()
{
Program.I().SaveConfig();
returnTo();
}
......
Assets/SibylSystem/Program.cs
View file @ 1cfb22c7
......@@ -311,6 +311,17 @@ public class Program : MonoBehaviour
ExtractZipFile(bytes, ANDROID_GAME_PATH);
//File.Create(ANDROID_GAME_PATH + ".nomedia");
}
if (!File.Exists(ANDROID_GAME_PATH + "updates/ui.txt") || !File.Exists(ANDROID_GAME_PATH + "textures/ui/bg_of_right_game_buttons.png")
|| !File.Exists(ANDROID_GAME_PATH + "textures/ui/bg_of_right_card_searcher2.png"))
{
string filePath = Application.streamingAssetsPath + "/ui.zip";
var www = new WWW(filePath);
while (!www.isDone) { }
byte[] bytes = www.bytes;
ExtractZipFile(bytes, ANDROID_GAME_PATH);
}
Environment.CurrentDirectory = ANDROID_GAME_PATH;
System.IO.Directory.SetCurrentDirectory(ANDROID_GAME_PATH);
......@@ -394,14 +405,14 @@ public class Program : MonoBehaviour
jo.Call("doExtractZipFile", "pics.zip", ANDROID_GAME_PATH);
File.Copy("updates/version2.0.txt", "updates/image_version1.1.txt", true);
} else {
Application.OpenURL("https://www.taptap.com/app/37972");
//Application.OpenURL("https://www.taptap.com/app/37972");
jo.Call("showToast", "没有发现卡图包，是否未安装YGOMobile");
}
}
/**
* 使用Termux编译生成的：libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android)
* 经测试，只有Android 6.0以上才能正常使用。为了让Android 6.0以下的也能酬和使用立绘效果，需做判断
* 经测试，只有Android 6.0以上才能正常使用。为了让Android 6.0以下的也能凑合使用立绘效果，需做判断
*
* public boolean APIVersion() {
* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
......@@ -1063,8 +1074,7 @@ public class Program : MonoBehaviour
_padScroll = 0;
}
//GUI.Label(new Rect(Screen.width / 2, 0, 100, 100), "FPS: " + m_FPS);
GUI.Label(new Rect(10, 5, 100, 100), "FPS: " + m_FPS);
GUI.Label(new Rect(10, 5, 200, 200), "[Version 2.2] " + "FPS: " + m_FPS);
}
void Update()
......@@ -1169,14 +1179,13 @@ public class Program : MonoBehaviour
public static bool Running = true;
public static bool MonsterCloud = false;
public static bool DownloadImage = false;
public static float fieldSize = 1;
void OnApplicationQuit()
{
TcpHelper.SaveRecord();
cardDescription.save();
setting.saveWhenQuit();
SaveConfig();
for (int i = 0; i < servants.Count; i++)
{
servants[i].OnQuit();
......@@ -1198,6 +1207,13 @@ public class Program : MonoBehaviour
OnApplicationQuit();
}
public void SaveConfig()
{
cardDescription.save();
setting.save();
setting.saveWhenQuit();
}
#endregion
//递归创建目录
......
Assets/SibylSystem/ResourceManagers/GameStringHelper.cs
View file @ 1cfb22c7
......@@ -123,16 +123,16 @@ public class GameStringHelper
switch(card.Ot)
{
case 1:
limitot = "[OCG] ";
limitot = GameStringManager.get_unsafe(1240);
break;
case 2:
limitot = "[TCG] ";
limitot = GameStringManager.get_unsafe(1241);
break;
case 3:
limitot = "[OCG/TCG] ";
limitot = GameStringManager.get_unsafe(1242);
break;
case 4:
limitot = "[Anime] ";
limitot = GameStringManager.get_unsafe(1243);
break;
}
string re = "";
......@@ -140,7 +140,7 @@ public class GameStringHelper
{
re += "[b]" + card.Name + "[/b]";
re += "\n";
re += "[sup]" + limitot + "[/sup]";
re += "[sup][" + limitot + "] [/sup]";
re += "\r";
re += "[sup]" + card.Id.ToString() + "[/sup]";
re += "\n";
......
Assets/SibylSystem/Setting/Setting.cs
View file @ 1cfb22c7
......@@ -215,6 +215,7 @@ public class Setting : WindowServant2D
void onClickExit()
{
Program.I().SaveConfig();
hide();
}
......
Assets/SibylSystem/deckManager/DeckManager.cs
View file @ 1cfb22c7
......@@ -21,7 +21,7 @@ public class DeckManager : ServantWithCardDescription
UIPopupList UIPopupList_main;
UIPopupList UIPopupList_ban;
UIPopupList UIPopupList_ban;
UIPopupList UIPopupList_second;
......@@ -81,7 +81,7 @@ public class DeckManager : ServantWithCardDescription
UIInput_def = UIHelper.getByName<UIInput>(gameObjectDetailedSearch, "def_");
for (int i = 0; i < 32; i++)
{
UIToggle_effects[i] = UIHelper.getByName<UIToggle>(gameObjectDetailedSearch, "T (" + (i+1).ToString() + ")");
UIToggle_effects[i] = UIHelper.getByName<UIToggle>(gameObjectDetailedSearch, "T (" + (i + 1).ToString() + ")");
UIHelper.trySetLableText(UIToggle_effects[i].gameObject, GameStringManager.get_unsafe(1100 + i));
UIToggle_effects[i].GetComponentInChildren<UILabel>().overflowMethod = UILabel.Overflow.ClampContent;
}
......@@ -101,6 +101,10 @@ public class DeckManager : ServantWithCardDescription
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1316));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1317));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1318));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1240));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1241));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1242));
UIPopupList_ban.AddItem(GameStringManager.get_unsafe(1243));
clearAll();
UIHelper.registEvent(UIPopupList_main.gameObject, onUIPopupList_main);
UIHelper.registEvent(UIPopupList_second.gameObject, onUIPopupList_second);
......@@ -111,7 +115,8 @@ public class DeckManager : ServantWithCardDescription
itemOnListProducer,
86
);
Program.go(500, () => {
Program.go(500, () =>
{
List<MonoCardInDeckManager> cs = new List<MonoCardInDeckManager>();
for (int i = 0; i < 300; i++)
{
......@@ -212,14 +217,14 @@ public class DeckManager : ServantWithCardDescription
RMSshow_input("onRename", InterString.Get("新的卡组名"), newnamer);
}
public override void ES_RMS(string hashCode, List<messageSystemValue> result)
public override void ES_RMS(string hashCode, List<messageSystemValue> result)
{
base.ES_RMS(hashCode, result);
if (hashCode == "onRename")
{
string raw = Config.Get("deckInUse", "miaowu");
Config.Set("deckInUse", result[0].value);
if (onSave())
if (onSave())
{
((CardDescription)Program.I().cardDescription).setTitle(result[0].value);
}
......@@ -232,7 +237,7 @@ public class DeckManager : ServantWithCardDescription
public Action returnAction = null;
public bool onSave()
public bool onSave()
{
try
{
......@@ -313,6 +318,7 @@ public class DeckManager : ServantWithCardDescription
{
returnAction();
}
Program.I().SaveConfig();
}
void sort()
......@@ -334,7 +340,7 @@ public class DeckManager : ServantWithCardDescription
void clear()
{
var deckTemp = deck.getAllObjectCard();
foreach (var item in deckTemp)
foreach (var item in deckTemp)
{
try
{
......@@ -342,7 +348,7 @@ public class DeckManager : ServantWithCardDescription
var rid = item.gameObject.GetComponent<Rigidbody>();
if (rid == null)
{
rid= item.gameObject.AddComponent<Rigidbody>();
rid = item.gameObject.AddComponent<Rigidbody>();
}
rid.AddForce(0.7f * (item.transform.position + new Vector3(0, 30 - Vector3.Distance(item.transform.position, Vector3.zero), 0)) / Program.deltaTime);
}
......@@ -370,14 +376,14 @@ public class DeckManager : ServantWithCardDescription
bool detailPanelShiftedTemp = false;
void shiftDetailPanel(bool dragged)
void shiftDetailPanel(bool dragged)
{
detailPanelShiftedTemp = dragged;
if (isShowed&&detailShowed)
if (isShowed && detailShowed)
{
if (dragged)
{
gameObjectDetailedSearch.GetComponent<UITexture>().color = new Color(1,1,1,0.7f);
gameObjectDetailedSearch.GetComponent<UITexture>().color = new Color(1, 1, 1, 0.7f);
}
else
{
......@@ -389,7 +395,7 @@ public class DeckManager : ServantWithCardDescription
void refreshDetail()
{
if (gameObjectDetailedSearch!=null)
if (gameObjectDetailedSearch != null)
{
if (isShowed)
{
......@@ -399,13 +405,13 @@ public class DeckManager : ServantWithCardDescription
if (detailShowed)
{
gameObjectDetailedSearch.GetComponent<UITexture>().height = 700;
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 0.5f, 0)), 0.6f);
reShowBar(0, 230 + 230 * Screen.height / 700f);
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 460 - 115f * Screen.height / 700f, Screen.height * 0.5f, 0)), 0.6f);
reShowBar(0, 460 + 460 * Screen.height/ 700f);
}
else
{
gameObjectDetailedSearch.GetComponent<UITexture>().height = 700;
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 230 - 115f * Screen.height / 700f, Screen.height * 1.5f, 0)), 0.6f);
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 460 - 115f * Screen.height / 700f, Screen.height * 1.5f, 0)), 0.6f);
reShowBar(0, 230);
}
}
......@@ -415,13 +421,13 @@ public class DeckManager : ServantWithCardDescription
if (detailShowed)
{
gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height;
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f, Screen.height * 0.5f, 0)), 0.6f);
reShowBar(0, 460);
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 575f, Screen.height * 0.5f, 0)), 0.6f);
reShowBar(0, 460 * 2);
}
else
{
gameObjectDetailedSearch.GetComponent<UITexture>().height = Screen.height;
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 345f, Screen.height * 1.5f, 0)), 0.6f);
iTween.MoveTo(gameObjectDetailedSearch, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width - 575f, Screen.height * 1.5f, 0)), 0.6f);
reShowBar(0, 230);
}
}
......@@ -630,6 +636,7 @@ public class DeckManager : ServantWithCardDescription
getDefence_UP(),
getP_UP(),
getYear_UP(),
getOT(),
getPack(),
getBanFilter(),
currentBanlist,
......@@ -640,16 +647,16 @@ public class DeckManager : ServantWithCardDescription
);
print(result);
UIHelper.trySetLableText(gameObjectSearch, "title_", result.Count.ToString());
//UIInput_search.isSelected = true;
UIInput_search.isSelected = true;
}
public YGOSharp.Banlist currentBanlist = null;
public YGOSharp.Banlist currentBanlist = null;
List<YGOSharp.Card> PrintedResult = new List<YGOSharp.Card>();
void print(List<YGOSharp.Card> result)
{
if (superScrollView!=null)
if (superScrollView != null)
{
PrintedResult = result;
if (condition == Condition.editDeck)
......@@ -677,9 +684,9 @@ public class DeckManager : ServantWithCardDescription
bool ifType(string str)
{
bool re = false;
foreach (var item in seconds)
foreach (var item in seconds)
{
if (str==item)
if (str == item)
{
re = true;
break;
......@@ -820,6 +827,28 @@ public class DeckManager : ServantWithCardDescription
return returnValue;
}
int getOT()
{
int returnValue = 0;
if (UIPopupList_ban.value == GameStringManager.get_unsafe(1240))
{
returnValue = 1;
}
if (UIPopupList_ban.value == GameStringManager.get_unsafe(1241))
{
returnValue = 2;
}
if (UIPopupList_ban.value == GameStringManager.get_unsafe(1242))
{
returnValue = 3;
}
if (UIPopupList_ban.value == GameStringManager.get_unsafe(1243))
{
returnValue = 4;
}
return returnValue;
}
UInt32 getRaceFilter()
{
UInt32 returnValue = 0;
......@@ -1097,7 +1126,7 @@ public class DeckManager : ServantWithCardDescription
t_unmber = create_s(Program.I().mod_ocgcore_number, new Vector3(-16.5f, 0, 2.6f), new Vector3(90, 0, 0), true).GetComponent<number_loader>();
extra_unmber = create_s(Program.I().mod_ocgcore_number, new Vector3(-16.5f, 0, -5.3f), new Vector3(90, 0, 0), true).GetComponent<number_loader>();
side_number = create_s(Program.I().mod_ocgcore_number, new Vector3(-16.5f, 0, -11f), new Vector3(90, 0, 0), true).GetComponent<number_loader>();
switch (condition)
switch (condition)
{
case Condition.editDeck:
boxCollider.size = new Vector3(1, 1, 1);
......@@ -1298,7 +1327,7 @@ public class DeckManager : ServantWithCardDescription
{
if (cardInDragging != null)
{
if (Input.GetKey(KeyCode.LeftControl)|| Input.GetKey(KeyCode.RightControl))
if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl))
{
//
}
......@@ -1338,9 +1367,9 @@ public class DeckManager : ServantWithCardDescription
if (MonoCardInDeckManager_ != null)
{
bool isSide = false;
for (int i = 0; i < deck.ISide.Count; i++)
for (int i = 0; i < deck.ISide.Count; i++)
{
if (MonoCardInDeckManager_== deck.ISide[i])
if (MonoCardInDeckManager_ == deck.ISide[i])
{
isSide = true;
}
......@@ -1386,7 +1415,12 @@ public class DeckManager : ServantWithCardDescription
card.transform.position = card.getGoodPosition(4);
card.cardData = data;
card.gameObject.layer = 16;
if (
if (Input.GetKey(KeyCode.LeftShift) || (Input.GetKey(KeyCode.RightShift)))
{
deck.ISide.Add(card);
deck.Side.Add(card.cardData.Id);
}
else if (
(data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Fusion) > 0
||
(data.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Synchro) > 0
......@@ -1453,18 +1487,6 @@ public class DeckManager : ServantWithCardDescription
{
switch (flag)
{
case 1:
{
deck.Main.Add(code);
deck.Deck_O.Main.Add(code);
}
break;
case 2:
{
deck.Extra.Add(code);
deck.Deck_O.Extra.Add(code);
}
break;
case 3:
{
deck.Side.Add(code);
......@@ -1472,6 +1494,25 @@ public class DeckManager : ServantWithCardDescription
}
break;
default:
{
YGOSharp.Card card = YGOSharp.CardsManager.Get(code);
if ((card.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Fusion) > 0
||
(card.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Synchro) > 0
||
(card.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.Xyz) > 0
||
(card.Type & (UInt32)YGOSharp.OCGWrapper.Enums.CardType.link) > 0)
{
deck.Extra.Add(code);
deck.Deck_O.Extra.Add(code);
}
else
{
deck.Main.Add(code);
deck.Deck_O.Main.Add(code);
}
}
break;
}
}
......@@ -1492,7 +1533,7 @@ public class DeckManager : ServantWithCardDescription
else
{
YGOSharp.Deck r = new YGOSharp.Deck();
foreach (var item in deck.Deck_O.Main)
foreach (var item in deck.Deck_O.Main)
{
r.Main.Add(item);
r.Deck_O.Main.Add(item);
......@@ -1507,7 +1548,7 @@ public class DeckManager : ServantWithCardDescription
r.Extra.Add(item);
r.Deck_O.Extra.Add(item);
}
return r;
return r;
}
}
......@@ -1619,7 +1660,7 @@ public class DeckManager : ServantWithCardDescription
MonoCardInDeckManager createCard()
{
MonoCardInDeckManager r = null;
if (diedCards.Count>0)
if (diedCards.Count > 0)
{
r = diedCards[0].AddComponent<MonoCardInDeckManager>();
diedCards.RemoveAt(0);
......@@ -1663,7 +1704,7 @@ public class DeckManager : ServantWithCardDescription
});
int indexOfLogic = 0;
int[] hangshu = UIHelper.get_decklieshuArray(deck.Main.Count);
foreach (var item in deck.Main)
foreach (var item in deck.Main)
{
Vector2 v = UIHelper.get_hang_lieArry(indexOfLogic, hangshu);
Vector3 toVector = new Vector3(UIHelper.get_left_right_index(-12.5f, 12.5f, (int)v.y, hangshu[(int)v.x]), 0.5f + v.y / 3f + v.x / 3f, 11.8f - v.x * 4f);
......@@ -1674,14 +1715,14 @@ public class DeckManager : ServantWithCardDescription
card.cardData = data;
card.gameObject.layer = 16;
deck.IMain.Add(card);
card.tweenToVectorAndFall(toVector,new Vector3(90,0,0));
card.tweenToVectorAndFall(toVector, new Vector3(90, 0, 0));
});
indexOfLogic++;
}
indexOfLogic = 0;
foreach (var item in deck.Extra)
{
Vector3 toVector = new Vector3(UIHelper.get_left_right_indexZuo(-12.5f, 12.5f, indexOfLogic, deck.Extra.Count ,10), 0.5f + (float)indexOfLogic / 3f, -6.2f);
Vector3 toVector = new Vector3(UIHelper.get_left_right_indexZuo(-12.5f, 12.5f, indexOfLogic, deck.Extra.Count, 10), 0.5f + (float)indexOfLogic / 3f, -6.2f);
YGOSharp.Card data = YGOSharp.CardsManager.Get(item);
safeGogo(indexOfLogic * 90, () =>
{
......@@ -1755,12 +1796,12 @@ public class DeckManager : ServantWithCardDescription
toAngle = new Vector3(87f - (deck.ISide.Count - 10f) * 0.4f, -90, -90);
}
}
Vector3 toVector = new Vector3(UIHelper.get_left_right_indexZuo(-12.5f, 12.5f, i, deck.ISide.Count ,10), 0.6f + Mathf.Sin((90 - toAngle.x) / 180f * Mathf.PI) * k, -12f);
Vector3 toVector = new Vector3(UIHelper.get_left_right_indexZuo(-12.5f, 12.5f, i, deck.ISide.Count, 10), 0.6f + Mathf.Sin((90 - toAngle.x) / 180f * Mathf.PI) * k, -12f);
deck.ISide[i].tweenToVectorAndFall(toVector, toAngle);
}
}
public void FromObjectDeckToCodedDeck(bool order=false)
public void FromObjectDeckToCodedDeck(bool order = false)
{
ArrangeObjectDeck(order);
deck.Main.Clear();
......@@ -1780,7 +1821,7 @@ public class DeckManager : ServantWithCardDescription
}
}
public void setGoodLooking(bool side=false)
public void setGoodLooking(bool side = false)
{
try
{
......@@ -1791,9 +1832,9 @@ public class DeckManager : ServantWithCardDescription
UnityEngine.Debug.Log(e);
}
List<YGOSharp.Card> result = new List<YGOSharp.Card>();
if (side)
if (side)
{
foreach (var item in Program.I().ocgcore.sideReference)
foreach (var item in Program.I().ocgcore.sideReference)
{
result.Add(YGOSharp.CardsManager.Get(item.Value));
}
......@@ -1821,7 +1862,7 @@ public class DeckManager : ServantWithCardDescription
Program.go(300, superScrollView.toTop);
Program.go(400, superScrollView.toTop);
Program.go(500, superScrollView.toTop);
if (side)
if (side)
{
UIInput_search.value = InterString.Get("对手使用过的卡↓");
UIInput_search.isSelected = false;
......@@ -1829,7 +1870,7 @@ public class DeckManager : ServantWithCardDescription
else
{
UIInput_search.value = "";
//UIInput_search.isSelected = true;
UIInput_search.isSelected = true;
}
}
}
Assets/StreamingAssets/ui.zip.meta 0 → 100644
View file @ 1cfb22c7
fileFormatVersion: 2
guid: d59a7d6223068504999e580d2aeb2c1e
timeCreated: 1553312270
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/YGOSharp/CardsManager.cs
View file @ 1cfb22c7
......@@ -22,9 +22,9 @@ namespace YGOSharp
nullString += "欢迎使用：\r\nYGOPro2 For Android";
nullString += "\r\n\r\n";
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\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「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\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 += "欢迎加入QQ群：";
nullString += "\r\n①：[url=https://jq.qq.com/?_wv=1027&k=5nq6xJe][u]649612818[/u][/url]";
......@@ -103,6 +103,7 @@ namespace YGOSharp
int getDefence_UP,
int getP_UP,
int getYear_UP,
int getOT,
string getPack,
int getBAN,
Banlist banlist,
......@@ -127,7 +128,7 @@ namespace YGOSharp
{
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)
{
......@@ -145,9 +146,12 @@ namespace YGOSharp
{
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);
}
}
}
}
......
Assets/transUI/prefab/trans_ES_tp.prefab
View file @ 1cfb22c7
......@@ -233,9 +233,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 449694}
- {fileID: 460298}
- {fileID: 469404}
- {fileID: 443180}
- {fileID: 460298}
m_Father: {fileID: 487304}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -274,12 +274,12 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195922}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 147, y: 4.5, z: 0}
m_LocalPosition: {x: -3, y: 4.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 496978}
m_Father: {fileID: 428130}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &449694
Transform:
......@@ -314,12 +314,12 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 178052}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3, y: 4.5, z: 0}
m_LocalPosition: {x: 147, y: 4.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 442904}
m_Father: {fileID: 428130}
m_RootOrder: 1
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &469404
Transform:
......@@ -333,7 +333,7 @@ Transform:
m_Children:
- {fileID: 442446}
m_Father: {fileID: 428130}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &477590
Transform:
......@@ -368,7 +368,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 139314}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -450, y: -180, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 481836}
......@@ -991,7 +991,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.875
aspectRatio: 2.640625
mType: 0
mFillDirection: 4
mFillAmount: 1
......
Assets/transUI/prefab/trans_detailSearch.prefab
View file @ 1cfb22c7
This source diff could not be displayed because it is too large. You can view the blob instead.
ProjectSettings/ProjectSettings.asset
View file @ 1cfb22c7
......@@ -10,8 +10,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: YGOPro2 (Test)
productName: YGOPro2 (Test)
companyName: YGOPro2
productName: YGOPro2
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
......@@ -123,7 +123,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 1.034.8 (Test 2.0)
bundleVersion: 1.034.8 (Test 2.2)
preloadedAssets: []
metroInputSource: 0
m_HolographicPauseOnTrackingLoss: 1
......@@ -148,7 +148,7 @@ PlayerSettings:
tvOS: cn.ygopro2.ygopro2android
buildNumber:
iOS:
AndroidBundleVersionCode: 2
AndroidBundleVersionCode: 4
AndroidMinSdkVersion: 16
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
......
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