diff --git a/Client/Assets/Scenes/Test.unity b/Client/Assets/Scenes/Test.unity index 0d3257f..0973207 100644 --- a/Client/Assets/Scenes/Test.unity +++ b/Client/Assets/Scenes/Test.unity @@ -319,7 +319,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &912467178 Transform: m_ObjectHideFlags: 0 @@ -616,6 +616,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1371068282} + - component: {fileID: 1371068283} m_Layer: 0 m_Name: Loader m_TagString: Untagged @@ -638,6 +639,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1371068283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371068281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 147e91e6929d90a4fb877c0b0a6b608c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Configs/ConfigProcessor.cs b/Client/Assets/Scripts/Configs/ConfigProcessor.cs index 86b6108..774dfea 100644 --- a/Client/Assets/Scripts/Configs/ConfigProcessor.cs +++ b/Client/Assets/Scripts/Configs/ConfigProcessor.cs @@ -160,27 +160,25 @@ namespace Configs foreach (var path in paths) { - // 获取程序所在的目录路径 - var appDirectory = AppDomain.CurrentDomain.BaseDirectory; - - // 构建目标目录的完整路径 - var dataDirectory = Path.Combine(appDirectory, path); try { // 检查目录是否存在 - if (Directory.Exists(dataDirectory)) + if (!Directory.Exists(path)) { - // 获取目录下的所有子文件夹 - var subDirectories = Directory.GetDirectories(dataDirectory); - - // 遍历并收集每个子文件夹中的 XML 文件 - foreach (var dir in subDirectories) - { - var xmlFiles = Directory.GetFiles(dir, "*.xml", SearchOption.AllDirectories); - xmlFilePaths.AddRange(xmlFiles); - } + continue; } + + // 获取目录下的所有子文件夹 + var subDirectories = Directory.GetDirectories(path); + + // 遍历并收集每个子文件夹中的 XML 文件 + foreach (var dir in subDirectories) + { + var xmlFiles = Directory.GetFiles(dir, "*.xml", SearchOption.AllDirectories); + xmlFilePaths.AddRange(xmlFiles); + } + } catch (Exception ex) { diff --git a/Client/Assets/Scripts/Data/DefinePack.cs b/Client/Assets/Scripts/Data/DefinePack.cs index 3634d23..1c69288 100644 --- a/Client/Assets/Scripts/Data/DefinePack.cs +++ b/Client/Assets/Scripts/Data/DefinePack.cs @@ -11,15 +11,15 @@ namespace Data { public class PackAbout { - public string[] after; - public string author; - public string[] before; - public string description; public string name; + public string description; + public string author; + public string version; + public string packID; public string[] necessary; - public string packID; - public string version; + public string[] after; + public string[] before; /// /// 使用静态方法从 XML 文档创建 PackAbout 实例。 @@ -123,9 +123,9 @@ namespace Data packID = packAbout.packID; if (aboutXmls.Count > 1) Debug.LogWarning($"{packAbout.name}包拥有多个配置文件,系统选择了加载序的第一个,请避免这种情况"); - var defineXmls = FindDocumentsWithRootName(aboutXmls, "Define"); + var defineXmls = FindDocumentsWithRootName(packDatas, "Define"); + // Debug.Log($"Define文件数量{defineXmls.Count}"); foreach (var defineXml in defineXmls) LoadDefines(defineXml); - return true; } @@ -140,12 +140,15 @@ namespace Data var className = element.Name.ToString(); if (string.IsNullOrEmpty(className)) continue; + // Debug.Log("1"); var def = LoadDefineClass(element); if (def == null) continue; + // Debug.Log("2"); if (!defines.ContainsKey(className)) defines.Add(className, new List()); defines[className].Add(def); + // Debug.Log($"插入{className},{def.defName}"); } } diff --git a/Client/Assets/Scripts/Managers/DefineManager.cs b/Client/Assets/Scripts/Managers/DefineManager.cs index 761b5c5..776a6f9 100644 --- a/Client/Assets/Scripts/Managers/DefineManager.cs +++ b/Client/Assets/Scripts/Managers/DefineManager.cs @@ -15,12 +15,29 @@ namespace Managers public void Init() { - var packFolder = Directory.GetDirectories(dataSetFilePath[0]); + var packFolder = Configs.ConfigProcessor.GetSubFolders(new(dataSetFilePath)); foreach (var folder in packFolder) { var pack = new DefinePack(); if (pack.LoadPack(folder)) packs.Add(pack.packID, pack); } } + + public override string ToString() + { + if (packs == null || packs.Count == 0) + { + return "No packs available"; // 如果集合为空或为 null,返回默认信息 + } + + var result = new System.Text.StringBuilder(); + + foreach (var definePack in packs) + { + result.AppendLine(definePack.ToString()); // 每个元素占一行 + } + + return result.ToString(); + } } } \ No newline at end of file diff --git a/Client/Assets/Scripts/Test/ClockTest.cs b/Client/Assets/Scripts/Test/ClockTest.cs index b8e753b..25bdf66 100644 --- a/Client/Assets/Scripts/Test/ClockTest.cs +++ b/Client/Assets/Scripts/Test/ClockTest.cs @@ -5,7 +5,7 @@ namespace Test { public class ClockTest : MonoBehaviour { - private static float timer = 0; + //private static float timer = 0; // Start is called once before the first execution of Update after the MonoBehaviour is created private void Start() diff --git a/Client/Assets/Scripts/Test/TestDefine.cs b/Client/Assets/Scripts/Test/TestDefine.cs new file mode 100644 index 0000000..d3730f4 --- /dev/null +++ b/Client/Assets/Scripts/Test/TestDefine.cs @@ -0,0 +1,23 @@ +using UnityEngine; + +namespace Test +{ + + + public class TestDefine : MonoBehaviour + { + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + Managers.DefineManager.Instance.Init(); + Debug.Log(Managers.DefineManager.Instance); + } + + // Update is called once per frame + void Update() + { + + } + } + +} diff --git a/Client/Assets/Scripts/Test/TestDefine.cs.meta b/Client/Assets/Scripts/Test/TestDefine.cs.meta new file mode 100644 index 0000000..7d92609 --- /dev/null +++ b/Client/Assets/Scripts/Test/TestDefine.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 147e91e6929d90a4fb877c0b0a6b608c \ No newline at end of file diff --git a/Client/Data/Core/About/About.xml b/Client/Data/Core/About/About.xml new file mode 100644 index 0000000..48411aa --- /dev/null +++ b/Client/Data/Core/About/About.xml @@ -0,0 +1,11 @@ + + + 核心 + 这是游戏的核心模块,除非有完整的代替,否则应该永远作为启动项 + 0.1 + core + + + + + \ No newline at end of file diff --git a/Client/Data/Core/Define/Player/CatGirl.xml b/Client/Data/Core/Define/Player/CatGirl.xml new file mode 100644 index 0000000..cfefb6b --- /dev/null +++ b/Client/Data/Core/Define/Player/CatGirl.xml @@ -0,0 +1,37 @@ + + + + + CatGirl + 100 + 1.2 + 5 + + + + CatGirl + + She is a cat girl with agile movements and sharp senses. + CatGirl + + CatGirl_down + CatGirl_left + CatGirl_right + CatGirl_up + + + + + CatGirl_down + + + + + + + + + + + + \ No newline at end of file diff --git a/Client/Data/Core/Resource/Character/CatGirl/body/east.png b/Client/Data/Core/Resource/Character/CatGirl/body/east.png new file mode 100644 index 0000000..260b6d4 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/body/east.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/body/north.png b/Client/Data/Core/Resource/Character/CatGirl/body/north.png new file mode 100644 index 0000000..768c79b Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/body/north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/body/south.png b/Client/Data/Core/Resource/Character/CatGirl/body/south.png new file mode 100644 index 0000000..49ed706 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/body/south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/clothing/east.png b/Client/Data/Core/Resource/Character/CatGirl/clothing/east.png new file mode 100644 index 0000000..3f0eda8 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/clothing/east.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/clothing/north.png b/Client/Data/Core/Resource/Character/CatGirl/clothing/north.png new file mode 100644 index 0000000..10961ca Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/clothing/north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/clothing/south.png b/Client/Data/Core/Resource/Character/CatGirl/clothing/south.png new file mode 100644 index 0000000..44a5b53 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/clothing/south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_east.png b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_east.png new file mode 100644 index 0000000..33b823c Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_east.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_north.png b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_north.png new file mode 100644 index 0000000..70c4073 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_south.png b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_south.png new file mode 100644 index 0000000..3de840b Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hair/KiiroHair5_south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_east.png b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_east.png new file mode 100644 index 0000000..ec45eed Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_east.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_north.png b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_north.png new file mode 100644 index 0000000..f2aa755 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_south.png b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_south.png new file mode 100644 index 0000000..d1ea811 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/hairBackground/KiiroHairBG5_south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_north.png b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_north.png new file mode 100644 index 0000000..eb9905a Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_south.png b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_south.png new file mode 100644 index 0000000..cc69574 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_west.png b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_west.png new file mode 100644 index 0000000..0ad6604 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/head/KiiroHeadH1_west.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_north.png b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_north.png new file mode 100644 index 0000000..75281af Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_south.png b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_south.png new file mode 100644 index 0000000..7ad9496 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_south.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_west.png b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_west.png new file mode 100644 index 0000000..57836a3 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/leftEar/LeftEar_west.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_east.png b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_east.png new file mode 100644 index 0000000..44d71f4 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_east.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_north.png b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_north.png new file mode 100644 index 0000000..9bdcca0 Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_north.png differ diff --git a/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_south.png b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_south.png new file mode 100644 index 0000000..5a5d6db Binary files /dev/null and b/Client/Data/Core/Resource/Character/CatGirl/rightEar/RightEar_south.png differ diff --git a/Client/Data/Core/Translation/Replace/Character.xml b/Client/Data/Core/Translation/Replace/Character.xml new file mode 100644 index 0000000..f990ad9 --- /dev/null +++ b/Client/Data/Core/Translation/Replace/Character.xml @@ -0,0 +1,6 @@ + + + + 猫娘 + 她是一个猫娘,拥有猫的特性和人类的智慧。她的耳朵和尾巴显示了她的猫族血统。 + \ No newline at end of file