123 пре 1 година
родитељ
комит
3cc0e6593a

Разлика између датотеке није приказан због своје велике величине
+ 195 - 37
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 17 - 3
Assets/Editor/AssetBundle/BundleBuilderZ.cs

@@ -28,6 +28,13 @@ public class BundleBuilderZ : EditorWindow
     [MenuItem("AssetBundle/MD5Creator")]
     public static void MD5Creator()
     {
+#if UNITY_IOS
+        string versionFileName = "afivs";
+        string assetsFileName = "afimft";
+#else
+          string  versionFileName = "Version";
+          string  assetsFileName = "mainfest";
+#endif
         DicFileMD5 = new Dictionary<string, MD5>();
         string[] files = Directory.GetFiles(FileSystem.PackagePath(), "*", SearchOption.AllDirectories);
         MD5CryptoServiceProvider md5Generator = new MD5CryptoServiceProvider();
@@ -58,7 +65,7 @@ public class BundleBuilderZ : EditorWindow
         }
         EditorUtility.ClearProgressBar();
 
-        string savePath = string.Format("{0}mainfest", FileSystem.PackagePath());
+        string savePath = string.Format("{0}{1}", FileSystem.PackagePath(), assetsFileName);
         // 删除前一版的old数据
         if (File.Exists(savePath))
         {
@@ -77,7 +84,7 @@ public class BundleBuilderZ : EditorWindow
         sb.Append($"{++size},Version,{VersionInfo},0\r\n");
         foreach (KeyValuePair<string, MD5> pair in DicFileMD5)
         {
-            if (pair.Key == "Version" || pair.Key == "mainfest")
+            if (pair.Key == versionFileName || pair.Key == assetsFileName)
             {
                 continue;
             }
@@ -110,7 +117,14 @@ public class BundleBuilderZ : EditorWindow
     {
         VersionInfo = version;
         MD5Creator();
-        FileHelper.WirteStringToFile($"{FileSystem.PackagePath()}Version",version);
+#if UNITY_IOS
+        string versionFileName = "afivs";
+        string assetsFileName = "afimft";
+#else
+          string  versionFileName = "Version";
+          string  assetsFileName = "mainfest";
+#endif
+        FileHelper.WirteStringToFile($"{FileSystem.PackagePath()}{versionFileName}",version);
     }
 
     #region BundleBuidlerDeleteAssetsData;

+ 1 - 1
Assets/Editor/Pack/PackConstant.cs

@@ -28,7 +28,7 @@ namespace Pack
         /// <summary>
         /// IOS 混淆key
         /// </summary>
-        public const string vjk487sdgltrecn = "vjk487sdgltrecn";
+        public const string IOSKey = "jb94nmygdmhdlotr";
 
 
         public static readonly string[] NeedFulDefineSymbols = {

+ 5 - 5
Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/TestServerNotice/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://165.154.29.92:81//',
+	SERVERLIST_URL = 'http://165.154.29.92:81//serverlist',
+	NOTIFY_URL = 'http://cxzcdn.hkhappygame.com/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://165.154.29.92:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://165.154.29.92:81//vipService',
 }
 
 return PlatformPack

+ 6 - 1
Assets/Src/Core/DownLoad/DownloadMgr.cs

@@ -148,9 +148,14 @@ public class DownloadMgr : Singleton<DownloadMgr>
             downloadTaskMaxNum = 1;
             localFilePath = GetLocalResPath();//FileSystem.LocalDocumentPath;
 
-
+#if UNITY_IOS
+            versionFileName = "afivs";
+            assetsFileName = "afimft";
+#else
             versionFileName = "Version";
             assetsFileName = "mainfest";
+#endif
+
             downloadedAssetsFileName = "downloaded";
             needDownloadList = new List<DownloadDataEntity>(100);
             downloadSucessList = new List<DownloadDataEntity>(100);

+ 5 - 5
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: WentingTec
-  productName: "\u5FC3\u529B\u7269\u8BED"
+  productName: "\u521D\u5FC3\u8005\u5927\u5192\u96AA"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -172,7 +172,7 @@ PlayerSettings:
   AndroidTargetSdkVersion: 34
   AndroidPreferredInstallLocation: 1
   aotOptions: 
-  stripEngineCode: 1
+  stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 0
@@ -846,10 +846,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;GAME_DEBUG
+    Android: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU
+    iPhone: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1

Неке датотеке нису приказане због велике количине промена