替换 播放器 新增素材组合类型

Assets/2.0/Resources/Template/Prefab/Video.prefab

@@ -1241,6 +1241,7 @@ MonoBehaviour:
   canTwoHandScale: 0
   minScaleRatio: 0.5
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!1 &6405407511848220291
 GameObject:
   m_ObjectHideFlags: 0
@@ -1898,10 +1899,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8400236291338521230}
   - component: {fileID: 8400236291338521228}
-  - component: {fileID: 8400236291338521229}
-  - component: {fileID: 8400236291338521227}
-  - component: {fileID: 8400236291338521226}
   - component: {fileID: 1721331326262511666}
+  - component: {fileID: 8202710742994944799}
   m_Layer: 5
   m_Name: AVideo
   m_TagString: Untagged
@@ -1937,239 +1936,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8400236291338521233}
   m_CullTransparentMesh: 1
---- !u!114 &8400236291338521229
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8400236291338521233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f17cdc186456a4469a139a104d2ca72, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  _mediaPlayer: {fileID: 8400236291338521227}
-  _defaultTexture: {fileID: 0}
-  _uvRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  _setNativeSize: 0
-  _scaleMode: 0
-  _noDefaultDisplay: 1
-  _displayInEditor: 1
---- !u!114 &8400236291338521227
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8400236291338521233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _mediaSource: 1
-  _mediaReference: {fileID: 0}
-  _mediaPath:
-    _pathType: 0
-    _path: 
-  _fallbackMediaHints:
-    transparency: 0
-    alphaPacking: 0
-    stereoPacking: 0
-  _autoOpen: 1
-  _autoPlayOnStart: 1
-  _loop: 0
-  _audioVolume: 1
-  _audioBalance: 0
-  _audioMuted: 0
-  _playbackRate: 1
-  _useResampler: 0
-  _resampleMode: 0
-  _resampleBufferSize: 5
-  _videoMapping: 0
-  _textureFilterMode: 1
-  _textureWrapMode: 1
-  _textureAnisoLevel: 0
-  _useVideoResolve: 0
-  _videoResolveOptions:
-    applyHSBC: 0
-    hue: 0
-    saturation: 0.5
-    brightness: 0.5
-    contrast: 0.5
-    gamma: 1
-    tint: {r: 1, g: 1, b: 1, a: 1}
-    generateMipmaps: 0
-  _sideloadSubtitles: 0
-  _subtitlePath:
-    _pathType: 2
-    _path: 
-  _audioHeadTransform: {fileID: 0}
-  _audioFocusEnabled: 0
-  _audioFocusTransform: {fileID: 0}
-  _audioFocusWidthDegrees: 90
-  _audioFocusOffLevelDB: 0
-  _httpHeaders:
-    httpHeaders: []
-  _keyAuth:
-    keyServerToken: 
-    overrideDecryptionKeyBase64: 
-    overrideDecryptionKey: 
-  _events:
-    m_PersistentCalls:
-      m_Calls: []
-  _eventMask: -1
-  _pauseMediaOnAppPause: 1
-  _playMediaOnAppUnpause: 1
-  _persistent: 0
-  _forceFileFormat: 0
-  _optionsWindows:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    videoApi: 0
-    useHardwareDecoding: 1
-    useTextureMips: 0
-    use10BitTextures: 0
-    hintAlphaChannel: 0
-    useLowLatency: 0
-    useCustomMovParser: 0
-    useHapNotchLC: 0
-    useStereoDetection: 1
-    useTextTrackSupport: 1
-    useFacebookAudio360Support: 1
-    useAudioDelay: 0
-    bufferedFrameSelection: 0
-    pauseOnPrerollComplete: 0
-    forceAudioOutputDeviceName: 
-    preferredFilters: []
-    audioOutput: 0
-    audio360ChannelMode: 0
-    startWithHighestBitrate: 0
-    useLowLiveLatency: 0
-    parallelFrameCount: 3
-    prerollFrameCount: 4
-    useUnityAudio: 0
-    enableAudio360: 0
-  _optionsMacOSX:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsIOS:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsTVOS:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsAndroid:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    videoApi: 1
-    useFastOesPath: 0
-    showPosterFrame: 0
-    audioOutput: 0
-    audio360ChannelMode: 0
-    preferSoftwareDecoder: 0
-    blitTextureFiltering: 0
-    fileOffset: 0
-    startWithHighestBitrate: 0
-    minBufferMs: 50000
-    maxBufferMs: 50000
-    bufferForPlaybackMs: 2500
-    bufferForPlaybackAfterRebufferMs: 5000
-    enableAudio360: 0
-  _optionsWindowsUWP:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    useHardwareDecoding: 1
-    useTextureMips: 0
-    use10BitTextures: 0
-    hintOutput10Bit: 0
-    useLowLatency: 0
-    videoApi: 1
-    audioOutput: 0
-    audio360ChannelMode: 0
-    startWithHighestBitrate: 0
-    useLowLiveLatency: 0
-  _optionsWebGL:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    externalLibrary: 0
-    useTextureMips: 0
-  m_VideoPath: 
-  m_VideoLocation: 2
---- !u!114 &8400236291338521226
+--- !u!114 &1721331326262511666
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2178,10 +1945,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 8400236291338521233}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c7d817848393db44c8e1668eb60b40d8, type: 3}
+  m_Script: {fileID: 11500000, guid: a72774fbebebcfa46b3f27e3d9f92e1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &1721331326262511666
+  Icon: {fileID: 7783334408191734234}
+  m_IsPlaying: 0
+  m_Video: {fileID: 8202710742994944799}
+  spid: 
+  videoid: 
+--- !u!114 &8202710742994944799
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2190,14 +1962,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 8400236291338521233}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a72774fbebebcfa46b3f27e3d9f92e1d, type: 3}
+  m_Script: {fileID: 11500000, guid: eb94bf957aaed554492064dde1c1775e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Icon: {fileID: 7783334408191734234}
-  m_IsPlaying: 0
-  m_Video: {fileID: 8400236291338521226}
-  spid: 
-  videoid: 
 --- !u!1 &8554676593696482103
 GameObject:
   m_ObjectHideFlags: 0
@@ -2376,6 +2143,7 @@ GameObject:
   - component: {fileID: 305376017356116702}
   - component: {fileID: 939118683876271891}
   - component: {fileID: 1116663417015624178}
+  - component: {fileID: 2791244438943783980}
   m_Layer: 5
   m_Name: Video
   m_TagString: Untagged
@@ -2424,7 +2192,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.12156863, g: 0.12156863, b: 0.12156863, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2494,3 +2262,16 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &2791244438943783980
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8654540562372780374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d1976a6c73df16c4997032b3e989d934, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ap: {fileID: 8202710742994944799}

Assets/2.0/Tools/HttpAction.cs

@@ -18,6 +18,9 @@ public class HttpAction :Singleton<HttpAction>
 
     public const string baseurl20 = "https://api-fat2.ghz-tech.com/mr-navigator/v1";
     public const string baseurl = "https://api-fat2.ghz-tech.com/mr-navigator/v1";
+
+    //public const string baseurl20 = "http://192.168.50.114:8888/mr-navigator/v1";
+    //public const string baseurl = "http://192.168.50.114:8888/mr-navigator/v1";
     //初始化场景
     public const string client_snInfo = "/client/snInfo";
 

Assets/2.0/User/Model/ModelItem.cs

@@ -160,6 +160,10 @@ public class ModelItem
                 Debug.LogError(name + "  素材结构类型异常！！！");
                 break;
         }
