备份

Assets/Resources/XML/Data.xml

@@ -18,59 +18,9 @@
     </Color>
 
     <Value>
-      <Skill>
-        <Skill0>1</Skill0>
-        <Skill0>金币200</Skill0>
-        <Skill0>1</Skill0>
-        <Skill0>花园</Skill0>
-        <Skill0>每人次参观获得10金币</Skill0>
-        <Skill0>1</Skill0>
-
-        <Skill1>1</Skill1>
-        <Skill1>金币200</Skill1>
-        <Skill1>1</Skill1>
-        <Skill1>人潮涌动</Skill1>
-        <Skill1>每分钟增加6人参观 持续5分钟</Skill1>
-        <Skill1>1</Skill1>
-
-        <Skill2>1</Skill2>
-        <Skill2>钻石300</Skill2>
-        <Skill2>100</Skill2>
-        <Skill2>大亨光临</Skill2>
-        <Skill2>立刻获得每人次收入的500倍</Skill2>
-        <Skill2>0</Skill2>
-
-        <Skill3>1</Skill3>
-        <Skill3>钻石300</Skill3>
-        <Skill3>300</Skill3>
-        <Skill3>花之祝福</Skill3>
-        <Skill3>所有收入提升5倍 持续5分钟</Skill3>
-        <Skill3>0</Skill3>
-
-        <Skill4>1</Skill4>
-        <Skill4>钻石300</Skill4>
-        <Skill4>300</Skill4>
-        <Skill4>炼金石</Skill4>
-        <Skill4>每分钟增加两人参观 永久有效</Skill4>
-        <Skill4>0</Skill4>
-
-        <Skill5>1</Skill5>
-        <Skill5>钻石300</Skill5>
-        <Skill5>500</Skill5>
-        <Skill5>神秘灌木</Skill5>
-        <Skill5>每人次收入提升10% 永久有效</Skill5>
-        <Skill5>0</Skill5>
-
-        <Skill6>1</Skill6>
-        <Skill6>钻石300</Skill6>
-        <Skill6>500</Skill6>
-        <Skill6>滴哩哩的小黄莺</Skill6>
-        <Skill6>技能冷却时间减少5% 永久有效</Skill6>
-        <Skill6>0</Skill6>
-      </Skill>
-      <Garden>
+      <Ability>
         <SlideSpeed>0.25</SlideSpeed>
-      </Garden>
+      </Ability>
     </Value>
 
   </Data>

Assets/Script/Editor/EditorConfigExporter.cs

@@ -71,7 +71,7 @@ public class EditorConfigExporter : EditorWindow
 
                 //file
                 int index = p.LastIndexOf("\\");
-                string folder = p.Substring(0, index + 1);
+                //string folder = p.Substring(0, index + 1); //todo 取消注释
                 string fileName = p.Substring(index + 1);
 
                 //if directoryEntries is not null, tempPaths cannot be null after splited
@@ -108,7 +108,7 @@ public class EditorConfigExporter : EditorWindow
 
         public static string[] SplitWithString(string sourceString, string splitString)
         {
-            string tempSourceString = sourceString;
+            //string tempSourceString = sourceString; //todo 取消注释
             List<string> arrayList = new List<string>();
             string s = string.Empty;
             while (sourceString.IndexOf(splitString) > -1)  //split
@@ -181,7 +181,7 @@ public class EditorConfigExporter : EditorWindow
 
         if ((!File.Exists(filepath) && !shouldDelete) || shouldDelete)
         {
-            List<string> labels = new List<string>(), comments = new List<string>();
+            List<string> labels = new List<string>(); //comments = new List<string>(); //todo 取消注释
 
             XmlDocument xmlDoc = new XmlDocument();
 

Assets/Script/Manage/ManaGarden.cs

@@ -27,7 +27,7 @@ public class ManaGarden : MonoBehaviour
     {
         Ins = this;
 
-        ManaReso.Get("Garden", Folder.Object, transform).AddComponent<Garden>();
+        ManaReso.Get("Ability", Folder.Object, transform).AddComponent<Garden>();
     }
 
 

Assets/Script/Manage/ManaPlayer.cs

@@ -2,6 +2,8 @@
 using UnityEngine.UI;
 
 using System;
+using System.Xml;
+using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -9,7 +11,11 @@ public class ManaPlayer : MonoBehaviour
 {
     #region 变量
 
-    public static List<Skill> SkillList;
+    public static List<Skill> ElfList;
+    public static List<Skill> StoreList;
+    public static List<Skill> MagicList;
+    public static List<Skill> AbilityList;
+    public static List<Skill> ActivityList;
     public static ManaPlayer Ins;
 
     #endregion
@@ -20,25 +26,40 @@ public class ManaPlayer : MonoBehaviour
         
         ManaReso.Get("Player", Folder.Object, transform).AddComponent<Player>();
 
-        SkillList = new List<Skill>();
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill0")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill1")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill2")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill3")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill4")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill5")));
-        SkillList.Add(new Skill(Data.GetValue("Skill", "Skill6")));
+        #region 获取技能信息
 
