ybx_Gdn пре 10 месеци
родитељ
комит
efb5fb89a1

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


+ 1 - 1
Assets/Editor/AssetBundle/BundleBuilderZ.cs

@@ -302,7 +302,7 @@ public class BundleBuilderZ : EditorWindow
         BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget;
         if (buildTarget == BuildTarget.iOS)
         {
-            path = path + "/unityRes/";
+            path = path + "/ios/";
         }
         else if (buildTarget == BuildTarget.Android)
         {

+ 1 - 1
Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -68,7 +68,7 @@ public class CheckHotUpdateRes : EditorWindow
 #if UNITY_IOS
         info.VersionFileName = "afivs";
         info.mainfestFileName = "afimft";
-        info.NewPath = Application.dataPath + "/StreamingAssets/unityRes";
+        info.NewPath = Application.dataPath + "/StreamingAssets/ios";
         //#else
         //        versionFileName = "Version";
         //        assetsFileName = "mainfest";

+ 4 - 4
Assets/Editor/AssetBundle/Gn_0_1_Android.asset

@@ -14,12 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_0_1_Android
   CN_Name: "\u56FD\u51850.1\u7248\u5B89\u5353"
-  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
-  NewPath: ./StreamingAssets/AssetsAndroid
-  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/22"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/22"
   VersionFileName: Version
   mainfestFileName: mainfest
-  ResVersion: 0.1.0.0
+  ResVersion: 0.0.0.17
   IgnoreFiles: []
   ChangeNum: 0
   IsIgnore: 1

+ 3 - 3
Assets/Editor/AssetBundle/Gn_0_1_Ios.asset

@@ -14,9 +14,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp-Editor::ResInfo
   Name: Gn_0_1_Ios
   CN_Name: "\u56FD\u51850.1\u7248IOS"
-  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/0"
-  NewPath: ./StreamingAssets/AssetsAndroid
-  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/1"
+  OldPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/23"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets//StreamingAssets/ios
+  OutputPath: "C:/Users/Administrator/Desktop/My/\u9879\u76EE/23"
   VersionFileName: Version
   mainfestFileName: mainfest
   ResVersion: 0.1.0.0

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

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://103.239.245.64:81//',
-	SERVERLIST_URL = 'http://103.239.245.64:81//serverlist',
-	NOTIFY_URL = 'http://weix.vvfyj.cn/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://weix.vvfyj.cn/res/Channel/agreement.json',
-	CUSTOMER_SERVICE_INFO_URL = 'http://103.239.245.64:81//vipService',
+	URL_KEY = 'http://101.43.46.101:81//',
+	SERVERLIST_URL = 'http://101.43.46.101:81//serverlist',
+	NOTIFY_URL = 'http://101.43.46.101:88//res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://101.43.46.101:88//res/Channel/agreement.json',
+	CUSTOMER_SERVICE_INFO_URL = 'http://101.43.46.101:81//vipService',
 }
 
 return PlatformPack

+ 3 - 3
Assets/Src/Core/Base/FileSystem.cs

@@ -46,9 +46,9 @@ public class FileSystem
 
 #if UNITY_IPHONE
 #if UNITY_EDITOR
-		    m_PackagePath = Application.streamingAssetsPath + "/unityRes/";
+		    m_PackagePath = Application.streamingAssetsPath + "/ios/";
 #else
-		    m_PackagePath = Application.dataPath + "/Raw/unityRes/";
+		    m_PackagePath = Application.dataPath + "/Raw/ios/";
 #endif
 #elif UNITY_ANDROID
 #if UNITY_EDITOR
@@ -174,7 +174,7 @@ public class FileSystem
             if (string.IsNullOrEmpty(m_PlatformPath))
             {
 #if UNITY_IPHONE
-                m_PlatformPath = "unityRes/";
+                m_PlatformPath = "ios/";
 #elif UNITY_ANDROID
                 m_PlatformPath = "AssetsAndroid/";
 #else

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

@@ -142,7 +142,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
     private string GetBaseUrl()
     {
 #if GAME_ONE
-        return "";//"http://101.43.46.101:81/";
+        return "http://101.43.46.101:81/";//"http://101.43.46.101:81/";
 #elif CN_I7GAME_ZHUAN
           return "http://43.248.186.74:81/";
 #elif CN_I7GAME_0_1
@@ -229,6 +229,7 @@ public class DownloadMgr : Singleton<DownloadMgr>
         if (!string.IsNullOrEmpty(baseUrl) && tryGetVersionCount <= 3)
         {
             baseUrl += $"serverlist/download?platform={GetPlatform()}";
+            Log("Url = " + baseUrl);
             AssetDownloader.Instance.DownLoadFileByCoroutine(baseUrl,webReq=> 
             {
                 if (webReq == null)

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -137,7 +137,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0.0.6
+  bundleVersion: 0.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -845,10 +845,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU;BUGLY;FPS_DISABLE;CN_I7GAME_0_1
+    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;FPS_DISABLE;GAME_DEBUG;GAME_ONE
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1