Merge branch 'hy_en' of ssh://192.168.0.8:29418/xianjing into hy_ios_en

# Conflicts:
#	Assets/Src/Core/DownLoad/FileHelper.cs

Assets/Content/Icons/ShopIcons/充值货币档位修改.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1c012c54aad4c80438f724c2531ba629
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab

@@ -295,6 +295,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &721009332442788122
 GameObject:
@@ -425,6 +426,7 @@ MonoBehaviour:
   values: 00010000
   depObjs:
   - {fileID: 8325258438246587538}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &731323215867335883
 GameObject:
@@ -575,6 +577,7 @@ MonoBehaviour:
   - UINode
   values: 0000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &745719186902735313
 GameObject:
@@ -867,6 +870,7 @@ MonoBehaviour:
   values: 00000001
   depObjs:
   - {fileID: 9009071606538217787}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1033272048162642831
 GameObject:
@@ -1178,6 +1182,7 @@ MonoBehaviour:
   - UINode
   values: 000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1516884835743160625
 GameObject:
@@ -1553,6 +1558,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &1370883439615556000
 MonoBehaviour:
@@ -1673,6 +1679,7 @@ MonoBehaviour:
   - UnityEngine.CanvasGroup
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!225 &3672519254928513434
 CanvasGroup:
@@ -1744,6 +1751,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3114780097847232549
 GameObject:
@@ -1860,6 +1868,7 @@ MonoBehaviour:
   - UINode
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3310889194903286527
 GameObject:
@@ -2115,6 +2124,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3569149427932244507
 GameObject:
@@ -7152,6 +7162,7 @@ MonoBehaviour:
   - UINode
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3909802788004400876
 GameObject:
@@ -7215,6 +7226,7 @@ MonoBehaviour:
   - UISafeArea
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &1953132148129513153
 MonoBehaviour:
@@ -7612,6 +7624,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 2
 --- !u!1 &4562837802582197131
 GameObject:
@@ -7749,6 +7762,7 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &5417126379981057107
 Animator:
@@ -7909,6 +7923,7 @@ MonoBehaviour:
   - UIRaycastNoDraw
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &4087511852670410615
 MonoBehaviour:
@@ -8392,7 +8407,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 500}
-  m_SizeDelta: {x: 770.4, y: 360}
+  m_SizeDelta: {x: 753, y: 291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5882261254970375091
 CanvasRenderer:
@@ -8465,6 +8480,7 @@ MonoBehaviour:
   - UINode
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5882261255284863959
 GameObject:
@@ -8739,6 +8755,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5882261255566940623
 GameObject:
@@ -8932,6 +8949,7 @@ MonoBehaviour:
   - UIRaycastNoDraw
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &3325980718791798278
 MonoBehaviour:
@@ -9204,6 +9222,7 @@ MonoBehaviour:
   values: 00000001
   depObjs:
   - {fileID: 8990600034220661980}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6358755091666389622
 GameObject:
@@ -9320,6 +9339,7 @@ MonoBehaviour:
   - UINode
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6543328180420760575
 GameObject:
@@ -9422,6 +9442,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6647626986388525926
 GameObject:
@@ -9821,6 +9842,7 @@ MonoBehaviour:
   - UIRaycastNoDraw
   values: 0001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!222 &4989033597140741359
 CanvasRenderer:
@@ -10245,6 +10267,7 @@ MonoBehaviour:
   - UIRaycastNoDraw
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8261785257712948932
 MonoBehaviour:
@@ -10437,6 +10460,7 @@ MonoBehaviour:
   values: 000000000101
   depObjs:
   - {fileID: 8325258438246587538}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &5100764154117928963
 MonoBehaviour:
@@ -16192,6 +16216,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &9086956804195867507
 GameObject:
@@ -16290,6 +16315,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &9142913452768918977
 GameObject:

Assets/Editor/CsvToLua/CsvToLua.cs

@@ -160,6 +160,12 @@ return aaa";
         {
             ChangeLuaCfg("Assets/Lua/Config/CardCfg.lua", "Assets\\Editor\\CsvToLua\\LuaCfg.lua", "Build/NewCfg/CardCfg.lua");
         }
+
+
+        if (GUILayout.Button("合并Language"))
+        {
+            MergeLanauage("Assets/Content/Config/LanguagePackage_cn.csv", "Build/NewCfg/ROLanguagePackage_cn.csv", "Build/NewCfg/Language_merge.csv");
+        }
     }
 
     public static string GetFilePath()
@@ -724,5 +730,66 @@ return aaa";
 
         File.WriteAllLines(outputPath, rowDatas);
     }
