Temp 4.5

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -47,6 +47,7 @@
     <L_ChangeLab desc=""><![CDATA[←这不是我]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[音乐]]></L_MusicLab>
+    <L_AudioLab desc=""><![CDATA[音效]]></L_AudioLab>
     <L_ReportTit desc=""><![CDATA[支持]]></L_ReportTit>
     <L_ReportLab desc=""><![CDATA[提交问题]]></L_ReportLab>
     <L_ConfirmLab desc=""><![CDATA[确定]]></L_ConfirmLab>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -47,6 +47,7 @@
     <L_ChangeLab desc=""><![CDATA[]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[]]></L_MusicLab>
+    <L_AudioLab desc=""><![CDATA[]]></L_AudioLab>
     <L_ReportTit desc=""><![CDATA[]]></L_ReportTit>
     <L_ReportLab desc=""><![CDATA[]]></L_ReportLab>
     <L_ConfirmLab desc=""><![CDATA[]]></L_ConfirmLab>

Assets/Resource/XML/lan/English.xml

@@ -43,17 +43,18 @@
     <Bb_GetLab desc=""><![CDATA[]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[]]></Bb_ConfirmLab>
-    <L_UserTit desc=""><![CDATA[]]></L_UserTit>
-    <L_ChangeLab desc=""><![CDATA[]]></L_ChangeLab>
-    <L_AudioTit desc=""><![CDATA[]]></L_AudioTit>
-    <L_MusicLab desc=""><![CDATA[]]></L_MusicLab>
-    <L_ReportTit desc=""><![CDATA[]]></L_ReportTit>
-    <L_ReportLab desc=""><![CDATA[]]></L_ReportLab>
-    <L_ConfirmLab desc=""><![CDATA[]]></L_ConfirmLab>
-    <L_LanguageTit desc=""><![CDATA[]]></L_LanguageTit>
-    <L_TraChiLab desc=""><![CDATA[]]></L_TraChiLab>
-    <L_EnglishLab desc=""><![CDATA[]]></L_EnglishLab>
-    <L_SimChiLab desc=""><![CDATA[]]></L_SimChiLab>
+    <L_UserTit desc=""><![CDATA[User]]></L_UserTit>
+    <L_ChangeLab desc=""><![CDATA[←Not Me]]></L_ChangeLab>
+    <L_AudioTit desc=""><![CDATA[Audio]]></L_AudioTit>
+    <L_MusicLab desc=""><![CDATA[Music]]></L_MusicLab>
+    <L_AudioLab desc=""><![CDATA[Audio]]></L_AudioLab>
+    <L_ReportTit desc=""><![CDATA[Support]]></L_ReportTit>
+    <L_ReportLab desc=""><![CDATA[ReportIssue]]></L_ReportLab>
+    <L_ConfirmLab desc=""><![CDATA[Confirm]]></L_ConfirmLab>
+    <L_LanguageTit desc=""><![CDATA[Language]]></L_LanguageTit>
+    <L_TraChiLab desc=""><![CDATA[繁体中文]]></L_TraChiLab>
+    <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
+    <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[]]></Flower1>

Assets/Script/Manage/Initializer.cs

@@ -34,6 +34,8 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaAnim>();
         gameObject.AddScript<ManaAudio>();
 
+        gameObject.AddScript<ManaText>();
+
         gameObject.AddScript<ManaUI>();
         gameObject.AddScript<ManaSign>();
         gameObject.AddScript<ManaGarden>();

Assets/Script/Manage/ManaAudio.cs

