Merge branch 'main' of ssh://192.168.0.8:29418/XianJing into hy_test

Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset

@@ -28,3 +28,16 @@ MonoBehaviour:
   - uilanuch_uiprefab.unity3d
   ChangeNum: 0
   IsIgnore: 1
+  Language: 1
+  buildTag: 4
+  ResInfos:
+  - {fileID: 11400000, guid: f3403f5e64d0cde489600f93471eb338, type: 2}
+  - {fileID: 11400000, guid: 6fb25ab5e6ff8f84185c8edd210f870f, type: 2}
+  - {fileID: 11400000, guid: 3e697013a0126374f879ea203e34a5c6, type: 2}
+  - {fileID: 11400000, guid: 76320053efde17f4fac8ce428ed03b84, type: 2}
+  - {fileID: 11400000, guid: c6956b69b914b6f458ab91caf8e427f8, type: 2}
+  - {fileID: 11400000, guid: 15f0a3e78c5d1024f86e67f96e5c4cad, type: 2}
+  - {fileID: 11400000, guid: b3aef0f1745d8584992d795cede949f6, type: 2}
+  - {fileID: 11400000, guid: 0dc52175ab57d0d4ba8e678be0e39bb8, type: 2}
+  - {fileID: 11400000, guid: 28effff3be366c742b1b85a45d5df44d, type: 2}
+  - {fileID: 11400000, guid: 3c61ac4e81e99784caa420099355f7c7, type: 2}

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -6,6 +6,8 @@ using Game.Config;
 using System;
 using System.Reflection;
 using System.IO;
+using System.IO.Compression;
+
 public class CheckHotUpdateRes : EditorWindow
 {
 
@@ -37,16 +39,17 @@ public class CheckHotUpdateRes : EditorWindow
         CheckHotUpdateRes window = GetWindow<CheckHotUpdateRes>("热更相关");
         window.maxSize = new Vector2(800, 600);
         window.minSize = new Vector2(600, 400);
-       
-        window.Show();
 
         window.Init();
+        window.Show();
+
     }
 
     private string oldPath = "";
     private string newPath = "";
 
     private CheckResWindowInfo info;
+    private ResInfo curResInfo;
     private List<VersionInfoData> needResList;
     private GameDataFormatInfo downloadFormatInfo;
     public void Init()
@@ -54,6 +57,11 @@ public class CheckHotUpdateRes : EditorWindow
         string path = "Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset";
         //Debug.Log();
         info = AssetDatabase.LoadAssetAtPath<CheckResWindowInfo>(path);
+        curResInfo = info.GetResInfo();
+        if (curResInfo == null)
+        {
+            curResInfo = new ResInfo();
+        }
 #if UNITY_IOS
         info.VersionFileName = "afivs";
         info.mainfestFileName = "afimft";