+
+        if (type == 0)
+            return;
+
         url = DownloadPath;
         Debug.Log(url);
         this.modelList = modelList;

Assets/2.0/User/Model/ModelList.cs

@@ -359,29 +359,60 @@ public class ModelList: System.ICloneable
     {
       
         List<ObjectValue> objects = new List<ObjectValue>();
+        //switch (material.typesetting)
+        //{
+        //    case "1":
+        //       SRTitleLayout.CalLayout(material, spoit);
+        //        break;
+        //    case "2":
+        //         SRSectorLayout.CalLayout(material, spoit);
+        //        break;
+        //    case "3":
+        //        DRTitleLayout.CalLayout(material, spoit);
+        //        break;
+        //    case "4":
+        //        DRFanLayout.CalLayout(material, spoit);
+        //        break;
+        //    case "5":
+        //        SRTitleLayout.CalLayout(material, spoit);
+        //        break;
+        //    case "自定义":
+        //        break;
+        //    default:
+        //        break;
+        //}
+
         switch (material.typesetting)
         {
             case "1":
-               SRTitleLayout.CalLayout(material, spoit);
+                SRTitleLayout.CalLayout(material, spoit);
                 break;
             case "2":
-                 SRSectorLayout.CalLayout(material, spoit);
+                SRTitleLayout.CalLayout(material, spoit);
                 break;
             case "3":
-                DRTitleLayout.CalLayout(material, spoit);
+                SRTitleLayout.CalLayout(material, spoit);
                 break;
             case "4":
-                DRFanLayout.CalLayout(material, spoit);
+                SRSectorLayout.CalLayout(material, spoit);
                 break;
             case "5":
-                SRTitleLayout.CalLayout(material, spoit);
+                DRTitleLayout.CalLayout(material, spoit);
+                break;
+            case "6":
+                DRTitleLayout.CalLayout(material, spoit);
+                break;
+            case "7":
+                DRTitleLayout.CalLayout(material, spoit);
                 break;
-            case "自定义":
+            case "8":
+                DRFanLayout.CalLayout(material, spoit);
                 break;
+
             default:
                 break;
         }
-       
+
     }
     /// <summary>
     /// 创建物体ObjectValue，并赋值位置信息

Assets/2.0/User/Model/ModelManager.cs

