Skip to content

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

Set Version to 2.2

parents 36bb6653 6781d4e0
Expand all 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/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
......
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