Skip to content

Y
ygopro2
Commit 0b888eb7 authored by Unicorn's avatar Unicorn
Browse files
Options

微调

parent 3fe57757
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 54 deletions
Assets/SibylSystem/Ocgcore/OCGobjects/gameField.cs
View file @ 0b888eb7
......@@ -431,21 +431,21 @@ public class GameField : OCGobject
{
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".png");
}
else if (File.Exists("expansions/pics/field/" + code.ToString() + ".jpg"))
{
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".jpg");
}
else if (File.Exists("pics/field/" + code.ToString() + ".png"))
{
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".png");
}
else if (File.Exists("pics/field/" + code.ToString() + ".jpg"))
else if (File.Exists("picture/field/" + code.ToString() + ".jpg"))
{
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".jpg");
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg");
}
else if (File.Exists("expansions/pics/field/" + code.ToString() + ".jpg"))
{
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".jpg");
}
else
{
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg");
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".jpg");
}
if (tex != null)
{
......
Assets/SibylSystem/Program.cs
View file @ 0b888eb7
......@@ -337,8 +337,9 @@ public class Program : MonoBehaviour
GameStringManager.initialize("expansions/strings.conf");
}
YGOSharp.BanlistManager.initialize("lflist.conf");//YGOMobile Paths
YGOSharp.CardsManager.initialize("cards.cdb");
FileInfo[] fileInfos = (new DirectoryInfo("cdb")).GetFiles().OrderByDescending(x => x.Name).ToArray();
/*FileInfo[] fileInfos = (new DirectoryInfo("cdb")).GetFiles().OrderByDescending(x => x.Name).ToArray();
//FileInfo[] fileInfos = (new DirectoryInfo("cdb" + AppLanguage.LanguageDir())).GetFiles().OrderByDescending(x => x.Name).ToArray();//System Language
for (int i = 0; i < fileInfos.Length; i++)
{
......@@ -350,12 +351,12 @@ public class Program : MonoBehaviour
//YGOSharp.CardsManager.initialize("cdb" + AppLanguage.LanguageDir() + "/" + fileInfos[i].Name);//System Language
}
}
}
}*/
if (Directory.Exists("expansions"))
//if (Directory.Exists("expansions" + AppLanguage.LanguageDir()))//System Language
{
fileInfos = (new DirectoryInfo("expansions")).GetFiles().OrderByDescending(x => x.Name).ToArray();
FileInfo[] fileInfos = (new DirectoryInfo("expansions")).GetFiles().OrderByDescending(x => x.Name).ToArray();
//fileInfos = (new DirectoryInfo("expansions" + AppLanguage.LanguageDir())).GetFiles().OrderByDescending(x => x.Name).ToArray();//System Language
for (int i = 0; i < fileInfos.Length; i++)
{
......@@ -371,16 +372,19 @@ public class Program : MonoBehaviour
}
fileInfos = (new DirectoryInfo("pack")).GetFiles();
//fileInfos = (new DirectoryInfo("pack" + AppLanguage.LanguageDir())).GetFiles();
for (int i = 0; i < fileInfos.Length; i++)
if (Directory.Exists("pack"))
{
if (fileInfos[i].Name.Length > 3)
FileInfo[] fileInfos = (new DirectoryInfo("pack")).GetFiles();
//fileInfos = (new DirectoryInfo("pack" + AppLanguage.LanguageDir())).GetFiles();
for (int i = 0; i < fileInfos.Length; i++)
{
if (fileInfos[i].Name.Substring(fileInfos[i].Name.Length - 3, 3) == ".db")
if (fileInfos[i].Name.Length > 3)
{
YGOSharp.PacksManager.initialize("pack/" + fileInfos[i].Name);
//YGOSharp.PacksManager.initialize("pack" + AppLanguage.LanguageDir() + "/" + fileInfos[i].Name);
if (fileInfos[i].Name.Substring(fileInfos[i].Name.Length - 3, 3) == ".db")
{
YGOSharp.PacksManager.initialize("pack/" + fileInfos[i].Name);
//YGOSharp.PacksManager.initialize("pack" + AppLanguage.LanguageDir() + "/" + fileInfos[i].Name);
}
}
}
}
......
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
View file @ 0b888eb7
......@@ -332,15 +332,6 @@ public class GameTextureManager
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
bool Iam8 = false;
//if (!File.Exists(path))
//{
// Iam8 = true;
// path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
//}
if (!File.Exists(path))
{
path = "expansions/pics/" + pic.code.ToString() + ".png";
}
if (!File.Exists(path))
{
Iam8 = true;
......@@ -348,12 +339,13 @@ public class GameTextureManager
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".png";
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
......@@ -612,15 +604,6 @@ public class GameTextureManager
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
bool Iam8 = false;
//if (!File.Exists(path))
//{
// Iam8 = true;
// path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
//}
if (!File.Exists(path))
{
path = "expansions/pics/" + pic.code.ToString() + ".png";
}
if (!File.Exists(path))
{
Iam8 = true;
......@@ -628,12 +611,13 @@ public class GameTextureManager
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".png";
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
......@@ -653,11 +637,7 @@ public class GameTextureManager
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
path = "picture/null/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
path = "picture/null.png";
}
path = "picture/null.png";
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
......@@ -667,6 +647,19 @@ public class GameTextureManager
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
//#elif UNITY_IPHONE //iPhone Test (Android not support)
//path = Application.streamingAssetsPath + "/closeup/" + pic.code.ToString() + ".png";
//if (File.Exists(path))
//{
// www = new WWW(path);
// byte[] data = www.bytes;
// pic.data = data;
//} else {
// path = Application.streamingAssetsPath + "/null.png"
// www = new WWW(path);
// byte[] data = www.bytes;
// pic.data = data;
//}
#endif
}
else
......@@ -803,25 +796,17 @@ public class GameTextureManager
{
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
//if (!File.Exists(path))
//{
// path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
//}
if (!File.Exists(path))
{
path = "expansions/pics/" + pic.code.ToString() + ".png";
}
if (!File.Exists(path))
{
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".png";
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".jpg";
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
#if UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
if (!File.Exists(path) && pic.code != 0)
......
Assets/StreamingAssets/null.png.meta 0 → 100644
View file @ 0b888eb7
fileFormatVersion: 2
guid: 7cc6adf5988b03345bc3fbbdb145cbab
timeCreated: 1548561685
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/transUI/prefab/RoomList.prefab.meta 0 → 100644
View file @ 0b888eb7
fileFormatVersion: 2
guid: 2ee19dceffad869469d4ae6ce0acc3c5
timeCreated: 1547880684
licenseType: Free
NativeFormatImporter:
mainObjectFileID: -1
userData:
assetBundleName:
assetBundleVariant:
Assets/transUI/prefab/selectServerWithRoomlist.prefab.meta 0 → 100644
View file @ 0b888eb7
fileFormatVersion: 2
guid: aeecebc57be069842a18f05155794f6c
timeCreated: 1547880685
licenseType: Free
NativeFormatImporter:
mainObjectFileID: -1
userData:
assetBundleName:
assetBundleVariant:
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