@@ -29,7 +29,7 @@ public class ModelManager : Singleton<ModelManager>
         AddDicModelList(library);
         AddDicModelList(combination);
 
-
+    
         //ModelList model = GetModelList(687);
 
         //model.name = "AAAAAAAAA";
@@ -43,6 +43,15 @@ public class ModelManager : Singleton<ModelManager>
      if (!string.IsNullOrWhiteSpace(message))
         {
             Models = JsonConvert.DeserializeObject<List<ModelList>>(message);
+
+            int len = Models.Count;
+            for (int i = 0; i < len; i++)
+            {
+                if (Models.Count - 1 < len && Models[i].type == 0)
+                    Models.Remove(Models[i]);
+
+
+            }
             Debug.Log(Models.Count + " AddDicModelList " + message);
             for (int i = 0; i < Models.Count; i++)
             {            

Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -42,11 +42,21 @@ public class VufroiaTrigger
 
     IEnumerator loadVuforia()
     {
+        Debug.Log("DGJ ===> 加载Database  " + LoaclxmlFile);
+        IEnumerable<ObserverBehaviour> observer = null;
+        try
+        {
+           observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
+         
 
-        Debug.Log("加载Database  "+ LoaclxmlFile);
-        IEnumerable<ObserverBehaviour> observer = VuforiaBehaviour.Instance.ObserverFactory.CreateBehavioursFromDatabase(LoaclxmlFile);
-        // Create an Image Target from the database.
+        }
+        catch (System.Exception e)
+        {
+           
+          
+        }
         yield return observer;
+        // Create an Image Target from the database.
 
         List<ObserverBehaviour> list = new List<ObserverBehaviour>();
 
@@ -59,7 +69,7 @@ public class VufroiaTrigger
 
         foreach (string item in usi.SpotsList.Keys)
         {
-            if(list.Count>count)
+            if (list.Count > count)
                 usi.SpotsList[item].setObVuforia(list[count]);
             count++;
         }

Assets/2.0/User/UserScene/UserSceneItem.cs

@@ -6,16 +6,16 @@ using UnityEngine;
 
 public class UserSceneItem
 {
-    //场景的扫描图
+    //鍦烘櫙鐨勬壂鎻忓浘
     public VufroiaTrigger vufroiaTrigger;
 
-    //场景ID
+    //鍦烘櫙ID
     public string id;
 
-    //场景名字
+    //鍦烘櫙鍚嶅瓧
     public string name;
 
-    //场景中的景点
+    //鍦烘櫙涓�殑鏅�偣
     public Dictionary<string, SpotsItem> SpotsList = new Dictionary<string, SpotsItem>();
 
     GameObject _sceneModel;
@@ -42,9 +42,11 @@ public class UserSceneItem
             v.VuforiaItem.SetActive(false);
             v.show();
         }
+
+     
     }
 
-    //场景原始信息
+    //鍦烘櫙鍘熷�淇℃伅
     public string info;
 
 

Assets/2.0/User/UserScene/UserSceneManager.cs

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

Assets/COSScripts/COSDownLoad.cs

@@ -26,13 +26,25 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
     public SuccessCOS materialSuccessCos;
     public SuccessCOS sceneSuccessCos;
     public SuccessCOS imageSuccessCos;
-  //  QCloudCredentialProvider cosCredentialProvider;
+
+    public SuccessCOS publicSuccessCos;
+    //  QCloudCredentialProvider cosCredentialProvider;
     CosXml materialCosXml;
     CosXml sceneCosXml;
     CosXml imageCosXml;
+    CosXml publicCosXml;
     // Start is called before the first frame update
 
-   public void Credential()
+   
+
+private void Start()
+    {
+       
+
+        
+    }
+
+    public void Credential()
     {
         Credential credential = new Credential();
         credential.type = "material";
@@ -50,6 +62,25 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
         string data3 = JsonConvert.SerializeObject(credential3);
         HttpTool.Instance.Post("/storage/credential/create", data3, CredentialImageCallBack);
 
+
+
+//        publicSuccessCos = JsonConvert.DeserializeObject<SuccessCOS>("{'credentials':{'tmpSecretId':'AKIDLyyDWYsUvRDzn - HqetC4XZ9pNMhOjDEYuSKBvlWcep8iVS1dFa87FyVartAR1 - E_','tmpSecretKey':'rTXSx44gpPR / fgrUaT1zvK0xZQZe2SplrpTkoGEsgN4 = ','sessionToken':'3WfLBVhQ7lK1jNbOBMfcKC0BkZEamXYa9b61b73db72c57039c9cd0b65b4e19a7_9 - RKlXQeKHOCLXyEJscL705yLZxSuPrVLA1c - ZCA4TZmW8RA8dp1dJ7k4VZhRrNQhQ2zheytiN2wAqxKElmycMTnbk97t_FuAAqGPdO9IAnuYNbvOSgDXICIpxMsVPSqWS6cXrHeDhVCLkpZUaHiM2Exk - xbvlCflv4VPjsr6gFYQynEa3RBrvL4mWjg0xrSn0Lpz4h_VmEUW7cT3i07bnNqhA9nsdvCbyxf3JL3fwz92m8ltm - x0NK6fCsdIwaWnkHkWfWHBqwTqxMoID4vlGj84_FK4ZEc_HbXIqruZLikSM - 8u16ks78fODGILOt36EX_2_IRz5JGAX2kNj5BvkVUjIV - 6eB - qbJDkQce2sB_dDaA0cfNsrlfYFMQCWizcv5kDDbgkg4uengC0GbTZQUPm9Jyj9QuLsI9N2V7UuIUL41sN0LLWPSxrpZ4nUxjRJykleSnQ0_WnZaBIa2bFJAxdxOvJXuGIDqIhcTVsPmJkN_O7VUMFPousM9bAVQJjYeSh2a39eVcUJnvWIpiLSNtbgOZFOuXsofS4FYD8aNX3GWrzEyQXoAGBwasRFvjj7aiSgURVM7ue11i_Wz56RiFo2bNihu5cgGsx271ts'},'startTime':1694402249,'expiredTime':1694402549,'bucket':'fat - store - 10001 - 1317557471','path':' / personal / image / 156','region':'ap - shanghai'}");
+
+
+//        CosXmlConfig config = new CosXmlConfig.Builder()
+//         .IsHttps(true)
+//         .SetRegion(publicSuccessCos.region)
+//         .SetDebugLog(true)
+//         .Build();
+
+//        Debug.Log("" + publicSuccessCos.credentials);
+//        QCloudCredentialProvider cosCredentialProvider = new DefaultSessionQCloudCredentialProvider(
+//publicSuccessCos.credentials.tmpSecretId, publicSuccessCos.credentials.tmpSecretKey, publicSuccessCos.expiredTime, publicSuccessCos.credentials.sessionToken);
+//        publicCosXml = new CosXmlServer(config, cosCredentialProvider);
+
+//        TestDownloadObject("default/c39352b7-0ecf-402b-8693-ca8dee01cc0e.dat", Application.persistentDataPath + "/");
+
+
     }
 
     private void InitMaterialCos()
@@ -77,6 +108,8 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
  imageSuccessCos.credentials.tmpSecretId, imageSuccessCos.credentials.tmpSecretKey, imageSuccessCos.expiredTime, imageSuccessCos.credentials.sessionToken);
 
         imageCosXml = new CosXmlServer(config, cosCredentialProvider);
+
+
     }
 
     private void InitSceneCos()