-        for (int i = 0; i < SkillList.Count; i++)
+        ElfList = new List<Skill>();
+        StoreList = new List<Skill>();
+        MagicList = new List<Skill>();
+        AbilityList = new List<Skill>();
+        ActivityList = new List<Skill>();
+
+        XmlNodeList xmlNodeList = Data.GetSkillConfig();
+
+        for (int i = 0; i < xmlNodeList.Count; i++)
         {
-            print("Skill" + i);
-            print(SkillList[i].Level);
-            print(SkillList[i].BaseCost);
-            print(SkillList[i].UnLockLevel);
-            print(SkillList[i].Name);
-            print(SkillList[i].Description);
-            print(SkillList[i].SkillStatus);
-            print("");
+            List<string> infoList = new List<string>();
+            for (int j = 0; j < xmlNodeList[i].Attributes.Count; j++)
+            {
+                infoList.Add(xmlNodeList[i].Attributes[j].Value);
+            }
+
+            new Skill(infoList);
         }
+
+        xmlNodeList = Data.GetAbilityConfig();
+
+        for (int i = 0; i < xmlNodeList.Count; i++)
+        {
+            List<string> infoList = new List<string>();
+            for (int j = 0; j < xmlNodeList[i].Attributes.Count; j++)
+            {
+                infoList.Add(xmlNodeList[i].Attributes[j].Value);
+            }
+
+            new Skill(infoList);
+        }
+
+        #endregion
     }
 }

Assets/Script/Manage/ManaReso.cs

@@ -450,12 +450,12 @@ public class ManaReso : MonoBehaviour
                 Get<Button>("F_ElfTab").interactable = false;
                 Get<Button>("F_StoreTab").interactable = true;
                 Get<Button>("F_MagicTab").interactable = true;
-                Get<Button>("F_GardenTab").interactable = true;
+                Get<Button>("F_SkillTab").interactable = true;
 
                 SetActive("Fd_ElfTab", true);
                 SetActive("Fc_StoreTab", false);
                 SetActive("Fb_MagicTab", false);
-                SetActive("Fa_GardenTab", false);
+                SetActive("Fa_SkillTab", false);
             }
         );
 
@@ -467,12 +467,12 @@ public class ManaReso : MonoBehaviour
                 Get<Button>("F_ElfTab").interactable = true;
                 Get<Button>("F_StoreTab").interactable = false;
                 Get<Button>("F_MagicTab").interactable = true;
-                Get<Button>("F_GardenTab").interactable = true;
+                Get<Button>("F_SkillTab").interactable = true;
 
                 SetActive("Fd_ElfTab", false);
                 SetActive("Fc_StoreTab", true);
                 SetActive("Fb_MagicTab", false);
-                SetActive("Fa_GardenTab", false);
+                SetActive("Fa_SkillTab", false);
             }
         );
 
@@ -484,29 +484,29 @@ public class ManaReso : MonoBehaviour
                 Get<Button>("F_ElfTab").interactable = true;
                 Get<Button>("F_StoreTab").interactable = true;
                 Get<Button>("F_MagicTab").interactable = false;
-                Get<Button>("F_GardenTab").interactable = true;
+                Get<Button>("F_SkillTab").interactable = true;
 
                 SetActive("Fd_ElfTab", false);
                 SetActive("Fc_StoreTab", false);
                 SetActive("Fb_MagicTab", true);
-                SetActive("Fa_GardenTab", false);
+                SetActive("Fa_SkillTab", false);
             }
         );
 
         SetButtonEvent
         (
-            "F_GardenTab",
+            "F_SkillTab",
             () =>
             {
                 Get<Button>("F_ElfTab").interactable = true;
                 Get<Button>("F_StoreTab").interactable = true;
                 Get<Button>("F_MagicTab").interactable = true;
-                Get<Button>("F_GardenTab").interactable = false;
+                Get<Button>("F_SkillTab").interactable = false;
 
                 SetActive("Fd_ElfTab", false);
                 SetActive("Fc_StoreTab", false);
                 SetActive("Fb_MagicTab", false);
-                SetActive("Fa_GardenTab", true);
+                SetActive("Fa_SkillTab", true);
             }
         );
 
