ソースを参照

loading 修改

DGJ 1 年間 前
コミット
5f42d40e79

+ 1 - 2
Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -166,8 +166,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         if (SceneList.ContainsKey(id))
         SceneList[id].load();
         DataManager.Instance.ProjectID = int.Parse(id);
-        GameManager.Instance.isShowDownTip = true;
-        DownloadResManager.Instance.StartDownLoad();
+       
     }
 
     public Dictionary<string, UserSceneItem> GetScenes()

+ 2 - 0
Assets/COSScripts/COSDownLoad.cs

@@ -284,6 +284,7 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                Debug.LogError("CosClientException: " + clientEx);
                 DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
                 listDownLoadTask.RemoveAt(0);
+                showDownEndLoadCount++;
             }
             catch (COSXML.CosException.CosServerException serverEx)
             {
@@ -291,6 +292,7 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                 Debug.LogError("CosServerException: " + serverEx.GetInfo());
                 DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
                 listDownLoadTask.RemoveAt(0);
+                showDownEndLoadCount++;
             }
         
             listDownLoadTask.Add(downloadTask);

+ 3 - 1
Assets/Script/UserChooseScene.cs

@@ -32,6 +32,7 @@ public class UserChooseScene : MonoBehaviour
 
     public void gotoScene()
     {
+        Debug.Log("DGJ  ====> gotoScene ");
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
         cs.SetActive(false);
        
@@ -43,6 +44,7 @@ public class UserChooseScene : MonoBehaviour
                 break;
             }
         }
-
+        GameManager.Instance.isShowDownTip = true;
+        DownloadResManager.Instance.StartDownLoad();
     }
 }

+ 4 - 4
Assets/Scripts/UI/GameManager.cs

@@ -256,13 +256,13 @@ public class GameManager : MonoSingleton<GameManager>
         var t = TimerMgr.Instance.CreateTimer(()=> {
             if(isShowDownTip)
             {
-
-                if (COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount)
-                {
                     if (downLoadCount == 0)
                     {
                         downLoadCount = COSDownLoad.showDownEndLoadCount;
                     }
+                Debug.Log("DGJ  === >" + COSDownLoad.showDownLoadCount + "  " + COSDownLoad.showDownEndLoadCount + "   " + downLoadCount);
+                if (COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount)
+                {
 
                     string str = string.Format("{0}/{1}正在下载,{2}%", (COSDownLoad.showDownEndLoadCount - downLoadCount), COSDownLoad.showDownLoadCount - downLoadCount, COSDownLoad.showDownLoadPre.ToString("F2"));
                     UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.download);
@@ -276,7 +276,7 @@ public class GameManager : MonoSingleton<GameManager>
                         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
                         downLoadCount = 0;
                         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.updateEnd);
-                      //  isShowDownTip = false;
+                        isShowDownTip = false;
                        // TimerMgr.Instance.DestroyTimer(t);
                     }
                 }

+ 2 - 2
Assets/Scripts/UI/LoginPanel.cs

@@ -262,9 +262,9 @@ public class LoginPanel : BaseUI
 #if UNITY_EDITOR
         m_AccountStr = "4444@qq.com";
         m_AccountStr = "jiajun.hu@ghz-tech.com";
-        //  m_AccountStr = "1768147286@qq.com";
+        m_AccountStr = "1768147286@qq.com";
         m_AccountStr = "bactest1@1.com";
-     //   m_AccountStr = "devtest1@1.com";
+        m_AccountStr = "advtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -938,8 +938,8 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
+      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -960,9 +960,9 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: True
       Proximity: False
       CodeGeneration: False
+      BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False