@@ -145,6 +178,55 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
     public static int showDownLoadCount;
     public static int showDownEndLoadCount;
     public static float showDownLoadPre;
+
+    public async void TestDownloadObject( string downloadPath,string localDir)
+    {
+        TransferConfig transferConfig = new TransferConfig();
+        TransferManager transferManager;  // 初始化 TransferManager
+        String bucket; //存储桶，格式：BucketName-APPID
+        transferManager = new TransferManager(publicCosXml, transferConfig);
+        bucket = publicSuccessCos.bucket;
+
+        string localFileName = Path.GetFileName(downloadPath);
+
+     //   localDir = downloadMaterial.localLoadPath.Substring(0, downloadMaterial.localLoadPath.Length - localFileName.Length);
+        // 下载对象
+        COSXMLDownloadTask downloadTask = new COSXMLDownloadTask(bucket, downloadPath,
+          localDir, localFileName);
+        // 手动设置高级下载接口的并发数 (默认为5), 从5.4.26版本开始支持！
+        //downloadTask.SetMaxTasks(10);
+        downloadTask.progressCallback = delegate (long completed, long total)
+        {
+            //  Debug.Log(String.Format("Hjj    download"+downloadMaterial.downLoadPath+"progress = {0:##.##}%", completed * 100.0 / total));
+           // showDownLoadPre = completed * 100.0f / total;
+        };
+        Debug.Log(downloadPath + "|||||||||  DGJ");
+      //  downloadTask.onState += OnState;
+      //  listDownLoadTask.Add(downloadTask);
+        try
+        {
+            
+            COSXML.Transfer.COSXMLDownloadTask.DownloadTaskResult result = await
+              transferManager.DownloadAsync(downloadTask);
+            Console.WriteLine(result.GetResultInfo());
+            string eTag = result.eTag;
+        }
+        catch (COSXML.CosException.CosClientException clientEx)
+        {
+            //请求失败
+            Debug.LogError(downloadPath + "   CosClientException: " + clientEx);
+            DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
+           
+        }
+        catch (COSXML.CosException.CosServerException serverEx)
+        {
+            //请求失败
+            Debug.LogError(downloadPath + "    CosServerException: " + serverEx.GetInfo());
+            DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
+          
+        }
+    }
+
     /// <summary>
     /// 高级接口下载对象
     /// </summary>
@@ -183,7 +265,8 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                 break;
         }
 