@@ -635,11 +635,7 @@ public class ManaReso : MonoBehaviour
         GetGridItem("Fa_SkillItem", "Fa_Grid", " (2)");
         GetGridItem("Fa_SkillItem", "Fa_Grid", " (3)");
 
-        #region 花园
-
-        SetText("Fa_SkillTit (0)", Data.GetText("Fa", "Fa_SkillTit0"));
-        SetText("Fa_SkillLab (0)", Data.GetText("Fa", "Fa_SkillLab0"));
-        SetText("Fa_SkillBtnLab (0)", Data.GetText("Fa", "Fa_SkillBtnLab0"));
+        #region MyRegion
 
         SetButtonEvent
         (
@@ -657,11 +653,7 @@ public class ManaReso : MonoBehaviour
 
         #endregion
 
-        #region 人潮涌动
-
-        SetText("Fa_SkillTit (1)", Data.GetText("Fa", "Fa_SkillTit1"));
-        SetText("Fa_SkillLab (1)", Data.GetText("Fa", "Fa_SkillLab1"));
-        SetText("Fa_SkillBtnLab (1)", Data.GetText("Fa", "Fa_SkillBtnLab1"));
+        #region MyRegion
 
         SetButtonEvent
         (
@@ -679,11 +671,7 @@ public class ManaReso : MonoBehaviour
 
         #endregion
 
-        #region 大亨光临
-
-        SetText("Fa_SkillTit (2)", Data.GetText("Fa", "Fa_SkillTit2"));
-        SetText("Fa_SkillLab (2)", Data.GetText("Fa", "Fa_SkillLab2"));
-        SetText("Fa_SkillBtnLab (2)", Data.GetText("Fa", "Fa_SkillBtnLab2"));
+        #region MyRegion
 
         SetButtonEvent
         (
@@ -703,10 +691,6 @@ public class ManaReso : MonoBehaviour
 
         #region MyRegion
 
-        SetText("Fa_SkillTit (3)", Data.GetText("Fa", "Fa_SkillTit3"));
-        SetText("Fa_SkillLab (3)", Data.GetText("Fa", "Fa_SkillLab3"));
-        SetText("Fa_SkillBtnLab (3)", Data.GetText("Fa", "Fa_SkillBtnLab3"));
-
         SetButtonEvent
         (
             "Fa_SkillBtn (3)",
@@ -725,10 +709,6 @@ public class ManaReso : MonoBehaviour
 
         #region MyRegion
 
-        SetText("Fa_SkillTit (4)", Data.GetText("Fa", "Fa_SkillTit4"));
-        SetText("Fa_SkillLab (4)", Data.GetText("Fa", "Fa_SkillLab4"));
-        SetText("Fa_SkillBtnLab (4)", Data.GetText("Fa", "Fa_SkillBtnLab4"));
-
         SetButtonEvent
         (
             "Fa_SkillBtn (3)",
@@ -747,10 +727,6 @@ public class ManaReso : MonoBehaviour
 
         #region MyRegion
 
-        SetText("Fa_SkillTit (5)", Data.GetText("Fa", "Fa_SkillTit5"));
-        SetText("Fa_SkillLab (5)", Data.GetText("Fa", "Fa_SkillLab5"));
-        SetText("Fa_SkillBtnLab (5)", Data.GetText("Fa", "Fa_SkillBtnLab5"));
-
         SetButtonEvent
         (
             "Fa_SkillBtn (3)",
@@ -769,10 +745,6 @@ public class ManaReso : MonoBehaviour
 
         #region MyRegion
 
-        SetText("Fa_SkillTit (6)", Data.GetText("Fa", "Fa_SkillTit6"));
-        SetText("Fa_SkillLab (6)", Data.GetText("Fa", "Fa_SkillLab6"));
-        SetText("Fa_SkillBtnLab (6)", Data.GetText("Fa", "Fa_SkillBtnLab6"));
-
         SetButtonEvent
         (
             "Fa_SkillBtn (3)",
@@ -791,10 +763,6 @@ public class ManaReso : MonoBehaviour
 
         #region MyRegion
 
-        SetText("Fa_SkillTit (7)", Data.GetText("Fa", "Fa_SkillTit7"));
-        SetText("Fa_SkillLab (7)", Data.GetText("Fa", "Fa_SkillLab7"));
-        SetText("Fa_SkillBtnLab (7)", Data.GetText("Fa", "Fa_SkillBtnLab7"));
-
         SetButtonEvent
         (
             "Fa_SkillBtn (3)",
@@ -1143,7 +1111,7 @@ public class ManaReso : MonoBehaviour
 
         #endregion
 
-        #region Garden
+        #region Ability
 
         #region CloudSr1
 
@@ -1451,7 +1419,7 @@ public class ManaReso : MonoBehaviour
             }
             else if (folder == Folder.Garden)
             {
-                t = Resources.Load<T>(@"Sprite\Garden\" + targetName);
+                t = Resources.Load<T>(@"Sprite\Ability\" + targetName);
             }
             else if (folder == Folder.SpriteUI)
             {
@@ -1584,6 +1552,47 @@ public class ManaReso : MonoBehaviour
         return tempTra;
     }
 
+    public static Transform GetSkillItem(string suffix, Skill skill)
+    {
+        Transform tempTra;
+
+        if (skill.Class == SkillClass.Elf)
+        {
+            tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));
+        }
+        else if (skill.Class == SkillClass.Store)
+        {
+            tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));
+        }
+        else if (skill.Class == SkillClass.Magic)
+        {
+            tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));
+        }
+        else if (skill.Class == SkillClass.Ability)
+        {
+            tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));
+        }
+        else if (skill.Class == SkillClass.Activity)
+        {
+            tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+        Transform[] transforms = tempTra.GetComponentsInChildren<Transform>(true);
+
+        for (int i = 0; i < transforms.Length; i++)
+        {
+            transforms[i].name = transforms[i].name + suffix;
+
+            SaveToDic(transforms[i]);
+        }
+
+        return tempTra;
+    }
+
     public static Transform GetGridItem(string prefabName, string parentName, string suffix)
     {
         Transform tempTra = Get(prefabName, Folder.PrefabUI, Get(parentName));

Assets/Script/Tool/Data.cs

@@ -2,6 +2,7 @@
 
 using System.Xml;
 using System.Collections;
+using System.Collections.Generic;
 
 public class Data : MonoBehaviour
 {
@@ -48,7 +49,7 @@ public class Data : MonoBehaviour
 
             ChineseNode = xmlDoc.SelectSingleNode("Data").SelectSingleNode("Text");
         }
-
+        
         return ChineseNode.SelectSingleNode(cate).SelectSingleNode(name).InnerText;
     }
 
@@ -64,4 +65,20 @@ public class Data : MonoBehaviour
 
         return ValueNode.SelectSingleNode(cate).SelectSingleNode(name).InnerText;
     }
+
+    public static XmlNodeList GetSkillConfig()
+    {
+        XmlDocument xmlDoc = new XmlDocument();
+        xmlDoc.Load(@"Assets\Resources\XML\Config\skill_config.xml");
+
+        return xmlDoc.SelectSingleNode("data").SelectNodes("item");
+    }
+
+    public static XmlNodeList GetAbilityConfig()
+    {
+        XmlDocument xmlDoc = new XmlDocument();
+        xmlDoc.Load(@"Assets\Resources\XML\Config\ability_config.xml");
+
+        return xmlDoc.SelectSingleNode("data").SelectNodes("item");
+    }
 }

Assets/Script/Tool/Language.cs

@@ -138,7 +138,7 @@ public class Language
 	}
 
 	private static Font defaultFont;
-	private static Font font;
+	public static Font font; //todo Public改为private
 
     public static Font GetFont()
     {

Library/ScriptAssemblies/BuiltinAssemblies.stamp

@@ -1,2 +0,0 @@
-0000.5837028e.0000
-0000.583702a0.0000

Library/shadercompiler-UnityShaderCompiler.exe0.log

@@ -1,26 +1,2 @@
 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: getPlatforms
-Cmd: compileSnippet
-  api=4 type=0 insize=870 outsize=522 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=870 outsize=298 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=1108 outsize=622 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1108 outsize=402 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=1640 outsize=610 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1640 outsize=422 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=1431 outsize=906 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1431 outsize=522 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=1442 outsize=918 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1442 outsize=522 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=1464 outsize=906 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1464 outsize=502 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA ok=1