Skip to content

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

微调

parent 29cdb05f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 44 deletions
Assets/SibylSystem/Ocgcore/OCGobjects/gameField.cs
View file @ a6c4c4c5
...@@ -431,21 +431,21 @@ public class GameField : OCGobject ...@@ -431,21 +431,21 @@ public class GameField : OCGobject
{ {
tex = UIHelper.getTexture2D("expansions/pics/field/" + code.ToString() + ".png"); 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")) else if (File.Exists("pics/field/" + code.ToString() + ".png"))
{ {
tex = UIHelper.getTexture2D("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 else
{ {
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg"); tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".jpg");
} }
if (tex != null) if (tex != null)
{ {
......
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
View file @ a6c4c4c5
...@@ -332,15 +332,6 @@ public class GameTextureManager ...@@ -332,15 +332,6 @@ public class GameTextureManager
path = "picture/card/" + pic.code.ToString() + ".jpg"; path = "picture/card/" + pic.code.ToString() + ".jpg";
} }
bool Iam8 = false; 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)) if (!File.Exists(path))
{ {
Iam8 = true; Iam8 = true;
...@@ -348,12 +339,13 @@ public class GameTextureManager ...@@ -348,12 +339,13 @@ public class GameTextureManager
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
path = "pics/" + pic.code.ToString() + ".png"; Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
Iam8 = true; Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg"; path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
...@@ -612,15 +604,6 @@ public class GameTextureManager ...@@ -612,15 +604,6 @@ public class GameTextureManager
path = "picture/card/" + pic.code.ToString() + ".jpg"; path = "picture/card/" + pic.code.ToString() + ".jpg";
} }
bool Iam8 = false; 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)) if (!File.Exists(path))
{ {
Iam8 = true; Iam8 = true;
...@@ -628,12 +611,13 @@ public class GameTextureManager ...@@ -628,12 +611,13 @@ public class GameTextureManager
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
path = "pics/" + pic.code.ToString() + ".png"; Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
Iam8 = true; Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg"; path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
...@@ -653,11 +637,7 @@ public class GameTextureManager ...@@ -653,11 +637,7 @@ public class GameTextureManager
* 暂时只能直接贴图，以后再处理 * 暂时只能直接贴图，以后再处理
*/ */
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone #elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
path = "picture/null/" + pic.code.ToString() + ".png"; path = "picture/null.png";
if (!File.Exists(path))
{
path = "picture/null.png";
}
byte[] data; byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read)) using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
...@@ -667,6 +647,19 @@ public class GameTextureManager ...@@ -667,6 +647,19 @@ public class GameTextureManager
file.Read(data, 0, (int)file.Length); file.Read(data, 0, (int)file.Length);
} }
pic.data = data; 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 #endif
} }
else else
...@@ -803,25 +796,17 @@ public class GameTextureManager ...@@ -803,25 +796,17 @@ public class GameTextureManager
{ {
path = "picture/card/" + pic.code.ToString() + ".jpg"; 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)) if (!File.Exists(path))
{ {
path = "expansions/pics/" + pic.code.ToString() + ".jpg"; path = "expansions/pics/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) if (!File.Exists(path))
{ {
path = "pics/" + pic.code.ToString() + ".png"; path = "pics/" + pic.code.ToString() + ".jpg";
} }
if (!File.Exists(path)) 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 UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
if (!File.Exists(path) && pic.code != 0) if (!File.Exists(path) && pic.code != 0)
......
Assets/StreamingAssets/null.png.meta 0 → 100644
View file @ a6c4c4c5
fileFormatVersion: 2
guid: 7cc6adf5988b03345bc3fbbdb145cbab
timeCreated: 1548561685
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/transUI/prefab/RoomList.prefab.meta 0 → 100644
View file @ a6c4c4c5
fileFormatVersion: 2
guid: 2ee19dceffad869469d4ae6ce0acc3c5
timeCreated: 1547880684
licenseType: Free
NativeFormatImporter:
mainObjectFileID: -1
userData:
assetBundleName:
assetBundleVariant:
Assets/transUI/prefab/selectServerWithRoomlist.prefab.meta 0 → 100644
View file @ a6c4c4c5
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