Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -2,17 +2,11 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1675"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,1437"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1292"/>
-    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1153"/>
-    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,960"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,802"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,670"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="398,516"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,209"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="483,2066"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="472,1673"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="84,1410"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="849,1206"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="154,785"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="408,365"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -2,25 +2,15 @@
 <component size="1170,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,1979"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="675,1887"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1695"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1687"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,1565"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,1407"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1293"/>
-    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1252"/>
-    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1043"/>
-    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,994"/>
-    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,909"/>
-    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,737"/>
-    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,767"/>
-    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,688"/>
-    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,577"/>
-    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,359"/>
-    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="495,193"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="476,2298"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="282,2133"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="286,1782"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="667,1706"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="469,1443"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,1277"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,1073"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="740,967"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,754"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="523,529"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,2203"/>
-    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1963"/>
-    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1963"/>
-    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1723"/>
-    <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1483"/>
-    <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1483"/>
-    <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1243"/>
-    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1003"/>
-    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1003"/>
-    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,763"/>
-    <component id="n18_ux8s" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,523"/>
-    <component id="n19_ux8s" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,523"/>
-    <component id="n20_ux8s" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,283"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
+    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="317,2227"/>
+    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,2072"/>
+    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="925,1806"/>
+    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1712"/>
+    <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="187,1562"/>
+    <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="407,1327"/>
+    <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,1161"/>
+    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="924,922"/>
+    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="177,825"/>
+    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="437,431"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,2190"/>
-    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1940"/>
-    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1940"/>
-    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1690"/>
-    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1430"/>
-    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1430"/>
-    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1180"/>
-    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,930"/>
-    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,930"/>
-    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,680"/>
-    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,420"/>
-    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,420"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="607,2225"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="150,2007"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="513,1734"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="746,1542"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="41,1365"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1000,1157"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="492,916"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="470,438"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,301"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="496,141"/>
   </displayList>
 </component>

GameClient/Assets/BuildSetting.asset

@@ -18,3 +18,10 @@ MonoBehaviour:
   - Assets/Res/Effect/DressUp
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
+  dirTypeList:
+  - texture_dressup_es_
+  - texture_dressup_js_
+  - texture_dressup_ss_
+  - texture_dressup_ts_
+  - texture_dressup_xz_
+  - texture_dressup_zr_

GameClient/Assets/BuildSetting1.asset

@@ -19,3 +19,10 @@ MonoBehaviour:
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
   - Assets/Res/Texture
+  dirTypeList:
+  - texture_dressup_es_
+  - texture_dressup_zr_
+  - texture_dressup_xz_
+  - texture_dressup_js_
+  - texture_dressup_ts_
+  - texture_dressup_ss_

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -102,6 +102,11 @@ namespace GFGEditor
 
         public static void Import()
         {
+            var md5Path = ImportArtResTool.Md5FilePath;
+            if (!Directory.Exists(md5Path))
+            {
+                Directory.CreateDirectory(md5Path);
+            }
 
             //音乐
             EditorUtility.DisplayProgressBar("进度", "正在导入音乐", 1);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -245,38 +245,29 @@ namespace GFGEditor
             }
         }
 