@@ -6,6 +6,8 @@ public class ManaAudio : Regist
 {
     #region 变量
 
+    public static ManaAudio Instance;
+
     public static bool Music;
     public static bool Audio;
     public static Transform AudioParent;
@@ -29,6 +31,8 @@ public class ManaAudio : Regist
 
     public override void RegistValueA()
     {
+        Instance = this;
+
         Music = true;
         Audio = true;
         
@@ -80,7 +84,7 @@ public class ManaAudio : Regist
     }
 
 
-    public static void MusicSwitch()
+    public void MusicSwitch()
     {
         if (Music)
         {
@@ -90,6 +94,8 @@ public class ManaAudio : Regist
             ManaReso.SetActive("L_MusicOff", true);
             
             MusicParent.SetActive(false);
+
+            StopCoroutine(CoroTheme);
         }
         else
         {
@@ -99,10 +105,12 @@ public class ManaAudio : Regist
             ManaReso.SetActive("L_MusicOff", false);
 
             MusicParent.SetActive(true);
+
+            MusicTheme.TweenForAudio();
         }
     }
 
-    public static void AudioSwitch()
+    public void AudioSwitch()
     {
         if (Audio)
         {

Assets/Script/Manage/ManaData.cs

@@ -175,7 +175,7 @@ public class ManaData : Regist
             }
 
             #endregion
-
+            
             SkillDic.Add(skillRoot.Name, skillRoot);
             SkillList.Add(skillRoot);
         }

Assets/Script/Manage/ManaText.cs

@@ -0,0 +1,83 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+
+public class LanStr
+{
+    public string Id;
+    public string Page;
+
+    public LanStr(string id, string page)
+    {
+        Id = id;
+        Page = page;
+    }
+
+    public override string ToString()
+    {
+        return Language.GetStr(Id, Page);
+    }
+}
+
+public class ManaText : Regist 
+{
+    #region 变量
+
+    public static Dictionary<Text, object[]> TextDic;
+
+    #endregion
+
+    public override void RegistValueA()
+    {
+        TextDic = new Dictionary<Text, object[]>();
+    }
+
+
+    public static void Add(Text text, params object[] objs)
+    {
+        if (TextDic.ContainsKey(text))
+        {
+            TextDic[text] = objs;
+
+            text.text = LanguageText(objs);
+        }
+        else
+        {
+            TextDic.Add(text, objs);
+
+            text.text = LanguageText(objs);
+        }
+    }
+
+    public static void UpdateLanguage()
+    {
+        foreach (var kv in TextDic)
+        {
+            kv.Key.text = LanguageText(kv.Value);
+        }
+    }
+
+
+    private static string LanguageText(object[] objs)
+    {
+        string str = "";
+
+        for (int i = 0; i < objs.Length; i++)
+        {
+            LanStr lanStr = objs[i] as LanStr;
+
+            if (lanStr == null)
+            {
+                str += objs[i];
+            }
+            else
+            {
+                str += lanStr.ToString();
+            }
+        }
+
+        return str;
+    }
+}

Assets/Script/Manage/ManaText.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 0bc21df16424a6e46ac985d421e47745
+timeCreated: 1491348401
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/ManaUI.cs

@@ -1046,17 +1046,18 @@ public class ManaUI : Regist
 
         #region L
 
-        ManaReso.SetText("L_UserTit");
-        ManaReso.SetText("L_ChangeLab");
-        ManaReso.SetText("L_AudioTit");
-        ManaReso.SetText("L_MusicLab");
-        ManaReso.SetText("L_ReportTit");
-        ManaReso.SetText("L_ReportLab");
-        ManaReso.SetText("L_ConfirmLab");
-        ManaReso.SetText("L_LanguageTit");
-        ManaReso.SetText("L_TraChiLab");
-        ManaReso.SetText("L_EnglishLab");
-        ManaReso.SetText("L_SimChiLab");
+        ManaText.Add(ManaReso.Get<Text>("L_UserTit"), new LanStr("UI", "L_UserTit"));
+        ManaText.Add(ManaReso.Get<Text>("L_ChangeLab"), new LanStr("UI", "L_ChangeLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_AudioTit"), new LanStr("UI", "L_AudioTit"));
+        ManaText.Add(ManaReso.Get<Text>("L_MusicLab"), new LanStr("UI", "L_MusicLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_AudioLab"), new LanStr("UI", "L_AudioLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_ReportTit"), new LanStr("UI", "L_ReportTit"));
+        ManaText.Add(ManaReso.Get<Text>("L_ReportLab"), new LanStr("UI", "L_ReportLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_ConfirmLab"), new LanStr("UI", "L_ConfirmLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_LanguageTit"), new LanStr("UI", "L_LanguageTit"));
+        ManaText.Add(ManaReso.Get<Text>("L_TraChiLab"), new LanStr("UI", "L_TraChiLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_EnglishLab"), new LanStr("UI", "L_EnglishLab"));
+        ManaText.Add(ManaReso.Get<Text>("L_SimChiLab"), new LanStr("UI", "L_SimChiLab"));
 
         ManaReso.Get("L_Setting").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
@@ -1072,13 +1073,13 @@ public class ManaUI : Regist
         ManaReso.SetButtonEvent
         (
             "L_MusicBtn",
-            ManaAudio.MusicSwitch
+            ManaAudio.Instance.MusicSwitch
         );
 
         ManaReso.SetButtonEvent
         (
             "L_AudioBtn",
-            ManaAudio.AudioSwitch
+            ManaAudio.Instance.AudioSwitch
         );
 
         ManaReso.SetButtonEvent
@@ -1108,6 +1109,8 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
                 ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.Orange;
                 ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+
+                Language.SwitchLanguage("ChineseSimplified");
             }
         );
 
@@ -1123,6 +1126,8 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
                 ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
                 ManaReso.Get<Button>("L_English").image.color = ManaColor.Orange;
+
+                Language.SwitchLanguage("English");
             }
         );
 

Assets/Script/Tool/DashGame/Language.cs

@@ -34,6 +34,16 @@ public class Language
         xml.LoadXml(textAsset.text);
     }
 
+    public static void SwitchLanguage(string str)
+    {
+        TextAsset textAsset = Bundle.Config.LoadAsset<TextAsset>(str);
+
+        xml = new XmlDocument();
+        xml.LoadXml(textAsset.text);
+
+        ManaText.UpdateLanguage();
+    }
+
     //public static void Init(string lan)
     //{
     //    Debug.Log("Init Language " + lan);

MyLovelyGarden.csproj

@@ -109,6 +109,7 @@
     <Compile Include="Assets\Script\Manage\ManaPlayer.cs" />
     <Compile Include="Assets\Script\Manage\ManaReso.cs" />
     <Compile Include="Assets\Script\Manage\ManaSign.cs" />
+    <Compile Include="Assets\Script\Manage\ManaText.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
     <Compile Include="Assets\Script\Object\Drop.cs" />
     <Compile Include="Assets\Script\Object\DropDiamond.cs" />

MyLovelyGarden.txt → ToList.txt

@@ -1,14 +1,15 @@
-修改了花园的PageView
-
+种植金币与PageView
 
 切换后台
 
 成就
 
-语言切换功能
+语言切换功能(未开垦)
 
 Regist机制
 
+场景加载机制
+
 
 字体