@@ -67,9 +75,9 @@ public class CheckHotUpdateRes : EditorWindow
 
     private void OnGUI()
     {
-        DrowSelectFolder("旧版本文件", "选择文件路径", "选择旧版本资源MD5文件路径", ref info.OldPath);
-        DrowSelectFolder("新版本文件", "选择文件路径", "选择新版本资源MD5文件路径", ref info.NewPath);   
-        DrowSelectFolder("需跟新文件输出路径", "选择文件路径", "选择需跟新文件输出路径", ref info.OutputPath);
+        DrowSelectFolder("旧版本文件", "选择文件路径", "选择旧版本资源MD5文件路径", ref curResInfo.OldPath);
+        DrowSelectFolder("新版本文件", "选择文件路径", "选择新版本资源MD5文件路径", ref curResInfo.NewPath);   
+        DrowSelectFolder("需跟新文件输出路径", "选择文件路径", "选择需跟新文件输出路径", ref curResInfo.OutputPath);
         DrawInfo();
         DrawCheckBtn();
 
@@ -106,6 +114,21 @@ public class CheckHotUpdateRes : EditorWindow
 
     private void DrawInfo()
     {
+        GUILayout.Box("", GUILayout.Width(790));
+        GUILayout.BeginHorizontal();
+        GUILayout.Label("平台", GUILayout.Width(65));
+        BuildTag tag = (BuildTag)EditorGUILayout.EnumPopup(info.buildTag, GUILayout.Width(100));
+        if (tag != info.buildTag)
+        {
+            info.buildTag = tag;
+            ResInfo ri = info.GetResInfo();
+            if (ri != null)
+            {
+                curResInfo = ri;
+            }
+        }
+
+        GUILayout.EndHorizontal();
 
         GUILayout.Box("", GUILayout.Width(790));
         GUILayout.BeginHorizontal();
@@ -113,12 +136,12 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.Space(10);
         GUILayout.Label("版本文件名：", GUILayout.Width(65));
         GUILayout.Space(10);
-        info.VersionFileName = GUILayout.TextField(info.VersionFileName, GUILayout.Width(160));
+        curResInfo.VersionFileName = GUILayout.TextField(curResInfo.VersionFileName, GUILayout.Width(160));
 
         GUILayout.Space(60);
         GUILayout.Label("版本文件信息文件名：", GUILayout.Width(120));
         GUILayout.Space(10);
-        info.mainfestFileName = GUILayout.TextField(info.mainfestFileName, GUILayout.Width(160));
+        curResInfo.mainfestFileName = GUILayout.TextField(curResInfo.mainfestFileName, GUILayout.Width(160));
 
 
         GUILayout.EndHorizontal();
@@ -128,19 +151,19 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.Space(10);
         GUILayout.Label("资源版本：", GUILayout.Width(65));
         GUILayout.Space(10);
-        info.ResVersion = GUILayout.TextField(info.ResVersion, GUILayout.Width(160));
+        curResInfo.ResVersion = GUILayout.TextField(curResInfo.ResVersion, GUILayout.Width(160));
         GUILayout.Space(10);
         if (GUILayout.Button("读取版本", GUILayout.Width(100)))
         {
-            info.ResVersion = File.ReadAllText($"{info.OldPath}/{info.VersionFileName}");
+            curResInfo.ResVersion = File.ReadAllText($"{curResInfo.OldPath}/{curResInfo.VersionFileName}");
         }
         GUILayout.Space(10);
 
         if (GUILayout.Button("版本+1", GUILayout.Width(100)))
         {
-            VersionCode lVersionCode = info.ResVersion;
+            VersionCode lVersionCode = curResInfo.ResVersion;
             lVersionCode.patch += 1;
-            info.ResVersion = lVersionCode.ToString();
+            curResInfo.ResVersion = lVersionCode.ToString();
         }
         GUILayout.Space(10);
         GUILayout.EndHorizontal();
@@ -148,7 +171,7 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.BeginHorizontal();
         GUILayout.Label("语言：", GUILayout.Width(65));
         GUILayout.Space(10);
-        info.Language = (BuildLanguage)EditorGUILayout.EnumPopup(info.Language, GUILayout.Width(100));
+        curResInfo.Language = (BuildLanguage)EditorGUILayout.EnumPopup(curResInfo.Language, GUILayout.Width(100));
         GUILayout.Space(10);
         GUILayout.EndHorizontal();
 
@@ -161,7 +184,7 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.Space(10);
         if (GUILayout.Button("生成MD5资源版本文件"))
         {
-            BundleBuilderZ.CreateMD5File(info.ResVersion);
+            BundleBuilderZ.CreateMD5File(curResInfo.ResVersion);
         }
 
         GUILayout.Space(60);
@@ -188,12 +211,12 @@ public class CheckHotUpdateRes : EditorWindow
         GUILayout.Box("", GUILayout.Width(790));
         GUILayout.BeginHorizontal();
         GUILayout.Space(60);
-        info.IsIgnore =GUILayout.Toggle(info.IsIgnore, "是否开启忽略某些文件") ;
+        curResInfo.IsIgnore =GUILayout.Toggle(curResInfo.IsIgnore, "是否开启忽略某些文件") ;
         GUILayout.EndHorizontal();
     }
     private List<VersionInfoData> SerizlizeResList(byte[] data)
     {
-        CsvReader csvReader = new CsvReader(info.mainfestFileName, data);
+        CsvReader csvReader = new CsvReader(curResInfo.mainfestFileName, data);
         if (downloadFormatInfo == null)
         {
             downloadFormatInfo = new GameDataFormatInfo(csvReader.Fields(), csvReader.Types());
@@ -210,11 +233,11 @@ public class CheckHotUpdateRes : EditorWindow
     private void CheckRes()
     {
         needResList.Clear();
-        oldPath = $"{info.OldPath}/{ info.mainfestFileName}";
+        oldPath = $"{curResInfo.OldPath}/{ curResInfo.mainfestFileName}";
 
         List<VersionInfoData> Oldlist = GetInfoDatas(oldPath);
 
-        newPath = $"{info.NewPath}/{ info.mainfestFileName}";
+        newPath = $"{curResInfo.NewPath}/{ curResInfo.mainfestFileName}";
 
         List<VersionInfoData> newlist = GetInfoDatas(newPath);
         ChangeResMD5(newlist);
@@ -225,15 +248,15 @@ public class CheckHotUpdateRes : EditorWindow
             for (int i = 0; i < size; i++)
             {
 
-                if (newlist[i].FullName == info.mainfestFileName || newlist[i].FullName == info.VersionFileName)
+                if (newlist[i].FullName == curResInfo.mainfestFileName || newlist[i].FullName == curResInfo.VersionFileName)
                 {
                     continue;
                 }
 
                 bool isignore = false;
-                if (info.IsIgnore)
+                if (curResInfo.IsIgnore)
                 {
-                    string igstr = info.IgnoreFiles.FindFirst(it => it == newlist[i].FullName);
+                    string igstr = curResInfo.IgnoreFiles.FindFirst(it => it == newlist[i].FullName);
                     if (!string.IsNullOrEmpty(igstr))
                     {
                         isignore = true;
@@ -268,21 +291,33 @@ public class CheckHotUpdateRes : EditorWindow
         csvWriter.Write();
        
         CopyFile();
-
+        string FiletempPath = $"{curResInfo.OutputPath}/../ZipTempPath";
+        if(Directory.Exists(FiletempPath))
+            Directory.Delete(FiletempPath,true);
+        Directory.CreateDirectory(FiletempPath);
+        CopyFile(FiletempPath);
+        string zipName = $"{curResInfo.CN_Name}---{curResInfo.ResVersion}---{DateTime.Now.Month}.{DateTime.Now.Day}--1.zip";
+        ZipFile.CreateFromDirectory(FiletempPath,$"{curResInfo.OutputPath}/{zipName}");
+        Directory.Delete(FiletempPath,true);
         needResList.Clear();
-        Debug.Log($"资源检查完成 输出路径 ： 【{info.OutputPath}】");
+        Debug.Log($"资源检查完成 输出路径 ： 【{curResInfo.OutputPath}】");
     }
 
 
-    private void CopyFile()
+    private void CopyFile(string outP = "")
     {
         if (needResList == null)
         {
             return;
         }
+
+        if (string.IsNullOrEmpty(outP))
+        {
+            outP = curResInfo.OutputPath;
+        }
         int size = needResList.Count;
 
-        string datapath = $"{info.NewPath}/";
+        string datapath = $"{curResInfo.NewPath}/";
 
         for (int i = 0; i < size; i++)
         {
@@ -292,15 +327,15 @@ public class CheckHotUpdateRes : EditorWindow
             }
             byte[] fdatas = File.ReadAllBytes(datapath + needResList[i].FullName);
 
-            FileHelper.WirteToFile( $"{info.OutputPath}/{needResList[i].FullName}" ,fdatas);
+            FileHelper.WirteToFile( $"{outP}/{needResList[i].FullName}" ,fdatas);
 
         }
         
-        FileHelper.WirteStringToFile($"{info.OutputPath}/{info.VersionFileName}",info.ResVersion);
+        FileHelper.WirteStringToFile($"{outP}/{curResInfo.VersionFileName}",curResInfo.ResVersion);
 
-        byte[] mdatas = File.ReadAllBytes(datapath + info.mainfestFileName);
+        byte[] mdatas = File.ReadAllBytes(datapath + curResInfo.mainfestFileName);
 
-        FileHelper.WirteToFile($"{info.OutputPath}/{info.mainfestFileName}", mdatas);
+        FileHelper.WirteToFile($"{outP}/{curResInfo.mainfestFileName}", mdatas);
 
     }
 
@@ -329,7 +364,7 @@ public class CheckHotUpdateRes : EditorWindow
 
     private void ChangeResMD5(List<VersionInfoData> datas)
     {
-        int[] ids = GenerateRandomArray(info.ChangeNum, 1, datas.Count);
+        int[] ids = GenerateRandomArray(curResInfo.ChangeNum, 1, datas.Count);
 
 
         for (int i = 0; i < ids.Length; i++)
@@ -375,17 +410,17 @@ public class CheckHotUpdateRes : EditorWindow
 
     private void CopyFiles()
     {
-        string[] files1 = FileHelper.GetAllFileNmae(info.NewPath, "meta");
+        string[] files1 = FileHelper.GetAllFileNmae(curResInfo.NewPath, "meta");
 
         int size = files1.Length;
 
-        string datapath = $"{info.NewPath}/";
+        string datapath = $"{curResInfo.NewPath}/";
         for (int i = 0; i < size; i++)
         {
 
             byte[] fdatas = File.ReadAllBytes(datapath + files1[i]);
 
-            FileHelper.WirteToFile($"{info.OutputPath}/{files1[i]}", fdatas);
+            FileHelper.WirteToFile($"{curResInfo.OutputPath}/{files1[i]}", fdatas);
 
         }
 
@@ -394,6 +429,6 @@ public class CheckHotUpdateRes : EditorWindow
     private void CopyTexture()
     {
         string datapath = $"{Application.dataPath}/Content/Icons/";
-        FileHelper.CopyDir(datapath, info.OutputPath, "meta");
+        FileHelper.CopyDir(datapath, curResInfo.OutputPath, "meta");
     }
 }

Assets/Editor/AssetBundle/CheckResWindowInfo.cs

@@ -9,6 +9,20 @@ public enum BuildLanguage
     en = 2,
 }
 
+public enum BuildTag
+{
+    Hy_Test = 1,
+    Hy_Android = 2,
+    Hy_Ios = 3,
+    Hy_Android_en = 4,
+    HY_Ios_en = 5,
+    Hy_Test_en = 6,
+    Gn_0_1_Android = 7,
+    Gn_0_1_Ios = 8,
+    Gn_Zhuan_Android = 9,
+    Gn_Zhuan_Ios = 10,
+}
+
 
 [ CreateAssetMenuAttribute(fileName ="CheckHotResWindownInfo",menuName = "EditorConfig/创建检测资源更新配置文件")]
 public class CheckResWindowInfo : ScriptableObject
@@ -34,4 +48,63 @@ public class CheckResWindowInfo : ScriptableObject
     public int ChangeNum;
     public bool IsIgnore = true;
     public BuildLanguage Language = BuildLanguage.cn;
+
+
+    public BuildTag buildTag = BuildTag.Hy_Test;
+
+    public List<ResInfo> ResInfos;
+
+    private ResInfo curResInfo;
+    public ResInfo GetResInfo()
+    {
+        ResInfo resInfo = null;
+        string curName = buildTag.ToString();
+        if (curResInfo != null && curResInfo.Name == curName)
+        {
+            resInfo = curResInfo;
+        }
+        else
+        {
+            if (ResInfos != null)
+            {
+                for (int i = 0; i < ResInfos.Count; i++)
+                {
+                    if (curName == ResInfos[i].Name)
+                    {
+                        resInfo = ResInfos[i];
+                        curResInfo = resInfo;
+                    }
+                }
+            }
+        }
+
+
+        return resInfo;
+    }
 }
+
+[CreateAssetMenuAttribute(fileName = "ResInfo", menuName = "EditorConfig/创建检测资源更新配置文件ResInfo")]
+public class ResInfo : ScriptableObject
+{
+    public string Name = "Test";
+
+    public string CN_Name = "测试服";
+
+    public string OldPath = "C:/Users/Administrator/Desktop/My/项目/0";
+
+    public string NewPath = "./StreamingAssets/AssetsAndroid";
+
+    public string OutputPath = "C:/Users/Administrator/Desktop/My/项目/1";
+
+    public string VersionFileName = "Version";
+
+    public string mainfestFileName = "mainfest";
+
+    public string ResVersion = "0.1.0.0";
+
+    public List<string> IgnoreFiles;
+
+    public int ChangeNum;
+    public bool IsIgnore = true;
+    public BuildLanguage Language = BuildLanguage.cn;
+}

Assets/Editor/AssetBundle/Gn_0_1_Android.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Gn_0_1_Android
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Gn_0_1_Android
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Gn_0_1_Android.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b3aef0f1745d8584992d795cede949f6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Gn_0_1_Ios.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Gn_0_1_Ios
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Gn_0_1_Ios
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Gn_0_1_Ios.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0dc52175ab57d0d4ba8e678be0e39bb8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Gn_Zhuan_Android.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Gn_Zhuan_Android
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Gn_Zhuan_Android
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Gn_Zhuan_Android.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28effff3be366c742b1b85a45d5df44d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Gn_Zhuan_Ios.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Gn_Zhuan_Ios
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Gn_Zhuan_Ios
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Gn_Zhuan_Ios.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3c61ac4e81e99784caa420099355f7c7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/HY_Ios_en.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: HY_Ios_en
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: HY_Ios_en
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4_en"
+  VersionFileName: afivs
+  mainfestFileName: afimft
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/HY_Ios_en.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6956b69b914b6f458ab91caf8e427f8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Android.asset

@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Hy_Android
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Hy_Android
+  CN_Name: "\u6D77\u5916\u5B89\u5353"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles:
+  - font.unity3d
+  - monster_texture.unity3d
+  - hero_cloth_texture.unity3d
+  - fashion_headtop_texture.unity3d
+  - fashion_cloth_texture.unity3d
+  - fashion_bodyback_texture.unity3d
+  - uilanuch_uiprefab.unity3d
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Android.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6fb25ab5e6ff8f84185c8edd210f870f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Android_en.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Hy_Android_en
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Hy_Android_en
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_en"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/3_en"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Android_en.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76320053efde17f4fac8ce428ed03b84
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Ios.asset

@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Hy_Ios
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Hy_Ios
+  CN_Name: "\u6D77\u5916\u5353IOS"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4"
+  NewPath: ./StreamingAssets/unityRes
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/4"
+  VersionFileName: afivs
+  mainfestFileName: afimft
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Ios.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e697013a0126374f879ea203e34a5c6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Test_en.asset

@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: Hy_Test_en
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Hy_Test_en
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2_en"
+  NewPath: ./StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2_en"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/Hy_Test_en.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15f0a3e78c5d1024f86e67f96e5c4cad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/hy_Test.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: hy_Test
+  m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
+  Name: Hy_Test
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/2"
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles:
+  - font.unity3d
+  - monster_texture.unity3d
+  - hero_cloth_texture.unity3d
+  - fashion_headtop_texture.unity3d
+  - fashion_cloth_texture.unity3d
+  - fashion_bodyback_texture.unity3d
+  - uilanuch_uiprefab.unity3d
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1

Assets/Editor/AssetBundle/hy_Test.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3403f5e64d0cde489600f93471eb338
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Logic/TaskItemDataNew.lua

@@ -54,7 +54,7 @@ function TaskItemDataNew:RefreshTaskItem(_data)
             local _needChangeEnum = self:IsNeedChangeEnum(_keyCon);
             local _totalConStr = tostring(_totalCon);
             if _needChangeEnum and _w <= _totalCon then
-                _totalConStr = CommonUtil.GetPreciseDecimalFloor(_totalCon/10000, 1) .. "萬";--w
+                _totalConStr = CommonUtil.GetPreciseDecimalFloor(_totalCon/10000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
             end
             local _progress = {
                 _key = _keyCon,
@@ -67,7 +67,7 @@ function TaskItemDataNew:RefreshTaskItem(_data)
             local _value, _state = self:GetProgressByKey(_progress._key, _data.progress);
             _progress._value = _value or 0;
             if _needChangeEnum and _w <= _progress._value then
-                _progress._valueStr = CommonUtil.GetPreciseDecimalFloor(_progress._value/10000, 1) .. "萬";--w
+                _progress._valueStr = CommonUtil.GetPreciseDecimalFloor(_progress._value/10000, 1) .. CommonUtil.Get_Wan_string()--"萬";--w
             else
                 _progress._valueStr = tostring(_progress._value)
             end

Assets/Lua/Managers/LuaBattleMgr.lua

@@ -1556,7 +1556,11 @@ function LuaBattleMgr:CurLevelZeny()
 end
 
 function LuaBattleMgr:CurLevelName()
-    local lvname =  LuaBattleBridge.GetCurLevelName() --DifLvName
+    --local lvname =  LuaBattleBridge.GetCurLevelName() --DifLvName
+
+    local mapcfg = ManagerContainer.CfgMgr:GetMapData(self.curMapId)
+    local lvname = mapcfg.Name .. self.curLevelId
+
     if self.IsShowDiffTxt then
         local key = self:CurLevelQianZhuiKey()
         if key ~= "" then

Assets/Lua/UI/Common/IconItemCtr.lua

@@ -254,7 +254,7 @@ function IconItemCtr:RefreshIcon(wnd, itemlua, logicData, enterType, onClickOwne
             if iconType < 100 then
                 itemlua.num.text.text = CommonUtil.FormatNumber(num)
             else
-                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) .. "萬"--w
+                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
             end
         else
             itemlua.num.text.text = tostring(num)

Assets/Lua/UI/Common/RuneShopRewardsItemCtr.lua

@@ -331,7 +331,7 @@ function RuneShopRewardsItemCtr:SetIconDatatt(wnd, itemlua, logicData, enterType
             if iconType < 100 then
                 itemlua.num.text.text = CommonUtil.FormatNumber(num)
             else
-                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) .. "萬"--w
+                itemlua.num.text.text = CommonUtil.GetPreciseDecimalFloor(num/10000, 1) ..CommonUtil.Get_Wan_string()-- "萬"--w
             end
         else
             itemlua.num.text.text = tostring(num)

Assets/Lua/UI/UITips/UITipsExchangeView.lua

@@ -56,7 +56,7 @@ function UITipsExchangeView:Init()
 	if itemCfgData.ResType < 100 then
 		count = CommonUtil.FormatNumber(count)
 	else
-		count = CommonUtil.GetPreciseDecimalFloor(count/10000, 1) .. "萬"--w
+		count = CommonUtil.GetPreciseDecimalFloor(count/10000, 1) .. CommonUtil.Get_Wan_string()--"萬"--w
 	end
 	self.owned.text2.text.text = count
 

Assets/Lua/Util/CommonUtil.lua

@@ -752,9 +752,9 @@ function FormatNumber(number,isReturnW)
         if num_length < 5 then
            return num_str
         elseif num_length >= 5 and num_length < 9 or isReturnW then--万
-           return handler_dot(number, 10^4) .. "萬"   
+           return handler_dot(number, 10^4) .. Get_Wan_string()--"萬"   
         elseif num_length >= 9 and not isReturnW then--亿
-           return handler_dot(number, 10^8) .. "億"
+           return handler_dot(number, 10^8) .. Get_Yi_string()--"億"
         end
     end
 end
@@ -3068,3 +3068,12 @@ function UpdatePetExtGoShowData(petData, heroData)
         end
     end
 end
+
+
+function Get_Wan_string()
+    return "萬"
+end
+
+function Get_Yi_string()
+    return "億"
+end