-      
+       /// if()
+
     
                                            // String cosPath = "exampleobject"; //对象在存储桶中的位置标识符，即称对象键
                                            // string localDir = System.IO.Path.GetTempPath();//本地文件夹
@@ -284,7 +367,6 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                Debug.LogError("CosClientException: " + clientEx);
                 DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
                 listDownLoadTask.RemoveAt(0);
-                showDownEndLoadCount++;
             }
             catch (COSXML.CosException.CosServerException serverEx)
             {
@@ -292,7 +374,6 @@ public class COSDownLoad:MonoSingleton<COSDownLoad>
                 Debug.LogError("CosServerException: " + serverEx.GetInfo());
                 DownloadResManager.Instance.DownLoadFaild(downloadTask.localFileName);
                 listDownLoadTask.RemoveAt(0);
-                showDownEndLoadCount++;
             }
         
             listDownLoadTask.Add(downloadTask);

Assets/COSScripts/DownloadResManager.cs

@@ -38,6 +38,8 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
         listNotMaterial = new List<DownLoadMaterial>();
         listFaildMaterial = new List<DownLoadMaterial>();
         qDownload = new Queue<DownLoadMaterial>();
+
+        PlayerPrefs.DeleteAll();
         //先判断是否存在，再创建
         if (!File.Exists(path + "CompletedMaterial.txt"))
         {
@@ -100,6 +102,8 @@ public class DownloadResManager : MonoSingleton<DownloadResManager>
             LocalLoadManager.Instance.LocalLoadMaterial(downloadMaterial);
             return;
         }
+
+      
            
 
         if (Screen(downloadMaterial) == false)

Assets/MRNavigatorPro.unity

@@ -1451,7 +1451,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &260758066
 MonoBehaviour:
@@ -2247,7 +2247,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 939847687}
+  m_Mesh: {fileID: 1656011052}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2572,7 +2572,7 @@ RectTransform:
   - {fileID: 1494370970}
   - {fileID: 1180406930700069013}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2798,7 +2798,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &588301978
 MonoBehaviour:
@@ -3296,7 +3296,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1001 &706104185
 PrefabInstance:
@@ -4282,170 +4282,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &939847687
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &980339763
 GameObject:
   m_ObjectHideFlags: 0
@@ -5349,7 +5185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4682760393691964, guid: 181e478384bef4862b94db5a060df1b6, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4682760393691964, guid: 181e478384bef4862b94db5a060df1b6, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5424,6 +5260,7 @@ MonoBehaviour:
   m_UseGeoPoseLocalizer: 0
   m_UseServerLocalizer: 0
   m_MapIds: []
+  m_UseYUV: 0
 --- !u!1 &1330922971
 GameObject:
   m_ObjectHideFlags: 0
@@ -5904,7 +5741,7 @@ Transform:
   - {fileID: 1942196190}
   - {fileID: 1813820188}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1367052369
 PrefabInstance:
@@ -6688,7 +6525,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0024981713
+      value: -0.0051413113
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6818,37 +6655,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0035065874
+      value: -0.0019156551
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -101.5
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -6858,62 +6695,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -7627,6 +7464,170 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8019606655629294614}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &1656011052
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1662148595
 GameObject:
   m_ObjectHideFlags: 0
@@ -7907,7 +7908,7 @@ RectTransform:
   m_Children:
   - {fileID: 1778699411}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -9470,7 +9471,7 @@ PrefabInstance:
     - target: {fileID: 5142388694048500748, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
@@ -9912,7 +9913,7 @@ PrefabInstance:
     - target: {fileID: 486518953149657927, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 486518953149657927, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -10007,7 +10008,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00019225816
+      value: -0.0012308005
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -13853,7 +13854,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.0025444399}
+  m_AnchoredPosition: {x: 0, y: -0.003890887}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118
@@ -14226,7 +14227,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3}
       propertyPath: m_AnchorMax.x

Assets/Resources/Template/Prefab/Video.prefab

@@ -1242,6 +1242,7 @@ MonoBehaviour:
   canTwoHandScale: 0
   minScaleRatio: 0.5
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!114 &175833524124856625
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1914,10 +1915,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8400236291338521230}
   - component: {fileID: 8400236291338521228}
-  - component: {fileID: 8400236291338521229}
-  - component: {fileID: 8400236291338521227}
-  - component: {fileID: 8400236291338521226}
   - component: {fileID: 1721331326262511666}
+  - component: {fileID: 1373276779804712702}
   m_Layer: 5
   m_Name: AVideo
   m_TagString: Untagged
@@ -1953,239 +1952,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8400236291338521233}
   m_CullTransparentMesh: 1
