Commit 8b51299c authored by Unicorn's avatar Unicorn

修改路径、资源名

parent 990b8ff8
......@@ -33,15 +33,26 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
Temp/
ygopro.jks
AI_core_vs2017solution/bin/
AI_core_vs2017solution/obj/
AI_core_vs2017solution/build/android/libs/
AI_core_vs2017solution/build/android/obj/
# ygopro
cdb/
config/
deck/
expansions/
pack/
texture/
config/
bin/
Release/
picture/
replay/
sound/
textures/
cards.cdb
lflist.conf
strings.conf
AI_core_vs2017solution/core.VC.db
AI_core_vs2017solution/core.VC.VC.opendb
AI_core_vs2017solution/System.Servicemodel.Faltexception.dll
......@@ -20,7 +20,7 @@ public class barPngLoader : MonoBehaviour {
api_timeBar.mainTexture = GameTextureManager.time;
try
{
string[] allLines = (File.ReadAllText("texture/duel/healthBar/config.txt").Replace("\r", "").Replace(" ", "").Split("\n"));
string[] allLines = (File.ReadAllText("textures/duel/healthBar/config.txt").Replace("\r", "").Replace(" ", "").Split("\n"));
foreach (var item in allLines)
{
string[] mats = item.Split("=");
......
......@@ -33,7 +33,7 @@ public class UITextureInspector : UIBasicSpriteEditor
startPath = sp2.stringValue;
if (startPath != "")
{
mTex.mainTexture = UIHelper.getTexture2D("texture/ui/" + startPath + ".png");
mTex.mainTexture = UIHelper.getTexture2D("textures/ui/" + startPath + ".png");
}
Debug.Log("force delay read");
}
......
fileFormatVersion: 2
guid: d99c5fc24f8901d4ebbe9d4a2b76e8f8
folderAsset: yes
timeCreated: 1547534829
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5beb3ac7c52c73345a5352b3a8dee6a5
timeCreated: 1470053253
licenseType: Pro
guid: 65c8eb999d542c94d9b46f8189bb2628
timeCreated: 1533102221
licenseType: Free
PluginImporter:
serializedVersion: 1
iconMap: {}
......
fileFormatVersion: 2
guid: feb78fb1429f66f468191cb2ab1156e1
folderAsset: yes
timeCreated: 1547534829
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0f738a87ac9cdee4781b8a97c7aa8109
timeCreated: 1470053253
licenseType: Pro
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Any:
second:
enabled: 1
settings: {}
data:
first:
Editor: Editor
second:
enabled: 0
settings:
CPU: x86_64
DefaultValueInitialized: true
data:
first:
Facebook: Win
second:
enabled: 0
settings:
CPU: None
data:
first:
Facebook: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: Linux
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: Linux64
second:
enabled: 1
settings:
CPU: x86_64
data:
first:
Standalone: LinuxUniversal
second:
enabled: 1
settings:
CPU: x86_64
data:
first:
Standalone: OSXIntel
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: OSXIntel64
second:
enabled: 1
settings:
CPU: AnyCPU
data:
first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: x86_64
data:
first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
data:
first:
Standalone: Win64
second:
enabled: 1
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,7 +7,7 @@ public class BackGroundPic : Servant
public override void initialize()
{
backGround = create(Program.I().mod_simple_ngui_background_texture, Vector3.zero, Vector3.zero, false, Program.ui_back_ground_2d);
FileStream file = new FileStream("texture/common/desk.jpg", FileMode.Open, FileAccess.Read);
FileStream file = new FileStream("textures/bg.jpg", FileMode.Open, FileAccess.Read);
file.Seek(0, SeekOrigin.Begin);
byte[] data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
......
......@@ -51,7 +51,7 @@ public static class Config
if (loaded == false)
{
loaded = true;
string[] lines = File.ReadAllText("texture/ui/config.txt").Replace("\r", "").Replace(" ", "").Split("\n");
string[] lines = File.ReadAllText("textures/ui/config.txt").Replace("\r", "").Replace(" ", "").Split("\n");
for (int i = 0; i < lines.Length; i++)
{
string[] mats = lines[i].Split("=");
......
......@@ -736,7 +736,7 @@ public static class UIHelper
{
try
{
FileInfo[] fileInfos = (new DirectoryInfo("texture/face")).GetFiles();
FileInfo[] fileInfos = (new DirectoryInfo("textures/face")).GetFiles();
for (int i = 0; i < fileInfos.Length; i++)
{
if (fileInfos[i].Name.Length > 4)
......@@ -748,7 +748,7 @@ public static class UIHelper
{
try
{
faces.Add(name, UIHelper.getTexture2D("texture/face/" + fileInfos[i].Name));
faces.Add(name, UIHelper.getTexture2D("textures/face/" + fileInfos[i].Name));
}
catch (Exception e)
{
......
......@@ -130,9 +130,9 @@ public class GameField : OCGobject
public void loadOldField()
{
if (File.Exists("texture/duel/field.png"))
if (File.Exists("textures/field2.png"))
{
Texture2D textureField = UIHelper.getTexture2D("texture/duel/field.png");
Texture2D textureField = UIHelper.getTexture2D("textures/field2.png");
Texture2D[] textureFieldSliced = UIHelper.sliceField(textureField);
leftT.mainTexture = textureFieldSliced[0];
midT.mainTexture = textureFieldSliced[1];
......@@ -150,9 +150,9 @@ public class GameField : OCGobject
public void loadNewField()
{
if (File.Exists("texture/duel/newfield.png"))
if (File.Exists("textures/field3.png"))
{
Texture2D textureField = UIHelper.getTexture2D("texture/duel/newfield.png");
Texture2D textureField = UIHelper.getTexture2D("textures/field3.png");
Texture2D[] textureFieldSliced = UIHelper.sliceField(textureField);
leftT.mainTexture = textureFieldSliced[0];
midT.mainTexture = textureFieldSliced[1];
......@@ -427,6 +427,22 @@ public class GameField : OCGobject
{
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".png");
}
else if (File.Exists("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"))
{
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".png");
}
else if (File.Exists("pics/field/" + code.ToString() + ".jpg"))
{
tex = UIHelper.getTexture2D("pics/field/" + code.ToString() + ".jpg");
}
else
{
tex = UIHelper.getTexture2D("picture/field/" + code.ToString() + ".jpg");
......
......@@ -280,12 +280,27 @@ public class Program : MonoBehaviour
//保持唤醒
Screen.sleepTimeout = SleepTimeout.NeverSleep;
//创建资源目录
if (!Directory.Exists("/storage/emulated/0/ygopro2"))
if (!Directory.Exists("/storage/emulated/0/ygocore"))
{
Directory.CreateDirectory("/storage/emulated/0/ygopro2");
DirPaths("/storage/emulated/0/ygocore/cdb/");
DirPaths("/storage/emulated/0/ygocore/config/");
DirPaths("/storage/emulated/0/ygocore/deck/");
DirPaths("/storage/emulated/0/ygocore/expansions/pics/field/");
DirPaths("/storage/emulated/0/ygocore/pack/");
DirPaths("/storage/emulated/0/ygocore/pics/field/");
DirPaths("/storage/emulated/0/ygocore/picture/cardIn8thEdition/");
DirPaths("/storage/emulated/0/ygocore/replay/");
DirPaths("/storage/emulated/0/ygocore/sound/");
DirPaths("/storage/emulated/0/ygocore/textures/common/");
DirPaths("/storage/emulated/0/ygocore/textures/face/");
DirPaths("/storage/emulated/0/ygocore/textures/duel/healthBar/");
DirPaths("/storage/emulated/0/ygocore/textures/duel/phase/");
DirPaths("/storage/emulated/0/ygocore/textures/ui/");
File.Create("/storage/emulated/0/ygocore/.nomedia");
File.Create("/storage/emulated/0/ygocore/expansions/pics/.nomedia");
}
Environment.CurrentDirectory = "/storage/emulated/0/ygopro2";
System.IO.Directory.SetCurrentDirectory("/storage/emulated/0/ygopro2");
Environment.CurrentDirectory = "/storage/emulated/0/ygocore";
System.IO.Directory.SetCurrentDirectory("/storage/emulated/0/ygocore");
#elif UNITY_IPHONE //iPhone
Environment.CurrentDirectory = Application.persistentDataPath;
System.IO.Directory.SetCurrentDirectory(Application.persistentDataPath);
......@@ -302,9 +317,10 @@ public class Program : MonoBehaviour
go(300, () =>
{
InterString.initialize("config/translation.conf");
//InterString.initialize("config" + AppLanguage.LanguageDir() + "/translation.conf"); //System Language
GameTextureManager.initialize();
Config.initialize("config/config.conf");
GameStringManager.initialize("config/strings.conf");
GameStringManager.initialize("strings.conf");
if (File.Exists("cdb/strings.conf"))
{
GameStringManager.initialize("cdb/strings.conf");
......@@ -313,9 +329,10 @@ public class Program : MonoBehaviour
{
GameStringManager.initialize("expansions/strings.conf");
}
YGOSharp.BanlistManager.initialize("config/lflist.conf");
YGOSharp.BanlistManager.initialize("lflist.conf");
var fileInfos = (new DirectoryInfo("cdb")).GetFiles();
//var fileInfos = (new DirectoryInfo("cdb" + AppLanguage.LanguageDir())).GetFiles();//System Language
for (int i = 0; i < fileInfos.Length; i++)
{
if (fileInfos[i].Name.Length > 4)
......@@ -323,13 +340,16 @@ public class Program : MonoBehaviour
if (fileInfos[i].Name.Substring(fileInfos[i].Name.Length - 4, 4) == ".cdb")
{
YGOSharp.CardsManager.initialize("cdb/" + fileInfos[i].Name);
//YGOSharp.CardsManager.initialize("cdb" + AppLanguage.LanguageDir() + "/" + fileInfos[i].Name);//System Language
}
}
}
if (Directory.Exists("expansions"))
//if (Directory.Exists("expansions" + AppLanguage.LanguageDir()))
{
fileInfos = (new DirectoryInfo("expansions")).GetFiles();
//fileInfos = (new DirectoryInfo("expansions" + AppLanguage.LanguageDir())).GetFiles();
for (int i = 0; i < fileInfos.Length; i++)
{
if (fileInfos[i].Name.Length > 4)
......@@ -337,6 +357,7 @@ public class Program : MonoBehaviour
if (fileInfos[i].Name.Substring(fileInfos[i].Name.Length - 4, 4) == ".cdb")
{
YGOSharp.CardsManager.initialize("expansions/" + fileInfos[i].Name);
//YGOSharp.CardsManager.initialize("expansions" + AppLanguage.LanguageDir() + "/" + fileInfos[i].Name);
}
}
}
......@@ -344,6 +365,7 @@ 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 (fileInfos[i].Name.Length > 3)
......@@ -351,6 +373,7 @@ public class Program : MonoBehaviour
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);
}
}
}
......@@ -851,7 +874,7 @@ public class Program : MonoBehaviour
Screen.SetResolution(1280, 720, true);
Application.targetFrameRate = -1;
#endif
mouseParticle = Instantiate(new_mouse);
instance = this;
initialize();
......@@ -997,4 +1020,26 @@ public class Program : MonoBehaviour
#endregion
//递归创建目录
private static void DirPaths(string filefullpath)
{
if (!File.Exists(filefullpath))
{
string dirpath = filefullpath.Substring(0, filefullpath.LastIndexOf("/"));
string[] paths = dirpath.Split("/");
if (paths.Length > 1)
{
string path = paths[0];
for (int i = 1; i < paths.Length; i++)
{
path += "/" + paths[i];
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
}
}
}
}
}
......@@ -315,6 +315,16 @@ public class GameTextureManager
}
bool Iam8 = false;
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
......@@ -576,13 +586,23 @@ public class GameTextureManager
}
bool Iam8 = false;
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "texture/duel/unknown.jpg";
path = "textures/unknown.jpg";
}
if (!File.Exists(path))
{
......@@ -712,6 +732,22 @@ 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";
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".jpg";
}
......@@ -834,7 +870,7 @@ public class GameTextureManager
if (uiLoaded == false)
{
uiLoaded = true;
FileInfo[] fileInfos = (new DirectoryInfo("texture/ui")).GetFiles();
FileInfo[] fileInfos = (new DirectoryInfo("textures/ui")).GetFiles();
for (int i = 0; i < fileInfos.Length; i++)
{
if (fileInfos[i].Name.Length > 4)
......@@ -843,7 +879,7 @@ public class GameTextureManager
{
UIPictureResource r = new UIPictureResource();
r.name = fileInfos[i].Name.Substring(0, fileInfos[i].Name.Length - 4);
r.data = UIHelper.getTexture2D("texture/ui/" + fileInfos[i].Name);
r.data = UIHelper.getTexture2D("textures/ui/" + fileInfos[i].Name);
allUI.Add(r);
}
}
......@@ -868,35 +904,35 @@ public class GameTextureManager
internal static void initialize()
{
attack = UIHelper.getTexture2D("texture/duel/attack.png");
myBack = UIHelper.getTexture2D("texture/duel/me.jpg");
opBack = UIHelper.getTexture2D("texture/duel/opponent.jpg");
unknown = UIHelper.getTexture2D("texture/duel/unknown.jpg");
negated = UIHelper.getTexture2D("texture/duel/negated.png");
bar = UIHelper.getTexture2D("texture/duel/healthBar/bg.png");
exBar = UIHelper.getTexture2D("texture/duel/healthBar/excited.png");
time = UIHelper.getTexture2D("texture/duel/healthBar/t.png");
lp = UIHelper.getTexture2D("texture/duel/healthBar/lp.png");
L = UIHelper.getTexture2D("texture/duel/L.png");
R = UIHelper.getTexture2D("texture/duel/R.png");
LINK = UIHelper.getTexture2D("texture/duel/link.png");
LINKm = UIHelper.getTexture2D("texture/duel/linkMask.png");
Chain = UIHelper.getTexture2D("texture/duel/chain.png");
Mask = UIHelper.getTexture2D("texture/duel/mask.png");
nt = UIHelper.getTexture2D("texture/duel/phase/nt.png");
bp = UIHelper.getTexture2D("texture/duel/phase/bp.png");
ep = UIHelper.getTexture2D("texture/duel/phase/ep.png");
mp1 = UIHelper.getTexture2D("texture/duel/phase/mp1.png");
mp2 = UIHelper.getTexture2D("texture/duel/phase/mp2.png");
dp = UIHelper.getTexture2D("texture/duel/phase/dp.png");
sp = UIHelper.getTexture2D("texture/duel/phase/sp.png");
phase = UIHelper.getTexture2D("texture/duel/phase/phase.png");
rs = UIHelper.getTexture2D("texture/duel/phase/rs.png");
ts = UIHelper.getTexture2D("texture/duel/phase/ts.png");
attack = UIHelper.getTexture2D("textures/attack.png");
myBack = UIHelper.getTexture2D("textures/cover.jpg");
opBack = UIHelper.getTexture2D("textures/cover2.jpg");
unknown = UIHelper.getTexture2D("textures/unknown.jpg");
negated = UIHelper.getTexture2D("textures/negated.png");
bar = UIHelper.getTexture2D("textures/duel/healthBar/bg.png");
exBar = UIHelper.getTexture2D("textures/duel/healthBar/excited.png");
time = UIHelper.getTexture2D("textures/duel/healthBar/t.png");
lp = UIHelper.getTexture2D("textures/duel/healthBar/lp.png");
L = UIHelper.getTexture2D("textures/duel/L.png");
R = UIHelper.getTexture2D("textures/duel/R.png");
LINK = UIHelper.getTexture2D("textures/duel/link.png");
LINKm = UIHelper.getTexture2D("textures/duel/linkMask.png");
Chain = UIHelper.getTexture2D("textures/chain.png");
Mask = UIHelper.getTexture2D("textures/mask.png");
nt = UIHelper.getTexture2D("textures/duel/phase/nt.png");
bp = UIHelper.getTexture2D("textures/duel/phase/bp.png");
ep = UIHelper.getTexture2D("textures/duel/phase/ep.png");
mp1 = UIHelper.getTexture2D("textures/duel/phase/mp1.png");
mp2 = UIHelper.getTexture2D("textures/duel/phase/mp2.png");
dp = UIHelper.getTexture2D("textures/duel/phase/dp.png");
sp = UIHelper.getTexture2D("textures/duel/phase/sp.png");
phase = UIHelper.getTexture2D("textures/duel/phase/phase.png");
rs = UIHelper.getTexture2D("textures/duel/phase/rs.png");
ts = UIHelper.getTexture2D("textures/duel/phase/ts.png");
N = new Texture2D(10,10);
for (int i = 0; i < 10; i++)
......@@ -909,7 +945,7 @@ public class GameTextureManager
N.Apply();
try
{
ColorUtility.TryParseHtmlString(File.ReadAllText("texture/duel/chainColor.txt"), out chainColor);
ColorUtility.TryParseHtmlString(File.ReadAllText("textures/duel/chainColor.txt"), out chainColor);
}
catch (Exception)
{
......
......@@ -1084,7 +1084,7 @@ public class DeckManager : ServantWithCardDescription
gameObjectDesk.transform.position = new Vector3(0, 0, 0);
gameObjectDesk.transform.eulerAngles = new Vector3(90, 0, 0);
gameObjectDesk.transform.localScale = new Vector3(30, 30, 1);
gameObjectDesk.GetComponent<Renderer>().material.mainTexture = Program.GetTextureViaPath("texture/duel/deckTable.png");
gameObjectDesk.GetComponent<Renderer>().material.mainTexture = Program.GetTextureViaPath("textures/duel/deckTable.png");
//UIHelper.SetMaterialRenderingMode(gameObjectDesk.GetComponent<Renderer>().material, UIHelper.RenderingMode.Transparent);
Rigidbody rigidbody = gameObjectDesk.AddComponent<Rigidbody>();
rigidbody.useGravity = false;
......
......@@ -41,7 +41,7 @@ public class puzzleMode : WindowServantSP
public void KF_puzzle(string name)
{
launch("puzzle/" + name + ".lua");
launch("single/" + name + ".lua");
}
public override void show()
......@@ -54,7 +54,7 @@ public class puzzleMode : WindowServantSP
{
superScrollView.clear();
List<string[]> args = new List<string[]>();
FileInfo[] fileInfos = (new DirectoryInfo("puzzle")).GetFiles();
FileInfo[] fileInfos = (new DirectoryInfo("single")).GetFiles();
Array.Sort(fileInfos, UIHelper.CompareName);
for (int i = 0; i < fileInfos.Length; i++)
{
......
......@@ -41,6 +41,7 @@ GraphicsSettings:
- {fileID: 4800000, guid: 2f134f18e4841ed4dbbda16cc9e2d4c5, type: 3}
- {fileID: 4800000, guid: 9fc04a058c8768648a6532aa07540ca5, type: 3}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
......@@ -243,7 +243,7 @@ PlayerSettings:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 92d79efb33a455e48990f4a79c142aa9, type: 3}
m_Icon: {fileID: 2800000, guid: b4bba7c2184d6614e82044252cc03043, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 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