-    
+
+    struct lgInfo 
+    {
+       public int index;
+        public int off;
+    }
+    private static void MergeLanauage(string oldPath,string newPath, string outputPath)
+    {
+        List<string> oldLg = File.ReadAllLines(oldPath).ToList();
+        List<string> newLg = File.ReadAllLines(newPath).ToList();
+        Dictionary<string, lgInfo> cfgmap = new Dictionary<string, lgInfo>();
+
+        int length = oldLg.Count;
+        int off = -1;
+        for (int i = 0; i < length; i++)
+        {
+            off = oldLg[i].IndexOf(',');
+
+            if (off < 0)
+            {
+                continue;
+            }
+
+            string key = oldLg[i].Substring(0,off);
+
+            if (!cfgmap.ContainsKey(key))
+            {
+                lgInfo info = new lgInfo();
+                info.index = i;
+                info.off = off;
+                cfgmap.Add(key, info);
+            }
+        }
+
+
+        foreach (var item in newLg)
+        {
+            if (item == "" || item == ","||item == "key"||item == "string")
+                continue;
+
+            off = item.IndexOf(',');
+            if (off < 0)
+            {
+                continue;
+            }
+            string key = item.Substring(0,off);
+            if (!cfgmap.ContainsKey(key))
+            {
+                oldLg.Add(item);
+            }
+            else
+            {
+                lgInfo lgIf = cfgmap[key];
+                oldLg[lgIf.index] = item;
+            }
+        }
+
+
+        string data = FileHelper.CatStringArray(oldLg);
+        FileHelper.WirteStringToFile(outputPath, data);
+    }
+
 }

Assets/Editor/UI/GenerateLuaTemple.cs

@@ -1,4 +1,4 @@
-using LuaInterface;
+using LuaInterface;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -826,7 +826,21 @@ public class GenerateLuaTemple
             string varName = string.Empty;
             if (!bTop)
             {
-                sb.Append(string.Format("\tlocal tmp = Root:Find(\"{0}\").gameObject\r\n", name));
+                if (uiNode.IsNewNode)
+                {
+                    sb.Append(string.Format("\tlocal tmp = nil\r\n", name));
+                    sb.Append(string.Format("\tlocal tfm = Root:Find(\"{0}\")\r\n", name));
+                    sb.Append(string.Format("\tif tfm == nil then\r\n", name));
+                    sb.Append(string.Format("\t\treturn\r\n", name));
+                    sb.Append(string.Format("\telse\r\n", name));
+                    sb.Append(string.Format("\t\ttmp = tfm.gameObject\r\n", name));
+                    sb.Append(string.Format("\tend\r\n", name));
+                }
+                else
+                {
+                    sb.Append(string.Format("\tlocal tmp = Root:Find(\"{0}\").gameObject\r\n", name));
+                }
+                
 
                 if (uiNode && uiNode.enabled)
                 {

Assets/Src/Core/DownLoad/FileHelper.cs

@@ -462,6 +462,18 @@ public class FileHelper
             strs.Remove(res[i]);
         }
     }
+
+    public static string CatStringArray(IEnumerable<string> datas)
+    {
+        StringBuilder stringBuilder = new StringBuilder();
+        foreach (var item in datas)
+        {
+            stringBuilder.Append(item);
+        }
+
+        return stringBuilder.ToString();
+    }
+
     //public static string[][] GetCsvDatas(string text)
     //{
     //    using (System.IO.StringReader stringReader = new System.IO.StringReader(text))

Assets/Src/UI/Base/UINode.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
@@ -23,6 +23,8 @@ public class UINode : MonoBehaviour
 
     public UINode[] depObjs;
 
+    public bool IsNewNode;
+
     public ActiveType activeType = ActiveType.Default;
 
     public bool GetValue(string key, out bool value)

UserSettings/AndroidLogcatSettings.asset

@@ -2,23 +2,41 @@
     "m_SelectedDeviceId": "192.168.0.53:5555",
     "m_SelectedProcess": {
         "deviceId": "192.168.0.53:5555",
-        "name": "com.Runjin.Wonderland.gp",
-        "processId": 2704,
-        "exited": true
+        "name": "com.metasensor.ro.mi",
+        "processId": 4117,
+        "exited": false
     },
     "m_SelectedPriority": 0,
     "m_KnownProcessesForSerialization": [
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "app.lawnchair",
-            "processId": 1600,
-            "exited": false
+            "name": "com.Runjin.Wonderland.gp",
+            "processId": 2704,
+            "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.Runjin.Wonderland.gp",
-            "processId": 2704,
+            "name": "com.xjro.yy",
+            "processId": 2861,
+            "exited": true
+        },
+        {
+            "deviceId": "192.168.0.53:5555",
+            "name": "com.metasensor.ro.mi",
+            "processId": 2702,
+            "exited": true
+        },
+        {
+            "deviceId": "192.168.0.53:5555",
+            "name": "com.metasensor.ro.mi",
+            "processId": 3428,
             "exited": true
+        },
+        {
+            "deviceId": "192.168.0.53:5555",
+            "name": "com.metasensor.ro.mi",
+            "processId": 4117,
+            "exited": false
         }
     ],
     "m_Tags": {