---- !u!114 &8400236291338521229
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8400236291338521233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f17cdc186456a4469a139a104d2ca72, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  _mediaPlayer: {fileID: 8400236291338521227}
-  _defaultTexture: {fileID: 0}
-  _uvRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  _setNativeSize: 0
-  _scaleMode: 0
-  _noDefaultDisplay: 1
-  _displayInEditor: 1
---- !u!114 &8400236291338521227
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8400236291338521233}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _mediaSource: 1
-  _mediaReference: {fileID: 0}
-  _mediaPath:
-    _pathType: 0
-    _path: 
-  _fallbackMediaHints:
-    transparency: 0
-    alphaPacking: 0
-    stereoPacking: 0
-  _autoOpen: 1
-  _autoPlayOnStart: 1
-  _loop: 0
-  _audioVolume: 1
-  _audioBalance: 0
-  _audioMuted: 0
-  _playbackRate: 1
-  _useResampler: 0
-  _resampleMode: 0
-  _resampleBufferSize: 5
-  _videoMapping: 0
-  _textureFilterMode: 1
-  _textureWrapMode: 1
-  _textureAnisoLevel: 0
-  _useVideoResolve: 0
-  _videoResolveOptions:
-    applyHSBC: 0
-    hue: 0
-    saturation: 0.5
-    brightness: 0.5
-    contrast: 0.5
-    gamma: 1
-    tint: {r: 1, g: 1, b: 1, a: 1}
-    generateMipmaps: 0
-  _sideloadSubtitles: 0
-  _subtitlePath:
-    _pathType: 2
-    _path: 
-  _audioHeadTransform: {fileID: 0}
-  _audioFocusEnabled: 0
-  _audioFocusTransform: {fileID: 0}
-  _audioFocusWidthDegrees: 90
-  _audioFocusOffLevelDB: 0
-  _httpHeaders:
-    httpHeaders: []
-  _keyAuth:
-    keyServerToken: 
-    overrideDecryptionKeyBase64: 
-    overrideDecryptionKey: 
-  _events:
-    m_PersistentCalls:
-      m_Calls: []
-  _eventMask: -1
-  _pauseMediaOnAppPause: 1
-  _playMediaOnAppUnpause: 1
-  _persistent: 0
-  _forceFileFormat: 0
-  _optionsWindows:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    videoApi: 0
-    useHardwareDecoding: 1
-    useTextureMips: 0
-    use10BitTextures: 0
-    hintAlphaChannel: 0
-    useLowLatency: 0
-    useCustomMovParser: 0
-    useHapNotchLC: 0
-    useStereoDetection: 1
-    useTextTrackSupport: 1
-    useFacebookAudio360Support: 1
-    useAudioDelay: 0
-    bufferedFrameSelection: 0
-    pauseOnPrerollComplete: 0
-    forceAudioOutputDeviceName: 
-    preferredFilters: []
-    audioOutput: 0
-    audio360ChannelMode: 0
-    startWithHighestBitrate: 0
-    useLowLiveLatency: 0
-    parallelFrameCount: 3
-    prerollFrameCount: 4
-    useUnityAudio: 0
-    enableAudio360: 0
-  _optionsMacOSX:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsIOS:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsTVOS:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    textureFormat: 0
-    _audioMode: 0
-    _flags: 0
-    maximumPlaybackRate: 2
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    _preferredForwardBufferDuration: 0
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-  _optionsAndroid:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    _preferredMaximumResolution: 0
-    _customPreferredMaximumResolution: {x: 0, y: 0}
-    _preferredPeakBitRate: 0
-    _preferredPeakBitRateUnits: 1
-    videoApi: 1
-    useFastOesPath: 0
-    showPosterFrame: 0
-    audioOutput: 0
-    audio360ChannelMode: 0
-    preferSoftwareDecoder: 0
-    blitTextureFiltering: 0
-    fileOffset: 0
-    startWithHighestBitrate: 0
-    minBufferMs: 50000
-    maxBufferMs: 50000
-    bufferForPlaybackMs: 2500
-    bufferForPlaybackAfterRebufferMs: 5000
-    enableAudio360: 0
-  _optionsWindowsUWP:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    useHardwareDecoding: 1
-    useTextureMips: 0
-    use10BitTextures: 0
-    hintOutput10Bit: 0
-    useLowLatency: 0
-    videoApi: 1
-    audioOutput: 0
-    audio360ChannelMode: 0
-    startWithHighestBitrate: 0
-    useLowLiveLatency: 0
-  _optionsWebGL:
-    httpHeaders:
-      httpHeaders: []
-    keyAuth:
-      keyServerToken: 
-      overrideDecryptionKeyBase64: 
-      overrideDecryptionKey: 
-    externalLibrary: 0
-    useTextureMips: 0
-  m_VideoPath: 
-  m_VideoLocation: 2
---- !u!114 &8400236291338521226
+--- !u!114 &1721331326262511666
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2194,10 +1961,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 8400236291338521233}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c7d817848393db44c8e1668eb60b40d8, type: 3}
+  m_Script: {fileID: 11500000, guid: a72774fbebebcfa46b3f27e3d9f92e1d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &1721331326262511666
+  Icon: {fileID: 7783334408191734234}
+  m_IsPlaying: 0
+  m_Video: {fileID: 0}
+  spid: 
+  videoid: 
+--- !u!114 &1373276779804712702
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2206,14 +1978,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 8400236291338521233}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a72774fbebebcfa46b3f27e3d9f92e1d, type: 3}
+  m_Script: {fileID: 11500000, guid: eb94bf957aaed554492064dde1c1775e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Icon: {fileID: 7783334408191734234}
-  m_IsPlaying: 0
-  m_Video: {fileID: 8400236291338521226}
-  spid: 
-  videoid: 
 --- !u!1 &8554676593696482103
 GameObject:
   m_ObjectHideFlags: 0
@@ -2392,6 +2159,7 @@ GameObject:
   - component: {fileID: 305376017356116702}
   - component: {fileID: 939118683876271891}
   - component: {fileID: 1116663417015624178}
+  - component: {fileID: 5225729311335432293}
   m_Layer: 5
   m_Name: Video
   m_TagString: Untagged
@@ -2440,7 +2208,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.12156863, g: 0.12156863, b: 0.12156863, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2510,3 +2278,16 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &5225729311335432293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8654540562372780374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d1976a6c73df16c4997032b3e989d934, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ap: {fileID: 1373276779804712702}

Assets/Resources/VuforiaConfiguration.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: 
+    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
     ufoLicenseKey: QWRvTlZRYi8vLy8vQUFBQUtFUlVmMFlNSUUyWG5CbzJUQ2JlazFZSXptZnlBb29UdzVkdGg2bmdRWjQyWjM4eEphZjZPa2VFcDlSb2xoekRPeXZCcVlKbXQvZjduby9xbjVjNVMxVnlxZ2VhNVBiVzlBTVpJRVU5TmJCaVNxcGc4QzVXdWpySEJWOVcvT1JJZGdxbmowUVp2OHR5UytzQk9CWWlMbVJaZXErTE5MWXJSUEhlNjMzWWh0NnR3Q2RxTFRVVzFtSjNacUIwYW5pYnk3S2FhK241UDVtTXZoRzUyWkZKM2VKZk9JTXZEV05WU05wOFVOY0tyalZwRDRkeEw2Y3d5cFpDWjJub09IOUxUNVNEV2xqMDRYUnZRYXZ2UTJjVlFqUkdvc2E1NjY3TFNjQ0JqTUJFaXlFRTFtbDNhbERnQUtldllOalpoVkpadVkydnl3NzU5eVhYUXl3STZIZXFsYUh2aWxwV05EaTcrZCtFZE04bTlVanI=
     delayedInitialization: 0
     cameraFocusModeSetting: 2
@@ -42,7 +42,7 @@ MonoBehaviour:
     autoStartTracker: 1
     arcoreRequirement: 1
     autoImportArcore: 1
-    thirdPartyARCoreClientDetected: 0
+    thirdPartyARCoreClientDetected: 1
   playmode:
     mRecordingPath: 
     playModeType: 0

Assets/Script/UserChooseScene.cs

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

Assets/Scripts/LayoutGroup/DRFanLayout.cs

@@ -1,4 +1,4 @@
-using SC.XR.Unity;
+using SC.XR.Unity;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -250,11 +250,18 @@ public class DRFanLayout : MonoBehaviour
         data[0].transform.localPosition += new Vector3(0, 0, -0.2f);
         data[0].transform.localRotation = Quaternion.Euler(0, -30, 0);
 
-        data[2].transform.localPosition += new Vector3(0, 0, -0.2f);
-        data[2].transform.localRotation = Quaternion.Euler(0, 30, 0);
-
-        data[3].transform.localPosition += new Vector3(0, 0, -0.2f);
-        data[3].transform.localRotation = Quaternion.Euler(0, -30, 0);
+        if(data.Count>2)
+        {
+            data[2].transform.localPosition += new Vector3(0, 0, -0.2f);
+            data[2].transform.localRotation = Quaternion.Euler(0, 30, 0);
+        }
+       
+        if(data.Count>3)
+        {
+            data[3].transform.localPosition += new Vector3(0, 0, -0.2f);
+            data[3].transform.localRotation = Quaternion.Euler(0, -30, 0);
+        }
+     
 
         if (data.Count < 6)
             Debug.LogWarning("双排扇形不足六个元素图片或视频");

Assets/Scripts/LayoutTemplate/TemplateVideo.cs

@@ -39,14 +39,14 @@ public class TemplateVideo : BaseTemPlate
 
         setScale = true;
     }