-        [MenuItem("Tools/BuildTest/SetBundlesResTestDir")]
+        [MenuItem("Tools/BuildTest/导入临时版本资源")]
         public static void SetBundlesResTestDir()
         {
-            VEngine.Utility.buildPath = "Bundles_temp";
-            ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
-            CommitWhenRelease = false;
-        }
-
-        [MenuItem("Tools/BuildTest/ResetBundlesResDir")]
-        public static void ResetBundlesResTestDir()
-        {
-            VEngine.Utility.buildPath = "Bundles";
-            ImportArtResTool.ResRootDirNameDressUp = "正式资源";
-            CommitWhenRelease = true;
+            try
+            {
+                ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
+                CommitWhenRelease = false;
+                UpdateAndImportArtRes();
+            }
+            catch(Exception e)
+            {
+                Log.Error(e.ToString());
+                ImportArtResTool.ResRootDirNameDressUp = "正式资源";
+                CommitWhenRelease = true;
+            }
         }
 
         [MenuItem("Tools/BuildTest/发布临时版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
         public static void BuildBundlesResTemp()
         {
-            //VEngine.Utility.buildPath = "Bundles_temp";
             EditorUtility.DisplayProgressBar("进度", "正在发布临时版本", 1);
-            VEngine.Editor.Builds.BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
+            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
             EditorUtility.ClearProgressBar();
-            //VEngine.Utility.buildPath = "Bundles";
-        }
-
-        [MenuItem("Tools/BuildTest/Copy To StreamingAssets Temp")]
-        public static void CopyToStreamingAssets()
-        {
-            VEngine.Utility.buildPath = "Bundles_temp";
-            BuildScript.CopyToStreamingAssets();
-            VEngine.Utility.buildPath = "Bundles";
         }
 
     }

GameClient/Assets/Editor/Xasset/BuildSetting.cs

@@ -8,6 +8,7 @@ namespace GFGEditor
     public class BuildSetting : ScriptableObject
     {
         public List<string> dirBundleList;
+        public List<string> dirTypeList;
 
         public static BuildSetting GetBuildSetting(string setName)
         {

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using GFGEditor;
 using UnityEditor;
 using UnityEngine;
 
@@ -9,7 +10,7 @@ namespace VEngine.Editor.Builds
     public class BuildTask
     {
         private readonly string[] EXCLUDE_EXTS = new string[] { ".meta" };
-        private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn", "Assets/Res/MD5" };
+        private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn", ImportArtResTool.Md5FilePath };
         private readonly BuildAssetBundleOptions buildAssetBundleOptions;
         private readonly List<Asset> bundledAssets = new List<Asset>();
         private readonly string bundleExtension;
@@ -76,7 +77,7 @@ namespace VEngine.Editor.Builds
 
         public void BuildCustomBundles(string[] resRootDirNames, string setName)
         {
-            foreach(var resRootDirName in resRootDirNames)
+            foreach (var resRootDirName in resRootDirNames)
             {
                 CreateBundles(resRootDirName, setName);
             }
@@ -107,6 +108,17 @@ namespace VEngine.Editor.Builds
                     var i = bundle.IndexOf(".");
                     bundle = bundle.Substring(0, i);
                     bundle = bundle.ToLower();
+
+
+                    for (int j = 0; j < buildSetting.dirTypeList.Count; j++)
+                    {
+                        string str = buildSetting.dirTypeList[j];
+                        if (bundle.IndexOf(str) >= 0)
+                        {
+                            bundle = str.Substring(0, str.Length - 1);
+                            break;
+                        }
+                    }
                     bundledAssets.Add(new Asset
                     {
                         path = filePath,
@@ -118,7 +130,7 @@ namespace VEngine.Editor.Builds
             foreach (var dir in dirBundleList)
             {
                 var dirPath = Path.Combine(Environment.CurrentDirectory, dir);
-                if(!GFGEditor.FileUtil.CheckPathInParent(dirPath, path))
+                if (!GFGEditor.FileUtil.CheckPathInParent(dirPath, path))
                 {
                     continue;
                 }
@@ -203,7 +215,7 @@ namespace VEngine.Editor.Builds
                 Debug.LogErrorFormat("Failed to build {0}.", name);
                 return;
             }
-            if(!string.IsNullOrEmpty(GFGGame.LauncherConfig.resKey))
+            if (!string.IsNullOrEmpty(GFGGame.LauncherConfig.resKey))
             {
                 CreateEncryptAssets(outputPath, outputPath, manifest, GFGGame.LauncherConfig.resKey);
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs

@@ -14,12 +14,6 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g4;
         public UI_CompStoryLevelItem m_g5;
         public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
         public const string URL = "ui://mfvz4q8kkpb08j";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20001";
@@ -74,12 +68,6 @@ namespace UI.Main
             m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
             m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
             m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,18 +84,6 @@ namespace UI.Main
             m_g5 = null;
             m_g6.Dispose();
             m_g6 = null;
-            m_g7.Dispose();
-            m_g7 = null;
-            m_g8.Dispose();
-            m_g8 = null;
-            m_g9.Dispose();
-            m_g9 = null;
-            m_g10.Dispose();
-            m_g10 = null;
-            m_g11.Dispose();
-            m_g11 = null;
-            m_g12.Dispose();
-            m_g12 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs

@@ -18,16 +18,6 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g8;
         public UI_CompStoryLevelItem m_g9;
         public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8kkpb08i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20002";
@@ -86,16 +76,6 @@ namespace UI.Main
             m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
             m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -120,26 +100,6 @@ namespace UI.Main
             m_g9 = null;
             m_g10.Dispose();
             m_g10 = null;
-            m_g11.Dispose();
-            m_g11 = null;
-            m_g12.Dispose();
-            m_g12 = null;
-            m_g13.Dispose();
-            m_g13 = null;
-            m_g14.Dispose();
-            m_g14 = null;
-            m_g15.Dispose();
-            m_g15 = null;
-            m_g16.Dispose();
-            m_g16 = null;
-            m_g17.Dispose();
-            m_g17 = null;
-            m_g18.Dispose();
-            m_g18 = null;
-            m_g19.Dispose();
-            m_g19 = null;
-            m_g20.Dispose();
-            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20003.cs

@@ -18,9 +18,6 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g8;
         public UI_CompStoryLevelItem m_g9;
         public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
         public const string URL = "ui://mfvz4q8kkpb08k";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20003";
@@ -79,9 +76,6 @@ namespace UI.Main
             m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
             m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -106,12 +100,6 @@ namespace UI.Main
             m_g9 = null;
             m_g10.Dispose();
             m_g10 = null;
-            m_g11.Dispose();
-            m_g11 = null;
-            m_g12.Dispose();
-            m_g12 = null;
-            m_g13.Dispose();
-            m_g13 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20004.cs

@@ -18,8 +18,6 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g8;
         public UI_CompStoryLevelItem m_g9;
         public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
         public const string URL = "ui://mfvz4q8kkpb08l";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20004";
@@ -78,8 +76,6 @@ namespace UI.Main
             m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
             m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -104,10 +100,6 @@ namespace UI.Main
             m_g9 = null;
             m_g10.Dispose();
             m_g10 = null;
-            m_g11.Dispose();
-            m_g11 = null;
-            m_g12.Dispose();
-            m_g12 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/HotUpdateEntry.cs

@@ -14,8 +14,6 @@ namespace GFGGame.HotUpdate
             //ET
             try
             {
-                Screen.sleepTimeout = SleepTimeout.NeverSleep;
-
                 HotUpdateProxy.Instance.update = Game.Update;
                 HotUpdateProxy.Instance.lateUpdate = Game.LateUpdate;
                 HotUpdateProxy.Instance.onApplicationQuit = Game.Close;

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -7,6 +7,7 @@ public class GameLauncher : MonoBehaviour
 {
     private void Awake()
     {
+        Screen.sleepTimeout = SleepTimeout.NeverSleep;
         Application.runInBackground = true;
         //ET
         System.AppDomain.CurrentDomain.UnhandledException += (sender, e) =>

GameClient/Assets/MD5.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ba4e48d93bfd6c642baf62869950bd91
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/MD5/BgMd5.meta

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

GameClient/Assets/MD5/CardBgMd5

@@ -1 +0,0 @@
-2../../../gfg/正式资源/卡牌/pic/kp_caiwei.jpg 869286f97bf1ed2a86461572588957593../../../gfg/正式资源/卡牌/pic/kp_feiying.jpg 3418376498f4c60ac66bd5927a4053a72../../../gfg/正式资源/卡牌/pic/kp_gongnv.jpg 078698e58774f28863e2e43ff0b717772../../../gfg/正式资源/卡牌/pic/kp_lanhua.jpg ef9eaa43a32c3e2e4379962869a70c081../../../gfg/正式资源/卡牌/pic/kp_mudan.jpg c5c8cb992e3cc88c268fc95f8bd529202../../../gfg/正式资源/卡牌/pic/kp_shiwei.jpg b99ffbbaa0d44a51a5d1aadd667d69ae1../../../gfg/正式资源/卡牌/pic/kp_xiake.jpg b4fa11df7cc8c12801e854e8fd8b72a73../../../gfg/正式资源/卡牌/pic/kp_zuochi1.jpg f0e340599fcf6ef042ce086c3f63e9d93../../../gfg/正式资源/卡牌/pic/kp_zuochi2.jpg 9662749cfcf5d57057fe339b554b14d4

GameClient/Assets/MD5/CardBgMd5.meta

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

GameClient/Assets/MD5/CardMd5

@@ -1 +0,0 @@
-3../../../gfg/正式资源/卡牌/icon/kp_caiwei.jpg 1e8f003d99eb386ec7c9daa60f2279fc4../../../gfg/正式资源/卡牌/icon/kp_feiying.jpg 70dc9c50f9a008c1218d38c4573fb3ce3../../../gfg/正式资源/卡牌/icon/kp_gongnv.jpg 85da913113aeeade020004629f725c4a3../../../gfg/正式资源/卡牌/icon/kp_lanhua.jpg c697fc44aaa97057a99f04e3b028d4152../../../gfg/正式资源/卡牌/icon/kp_mudan.jpg c7c5de444d0498dedd6bdbe7ef06c02d3../../../gfg/正式资源/卡牌/icon/kp_shiwei.jpg bf5e405ba7736f87c1ea0d6ddf05d02f2../../../gfg/正式资源/卡牌/icon/kp_xiake.jpg ac327b8dca1392e7b333ea68dfec99214../../../gfg/正式资源/卡牌/icon/kp_zuochi1.jpg 5ced6e970382fab571ab3c81ca0177a74../../../gfg/正式资源/卡牌/icon/kp_zuochi2.jpg 0bc1c73eb3197d4e579c8116c8f47f38

GameClient/Assets/MD5/CardMd5.meta

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

GameClient/Assets/MD5/DressUpMd5.meta

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

GameClient/Assets/MD5/FieldGuideIconMd5.meta

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

GameClient/Assets/MD5/HeadMd5

@@ -1 +0,0 @@
-7../../../gfg/正式资源/npc/对战头像/qixiongf.png 185268a7f0595b4b61274556e5de1f464../../../gfg/正式资源/npc/对战头像/qujuf.png 06eb1b4de8203a3a13d3ad98b8370b293../../../gfg/正式资源/npc/对战头像/self.png 928b32e57968cdeb06f777d43987f704:../../../gfg/正式资源/npc/对战头像/shangzuochi.png 80a3f6b2c978536bcf020dc673ddcb88;../../../gfg/正式资源/npc/对战头像/shangzuochit.png a2b4db3881af57e0e94ec3d586de8fc09../../../gfg/正式资源/npc/对战头像/yangguifei.png b098567acad5b49208cd9f08240d3ab6;../../../gfg/正式资源/npc/对战头像/yuanlingpaom.png f5de065b2e45a41be84b32a50be9518a5../../../gfg/正式资源/npc/对战头像/zhijuf.png de05bfec47d4cbd1bb49915bc0845203

GameClient/Assets/MD5/HeadMd5.meta

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

GameClient/Assets/MD5/IconMd5.meta

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

GameClient/Assets/MD5/MusicMd5

@@ -1 +0,0 @@
-)../../../gfg/正式资源/music/fight.mp3 56b058e235c4fba98836db41659f2419+../../../gfg/正式资源/music/zhuxian.mp3 df04daf64ee200e01eaec8499989b9ab)../../../gfg/正式资源/music/music.mp3 2d16fe3156881a8cab72a210b43c20f4

GameClient/Assets/MD5/MusicMd5.meta

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

GameClient/Assets/MD5/PicFMd5

@@ -1 +0,0 @@
-9../../../gfg/正式资源/npc/对战立绘/bzguzhuang.png 9b837821ab2b4dd50df0cfbf9427826b8../../../gfg/正式资源/npc/对战立绘/bzxiandai.png ff7408fc2f04231b3045ee1d238359bf7../../../gfg/正式资源/npc/对战立绘/qixiongf.png 7ee4f2c99eabd26f0a82c1cc06c4d0664../../../gfg/正式资源/npc/对战立绘/qujuf.png 0ce1d35bddafae26994e08747bccccaa9../../../gfg/正式资源/npc/对战立绘/yangguifei.png 5bafa17f1511de2b74e0f3bac306aad8;../../../gfg/正式资源/npc/对战立绘/yuanlingpaom.png 986992e80670270596482ed9acf097795../../../gfg/正式资源/npc/对战立绘/zhijuf.png 190a5982b5b090ca49cbe4bccaf0872e

GameClient/Assets/MD5/PicFMd5.meta

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

GameClient/Assets/MD5/PicSMd5

@@ -1 +0,0 @@
-6../../../gfg/正式资源/npc/对话立绘/default.png 9fa2f9169f0007dd27288096798534717../../../gfg/正式资源/npc/对话立绘/qixiongf.png b997621ae91a994e6783b38a6d28a3024../../../gfg/正式资源/npc/对话立绘/qujuf.png d36f7b90fc98048fb22fde10609e802a:../../../gfg/正式资源/npc/对话立绘/shangzuochi.png d426880934501292d2cd5f88867f6d47;../../../gfg/正式资源/npc/对话立绘/shangzuochit.png a3824cb23128e1cbb263342f7cdc756c9../../../gfg/正式资源/npc/对话立绘/yangguifei.png 36571bd4f4c9186ee484add37078e8e0;../../../gfg/正式资源/npc/对话立绘/yuanlingpaom.png 045f4a52a15b6c50370c64e8349a08dd5../../../gfg/正式资源/npc/对话立绘/zhijuf.png 372b7f8752bff99e73d23936ed3d43d3:../../../gfg/正式资源/npc/对话立绘/yizugongzhu.png 94e0ee15a97836d459eac5e4346b417a7../../../gfg/正式资源/npc/对话立绘/shenjiao.png bd369246ca008e97351e1dcf2f9fd442

GameClient/Assets/MD5/PicSMd5.meta

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

GameClient/Assets/ThirdParty/Xasset/Runtime/Loadables/Bundles/LocalBundle.cs

@@ -8,8 +8,15 @@ namespace VEngine
 
         protected override void OnLoad()
         {
-            var encrpytData = EncryptHelper.GetDecryptData(pathOrURL, EncryptHelper.resKeyChars);
-            request = AssetBundle.LoadFromMemoryAsync(encrpytData);
+            if(EncryptHelper.resKeyChars == null)
+            {
+                request = AssetBundle.LoadFromFileAsync(pathOrURL);
+            }
+            else
+            {
+                var encrpytData = EncryptHelper.GetDecryptData(pathOrURL, EncryptHelper.resKeyChars);
+                request = AssetBundle.LoadFromMemoryAsync(encrpytData);
+            }
         }
 
         public override void LoadImmediate()

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.1
+  bundleVersion: 1.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0