-    private MediaPlayer MediaPlayer;
+   // private MediaPlayer MediaPlayer;
     private bool setScale;
     protected override void OnAwake()
     {
         base.OnAwake();
         // m_VideoCtr = transform.Find("Screen/Video").GetComponent<Navigator.VideoControl>();
         m_Video = transform.Find("Screen/AVideo").GetComponent<AVProVideoPlayer>();
-        MediaPlayer = transform.Find("Screen/AVideo").GetComponent<MediaPlayer>();
+        //MediaPlayer = transform.Find("Screen/AVideo").GetComponent<MediaPlayer>();
         HideCollider();
 
       
@@ -66,12 +66,12 @@ public class TemplateVideo : BaseTemPlate
     }
     private void Update()
     {
-        if((MediaPlayer.Info.GetVideoHeight()!=0 || MediaPlayer.Info.GetVideoWidth()!=0) && setScale )
-        {
-            float temp = (float)MediaPlayer.Info.GetVideoHeight() / (float)MediaPlayer.Info.GetVideoWidth();
-            MediaPlayer.transform.GetComponent<RectTransform>().sizeDelta = new Vector2(56,56*temp);
-            setScale = false;
-        }
+        //if((MediaPlayer.Info.GetVideoHeight()!=0 || MediaPlayer.Info.GetVideoWidth()!=0) && setScale )
+        //{
+        //    float temp = (float)MediaPlayer.Info.GetVideoHeight() / (float)MediaPlayer.Info.GetVideoWidth();
+        //    MediaPlayer.transform.GetComponent<RectTransform>().sizeDelta = new Vector2(56,56*temp);
+        //    setScale = false;
+        //}
     }
     public override void SetData(MaterialObjValue value, int updateTime)
     {

Assets/Scripts/UI/GameManager.cs

@@ -256,14 +256,15 @@ public class GameManager : MonoSingleton<GameManager>
         var t = TimerMgr.Instance.CreateTimer(()=> {
             if(isShowDownTip)
             {
-                    if (downLoadCount == 0)
-                    {
-                        downLoadCount = COSDownLoad.showDownEndLoadCount;
-                    }
-                Debug.Log("DGJ  === >" + COSDownLoad.showDownLoadCount + "  " + COSDownLoad.showDownEndLoadCount + "   " + downLoadCount);
-                if (COSDownLoad.showDownLoadCount > COSDownLoad.showDownEndLoadCount)
+
+                if (downLoadCount == 0)
                 {
+                    downLoadCount = COSDownLoad.showDownEndLoadCount;
+                }
 
+                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);
                     ((LoadingPanel)UIManager.Instance.GetUI(UINameConfig.LoadingPanel)).TextStr = str;
@@ -276,7 +277,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);
                     }
                 }

Assets/Scripts/UI/LoginPanel.cs

@@ -264,7 +264,7 @@ public class LoginPanel : BaseUI
         m_AccountStr = "jiajun.hu@ghz-tech.com";
         m_AccountStr = "1768147286@qq.com";
         m_AccountStr = "bactest1@1.com";
-        m_AccountStr = "advtest1@1.com";
+     //   m_AccountStr = "devtest1@1.com";
 #endif
 
         if (string.IsNullOrWhiteSpace(m_AccountStr))
@@ -410,8 +410,8 @@ public class LoginPanel : BaseUI
 
     private IEnumerator LoginCallBack2YS( float times)
     {
-        yield return new WaitForSeconds(times);
-
+       // yield return new WaitForSeconds(times);
+        yield return new WaitForFixedUpdate();
         UserManager.Instance.loginBack(true);
         GameManager.Instance.arcamre.SetActive(true);
         GameManager.Instance.immser.SetActive(false);
@@ -419,7 +419,8 @@ public class LoginPanel : BaseUI
 
     private IEnumerator LoginCallBackYS(float times)
     {
-        yield return new WaitForSeconds(times);
+       // yield return new WaitForSeconds(times);
+        yield return new WaitForFixedUpdate();
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.getMaterialValue);
         StartCoroutine(GetAllMaterials(UserInfo.Instance.Token));
         GameManager.Instance.arcamre.SetActive(false);
@@ -624,7 +625,7 @@ public class LoginPanel : BaseUI
                 for (int m = 0; m < mat.materialList.Count; m++)
                 {
                     var matObj = mat.materialList[m];
-                    if (int.Parse(matObj.type) != 4)
+                    if (int.Parse(matObj.type) != 4 && int.Parse(matObj.type) != 0)
                     {
                         DownLoadMaterial data1 = new DownLoadMaterial();
                         string filename = Path.GetFileName(matObj.DownloadPath);

Assets/Scripts/UI/SceneChoose.cs

@@ -325,6 +325,8 @@ public class SceneChoose : BaseUI
                 DownloadResManager.Instance.DownLoad(dat);
 
             }
+
+           
         }
 
         yield return new WaitForSeconds(1f);

Assets/UnityTool/NPinyin.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: f0c376f63f86ea141b911f04ec4b2007
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -927,6 +927,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      CodeGeneration: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -939,7 +940,6 @@ PlayerSettings:
       InternetClientServer: False
       VideosLibrary: False
       Objects3D: False
-      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -961,7 +961,7 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       Proximity: False
-      CodeGeneration: False
+      InternetClient: True
       BackgroundMediaPlayback: False
       EnterpriseAuthentication: False
   metroTargetDeviceFamilies: