修复bug

Assets/FrameWork/ProjectManager/Text.prefab

@@ -22,7 +22,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4560886240936283504
 RectTransform:
   m_ObjectHideFlags: 0
@@ -222,10 +222,10 @@ RectTransform:
   m_Father: {fileID: 4560886240936283504}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10, y: -10}
-  m_SizeDelta: {x: 555, y: 63.51}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: 0}
+  m_SizeDelta: {x: 555, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5702499218529939106
 CanvasRenderer:
@@ -255,7 +255,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8FD9\u91CC\u662F\u4EFB\u52A1\u8BE6\u60C5\u8FD9\u91CC\u662F\u4EFB\u52A1\u8BE6\u60C5\u8FD9\u91CC\u662F\u4EFB\u52A1\u8BE6\u60C5\u8FD9\u91CC\u662F\u4EFB\u52A1\u8BE6\u60C5"
+  m_text: 123
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
   m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}

Assets/FrameWork/ProjectManager/XunJian/进入任务/进入任务.prefab

@@ -1893,8 +1893,8 @@ RectTransform:
   m_Father: {fileID: 5099701053908007057}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 385.5, y: 0}
   m_SizeDelta: {x: 771, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -3293,9 +3293,9 @@ RectTransform:
   m_Father: {fileID: 1941495110105555512}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 959.5, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 574, y: -100}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &3001207142907341833
@@ -5856,9 +5856,9 @@ RectTransform:
   m_Father: {fileID: 357678414522435767}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -78.15}
   m_SizeDelta: {x: 200, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &7528899676586470911
@@ -7466,19 +7466,19 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 135
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2663175551128001469, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_Name
@@ -7494,19 +7494,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 405
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -50
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7708746070731989160, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: playImg
@@ -7763,6 +7763,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1363556228952835098}
     m_Modifications:
+    - target: {fileID: 464504873149100750, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
+      propertyPath: info
+      value: 
+      objectReference: {fileID: 1207687223769712350}
     - target: {fileID: 2240469572346570524, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_Name
       value: "\u4EFB\u52A1\u8BE6\u60C5"
@@ -7877,6 +7881,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
+--- !u!114 &1207687223769712350 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6415135878954423855, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
+  m_PrefabInstance: {fileID: 5315854180699820273}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &6256073840031086573 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2240469572346570524, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}

Assets/FrameWork/YaHei.ttf.meta

@@ -1,23 +0,0 @@
-fileFormatVersion: 2
-guid: 89b51f2085dc2874f82f53b325a7ec4a
-TrueTypeFontImporter:
-  externalObjects: {}
-  serializedVersion: 4
-  fontSize: 64
-  forceTextureCase: -2
-  characterSpacing: 0
-  characterPadding: 1
-  includeFontData: 1
-  fontName: Microsoft YaHei UI
-  fontNames:
-  - Microsoft YaHei
-  fallbackFontReferences:
-  - {fileID: 12800000, guid: daef366694e895d4db0d2f1d5b423e27, type: 3}
-  customCharacters: 
-  fontRenderingMode: 0
-  ascentCalculationMode: 1
-  useLegacyBoundsCalculation: 0
-  shouldRoundAdvanceValue: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/HotUpdate/DownLoadXRManager.cs

@@ -4,6 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
+using static XunJianDataManager;
 
 public class DownLoadXRManager
 {
@@ -18,8 +19,9 @@ public class DownLoadXRManager
             //string bucket = data["data"]["bucket"].ToString();
             //string objectName = data["data"]["bucket"].ToString();
             string Url = data["url"].ToString();
+            string uuid = data["uuid"].ToString();
             Debug.Log("DGJ ===> DownLoadForBytes " + msg);
-            RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, Url, (RoomFileMinio.RoomFileData roomFile) =>
+            RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, Url, uuid,(RoomFileMinio.RoomFileData roomFile) =>
             {
                 bytes?.Invoke(roomFile.bytes);             
             });
@@ -177,11 +179,12 @@ public class DownLoadXRManager
         return data.ToJson();
     }
 
-    public static string getTestData(string url,string drive)
+    public static string getTestData(MinioResources url,string drive)
     {
         JsonData data = new JsonData();
         data["drive"] = drive;
-        data["url"] = url;
+        data["url"] = url.path;
+        data["uuid"] = url.uuid;
         return data.ToJson();
     }
     public class DownLoadUrlConfig

Assets/HotUpdate/Scripts/Scripts/GetAllBounds.cs

@@ -15,31 +15,30 @@ public class GetAllBounds
         if (renderers.Length < 1)
             return bounds;
         bounds = new Bounds(renderers[0].transform.position, Vector3.zero);
-        float maxX = renderers[0].transform.position.x + renderers[0].bounds.size.x / 2.0f;
-        float minX = renderers[0].transform.position.x - renderers[0].bounds.size.x / 2.0f;
-        float maxY = renderers[0].transform.position.y + renderers[0].bounds.size.y / 2.0f;
-        float minY = renderers[0].transform.position.y - renderers[0].bounds.size.y / 2.0f;
-        float maxZ = renderers[0].transform.position.z + renderers[0].bounds.size.z / 2.0f;
-        float minZ = renderers[0].transform.position.z - renderers[0].bounds.size.z / 2.0f;
-
+        float maxX = renderers[0].bounds.center.x;
+        float minX = renderers[0].bounds.center.x;
+        float maxY = renderers[0].bounds.center.y;
+        float minY = renderers[0].bounds.center.y;
+        float maxZ = renderers[0].bounds.center.z;
+        float minZ = renderers[0].bounds.center.z;
         foreach (Renderer renderer in renderers)
         {
             bounds.Encapsulate(renderer.bounds);
 
-            if (maxX < renderer.transform.position.x + renderer.bounds.size.x / 2.0f)
-                maxX = renderer.transform.position.x + renderer.bounds.size.x / 2.0f;
-            if (minX > renderer.transform.position.x - renderer.bounds.size.x / 2.0f)
-                minX = renderer.transform.position.x - renderer.bounds.size.x / 2.0f;
+            if (maxX < renderer.bounds.center.x)
+                maxX = renderer.bounds.center.x;
+            if (minX > renderer.bounds.center.x)
+                minX = renderer.bounds.center.x;
 
-            if (maxY < renderer.transform.position.y + renderer.bounds.size.y / 2.0f)
-                maxY = renderer.transform.position.y + renderer.bounds.size.y / 2.0f;
-            if (minY > renderer.transform.position.y - renderer.bounds.size.y / 2.0f)
-                minY = renderer.transform.position.y - renderer.bounds.size.y / 2.0f;
+            if (maxY < renderer.bounds.center.y)
+                maxY = renderer.bounds.center.y;
+            if (minY > renderer.bounds.center.y)
+                minY = renderer.bounds.center.y;
 
-            if (maxZ < renderer.transform.position.z + renderer.bounds.size.z / 2.0f)
-                maxZ = renderer.transform.position.z + renderer.bounds.size.z / 2.0f;
-            if (minZ > renderer.transform.position.z - renderer.bounds.size.z / 2.0f)
-                minZ = renderer.transform.position.z - renderer.bounds.size.z / 2.0f;
+            if (maxZ < renderer.bounds.center.z)
+                maxZ = renderer.bounds.center.z;
+            if (minZ > renderer.bounds.center.z)
+                minZ = renderer.bounds.center.z;
         }
         bounds.center = new Vector3(maxX - (maxX - minX) / 2.0f, maxY - (maxY - minY) / 2.0f, maxZ - (maxZ - minZ) / 2.0f);
         return bounds;
@@ -226,6 +225,9 @@ public class GetAllBounds
             meshBounds = GetMeshBounds(skinnedRenderer.gameObject, mesh);
             bounds.Encapsulate(meshBounds);
 
+            Debug.Log(skinnedRenderer.transform.position);
+            Debug.Log(meshBounds.size);
+
             if (maxX < skinnedRenderer.transform.position.x + meshBounds.size.x / 2.0f)
                 maxX = skinnedRenderer.transform.position.x + meshBounds.size.x / 2.0f;
             if (minX > skinnedRenderer.transform.position.x - meshBounds.size.x / 2.0f)

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -181,12 +181,14 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 
     public override void UpdateData()
     {
+        Debug.Log("UpdateData===>" );
         base.UpdateData();
         ChangeCameraSaoMiao.Instance.close();
         VideoBT.SetActive(false);
         ModelBT.SetActive(false);
         ImageBT.SetActive(false);
         TextBT.SetActive(false);
+        Debug.Log("UpdateData==1=>");
         // rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
         rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
 
@@ -195,71 +197,28 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         indexText.text = (rwitem.sort).ToString();
         // info.text = rwitem.info;
         info.text = rwitem.title;
-        #region MyRegion
-        //if (rwitem.typeList.Count > 0)
-        //{
-        //    int img = 0;
-        //    for (int i = 0; i < rwitem.typeList.Count; i++)
-        //    {
-        //        switch (rwitem.typeList[i].type)
-        //        {
-        //            case RenWuType.Image:
-        //                if(img==0)
-        //                {
-        //                    ImageBT.SetActive(true);
-        //                    Image.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
-        //                }
-        //                else
-        //                {
-
-        //                    Image2BT.SetActive(false);
-        //                    Image2.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
-        //                }
-        //                img++;
-        //                break;
-        //            case RenWuType.Model:
-        //                ModelBT.SetActive(true);
-        //                Model.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
-        //                break;
-        //            case RenWuType.Text:
-        //                TextBT.SetActive(true);
-        //                Text.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
-        //                break;
-        //            case RenWuType.Video:
-        //                VideoBT.SetActive(true);
-        //                Video.GetComponent<RenWuTypeWindow>().updateData(rwitem.typeList[i]);
-        //                break;
-        //        }
-        //    }
-
-        //    if(rwitem.typeList.Count < 2)
-        //    {
-        //        AllBT.SetActive(false);
-        //    }else
-        //    {
-
-        //        AllBT.SetActive(true);
-        //    }
-
-        //    WenJianLan.SetActive(true);
-        //}
-        //else
-        //{
-        //    WenJianLan.SetActive(false);
-        //} 
-        #endregion
+        Debug.Log("UpdateData==2=>");
+        bool isshow = false;
+        if (rwitem.resources==null)
+            rwitem.resources = new List<MinioResources>();
         int ct = rwitem.resources.Count;
-        if(rwitem.description!="")
+        Debug.Log("UpdateData==3=>");
+        if (rwitem.description!="")
         {
             MinioResources rym = new MinioResources();
             rym.info = rwitem.description;
+            Debug.Log("UpdateData==4=>");
             rym.id = 11111;//rwitem.description;
             rym.loadingMethod = 11111;
             rwitem.resources.Add(rym);
+            Debug.Log("UpdateData==5=>");
             Text.GetComponent<RenWuTypeWindow>().updateData(rym);
+            Debug.Log("UpdateData==6=>");
             TextBT.SetActive(true);
+            isshow = true;
             ct++;
         }
+        Debug.Log("allll===>"+ct);
         img = 0;
         if (rwitem.resources.Count > 0)
         {
@@ -268,6 +227,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                 switch (rwitem.resources[i].loadingMethod)
                 {
                     case 1:
+                        isshow = true;
                         ImageBT.SetActive(true);
                         if (img == 0)
                         {
@@ -286,10 +246,12 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                         img++;
                         break;
                     case 2:
+                        isshow = true;
                         ModelBT.SetActive(true);
                         Model.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
                         break;
                     case 3:
+                        isshow = true;
                         VideoBT.SetActive(true);
                         Video.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
                         break;
@@ -311,7 +273,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                 AllBT.SetActive(true);
             }
 
-            WenJianLan.SetActive(true);
+            WenJianLan.SetActive(isshow);
         }
         else
         {
@@ -507,7 +469,15 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     }
     public void closeAll()
     {
-        List<GameObject> list = getResGo();
+        List<GameObject> list =new List<GameObject>();
+
+            list.Add(Image);
+            list.Add(Image2);
+            list.Add(Image3);
+            list.Add(Model);
+            list.Add(Text);
+            list.Add(Video);
+
         for (int i = 0; i < list.Count; i++)
         {
             list[i].SetActive(false);
@@ -669,27 +639,31 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //jsonData["dataFileIds"] = jobject;
 
         Debug.Log(" HttpEdustryAction.tasksReport  " + report);
-        if ((XunJianDataManager.Instance.chooseXunJian.nowIndex - 1)>=0)
-        {
-            rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex-1];
-            TasksReport tasks = new TasksReport();
-            tasks.projectInspectionTaskId = rwitem.id;
-            tasks.status = rwitem.status;
-            long nowtime = GetHttpTimer.Instance.Getlongtime();
-            tasks.consumingTime = (int)(nowtime - rwitem.startTime);
-            tasks.dataFileIds = rwitem.listUpload;
-            Debug.Log(" HttpEdustryAction.tasksReport  " + JsonConvert.SerializeObject(tasks));
-
-            WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.tasksReport, JsonConvert.SerializeObject(tasks), msg =>
+        if(UserManager.Instance.NowChoose.number!= "00000020")
+        {
+
+            if ((XunJianDataManager.Instance.chooseXunJian.nowIndex - 1) >= 0)
             {
-                Debug.Log(HttpEdustryAction.tasksReport + " HttpEdustryAction.tasksReport  " + msg);
-                JObject data = new JObject();
-                
-              
+                rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex - 1];
+                TasksReport tasks = new TasksReport();
+                tasks.projectInspectionTaskId = rwitem.id;
+                tasks.status = rwitem.status;
+                long nowtime = GetHttpTimer.Instance.Getlongtime();
+                tasks.consumingTime = (int)(nowtime - rwitem.startTime);
+                tasks.dataFileIds = rwitem.listUpload;
+                Debug.Log(" HttpEdustryAction.tasksReport  " + JsonConvert.SerializeObject(tasks));
+
+                WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.tasksReport, JsonConvert.SerializeObject(tasks), msg =>
+                {
+                    Debug.Log(HttpEdustryAction.tasksReport + " HttpEdustryAction.tasksReport  " + msg);
+                    JObject data = new JObject();
+
+
+
+                }));
+            }
 
-            }));
         }
-       
 
 
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -804,7 +804,12 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 RenWuListWindow.Instance.UpdateData();
             }
             if (CaoZuoLanManager.Instance)
+            {
+
+                CaoZuoLanManager.Instance.dazha.SetActive(chooseXunJian.tasksList[chooseXunJian.nowIndex].confirmNormal);
+                CaoZuoLanManager.Instance.duigou.SetActive(chooseXunJian.tasksList[chooseXunJian.nowIndex].confirmNormal);
                 CaoZuoLanManager.Instance.nextInteractable(!chooseXunJian.tasksList[chooseXunJian.nowIndex].confirmNormal);
+            }
         }
         else
         {

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -114,7 +114,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
                 Debug.Log("打开startDevice43" + ri.diagram[i].path);
                 // 下载识别图 处理
 
-                DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(ri.diagram[i].path, "minio"), (string bytes) =>
+                DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(ri.diagram[i], "minio"), (string bytes) =>
                 {
                     if (bytes == null)
                     {

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuListItemWindow.cs

@@ -127,6 +127,6 @@ public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
 
     public void chooseItem()
     {
-       // XunJianDataManager.Instance.chooseItem(data.index);
+        XunJianDataManager.Instance.chooseItem(data2.sort-1);
     }
 }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuTypeWindow.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using OpenCVForUnity.CoreModule;
 using TMPro;
 using TriLibCore;
 using UnityEngine;
@@ -10,128 +11,119 @@ using static XunJianDataManager;
 
 public class RenWuTypeWindow : MonoBehaviour
 {
-    public RenWuTypeModel data;
 
     public MinioResources data2;
 
     public TextMeshProUGUI info;
     Texture2D tex;
 
-    public void updateData(RenWuTypeModel data)
-    {
-        if(tex!=null)
-        {
-            Destroy(tex);
-        }
-        this.data = data;
-        switch(data.type)
-        {
-            case RenWuType.Video:
-                DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(data.url), (string bytes) => {
-                    this.GetComponent<ShowVideoManager>().url = bytes;
-                }, (float f) => {
-                   // info.gameObject.SetActive(true);
-                    //info.text = "视频加载中" + f.ToString("F2")+"%";
-                });
-                break;
-            case RenWuType.Text:
-                this.gameObject.GetComponentInChildren<TextMeshProUGUI>().text = data.info;
-                break;
-            case RenWuType.Image:
-                DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData(data.url), (Texture2D bytes) => {
-
-                    tex = bytes;
-                    this.GetComponent<RawImage>().texture = tex;
-                }, (float f) => {
-
-
-                  //  info.gameObject.SetActive(true);
-                  //  info.text = "图片加载中" + f.ToString("F2") + "%";
-                });
-                break;
-            case RenWuType.Model:
-                DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(data.url),(string bytes)=> {
-                    info.gameObject.SetActive(false);
-                    this.GetComponent<ShowModelManager>().Onupdate(bytes);
-                },(float f)=> {
-
-
-                    info.gameObject.SetActive(true);
-                    info.text = "模型下载中" + f.ToString("F2") + "%";
-                });
-                break;
-        }
-    }
 
     private void OnEnable()
     {
-
         this.transform.GetComponent<RectTransform>().anchoredPosition3D = Vector3.zero;
         this.transform.GetComponent<RectTransform>().localEulerAngles = Vector3.zero;
         this.transform.GetComponent<RectTransform>().localScale = Vector3.one;
-    }
 
-    public void updateData(MinioResources data)
+        if(data2.loadingMethod==1)
+        {
+
+            changebizhi(this.GetComponent<RawImage>().texture);
+        }
+
+    }
+    Mat _mat;
+    public void updateData(MinioResources datafile)
     {
+        Debug.Log("updateData=====>4444");
         if (tex != null)
         {
             Destroy(tex);
         }
-        this.data2 = data;
+        this.data2 = datafile;
 
         // Minio  下载对应资源 处理
-        switch (data.loadingMethod)
+        switch (data2.loadingMethod)
         {
             case 11111:
-                this.gameObject.GetComponentInChildren<TextMeshProUGUI>().text = data.info;
+                Debug.Log("updateData=====>5555");
+                info.text = data2.info;
+                Debug.Log("updateData=====>66666");
                 break;
             case 3:
-                //DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(data.url), (string bytes) => {
-                //    this.GetComponent<ShowVideoManager>().url = bytes;
-                //}, (float f) => {
-                //    // info.gameObject.SetActive(true);
-                //    //info.text = "视频加载中" + f.ToString("F2")+"%";
-                //});
+                this.GetComponent<ShowVideoManager>().OnDisable();
                 info.gameObject.SetActive(true);
                 info.text = "视频加载中";
-                this.GetComponent<RawImage>().enabled = false;
-                RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data.path, rfd =>
+                if (File.Exists(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path)))
                 {
                     info.gameObject.SetActive(false);
-                    info.text = "视频加载中";
+                    info.text = "";
                     this.GetComponent<RawImage>().enabled = true;
-                    Debug.Log(rfd.url);
-                      Debug.Log(rfd.bytes.Length);
-                     // gameObject.SetActive(true);
-                     WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data.uuid + Path.GetExtension(data.path), rfd.bytes));
+                    WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path), null));
 
-                  });
+                }
+                else
+                {
+
+                    this.GetComponent<RawImage>().enabled = false;
+                    RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data2.path, data2.uuid, rfd =>
+                    {
+                        info.gameObject.SetActive(false);
+                        info.text = "视频加载中";
+                        this.GetComponent<RawImage>().enabled = true;
+                        if (this.data2.path == rfd.objectName)
+                        {
+                            // gameObject.SetActive(true);
+                            WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path), rfd.bytes));
+
+                        }
+
+                    });
+                }
                 break;
             case -1:
                // this.gameObject.GetComponentInChildren<TextMeshProUGUI>().text = data.info;
                 break;
             case 1:
-                //DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData(data.url), (Texture2D bytes) => {
+                if (File.Exists(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path)))
+                {
+                    Loom.RunAsync(() =>
+                    {
+                        _mat = GameUtility.zoomByteByOpenCV(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path) ,1, false, true);
+                        Loom.QueueOnMainThread(() => {
+                            if (tex != null)
+                            {
+                                Destroy(tex);
+                            }
+                            tex = GameUtility.TextureByMat(_mat);
+                            this.GetComponent<RawImage>().texture = tex;
+                            changebizhi(tex);
+                        });
+                    });
+
+                }
+                else
+                {
 
-                //    tex = bytes;
-                //    this.GetComponent<RawImage>().texture = tex;
-                //}, (float f) => {
+                    RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data2.path, data2.uuid, rfd =>
+                    {
+                        Debug.Log("RoomFileMinio.Instance.bucket=End===>");
+                        Debug.Log(rfd.url);
+                        Debug.Log(rfd.bytes.Length);
+                        Texture2D tex = GetSprite(rfd.bytes).texture;
+                        this.GetComponent<RawImage>().texture = tex;
+                        changebizhi(tex);
 
 
-                //    //  info.gameObject.SetActive(true);
-                //    //  info.text = "图片加载中" + f.ToString("F2") + "%";
-                //});
+                        Stream sw = File.Create(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path));
+                        // FileStream sw = new FileStream(path);
 
-                Debug.Log("RoomFileMinio.Instance.bucket====>" + RoomFileMinio.Instance.bucket);
-                Debug.Log("RoomFileMinio.Instance.bucket=data.path===>" + data.path);
-                RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data.path, rfd =>
-                {
-                    Debug.Log("RoomFileMinio.Instance.bucket=End===>" );
-                    Debug.Log(rfd.url);
-                      Debug.Log(rfd.bytes.Length);
+                        sw.Write(rfd.bytes, 0, rfd.bytes.Length);
 
-                      this.GetComponent<RawImage>().texture = GetSprite(rfd.bytes).texture;
-                  });
+                        sw.Close();
+                        sw.Dispose();
+
+                    });
+                }
                 break;
             case 2:
                 //DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(data.url), (string bytes) => {
@@ -143,71 +135,79 @@ public class RenWuTypeWindow : MonoBehaviour
                 //    info.gameObject.SetActive(true);
                 //    info.text = "模型下载中" + f.ToString("F2") + "%";
                 //});
-                RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data.path, rfd =>
+
+                if (info )
+                {
+                    info.text = "准备加载";
+                }
+                if (this.GetComponent<ShowModelManager>().root != null)
+                {
+                    Destroy(this.GetComponent<ShowModelManager>().root);
+                    this.GetComponent<ShowModelManager>().root = null;
+                }
+                if(File.Exists(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path)))
                 {
-                    Debug.Log(rfd.url);
-                    Debug.Log(rfd.bytes.Length);
-                   // gameObject.SetActive(true);
-                    WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data.uuid +Path.GetExtension( data.path), rfd.bytes));
-                });
+                    WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path), null));
+
+                }
+                else
+                {
+                    RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data2.path, data2.uuid, rfd =>
+                    {
+                        // gameObject.SetActive(true);
+                        if (this.data2.path == rfd.objectName)
+                        {
+                            WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data2.uuid + Path.GetExtension(data2.path), rfd.bytes));
+                        }
+                    });
+
+                }
 
                 break;
         }
+        Debug.Log("updateData=====>88888");
     }
 
-    private IEnumerator SaveMp4(string path, byte[] bytes)
+    public void changebizhi(Texture tex)
     {
-        Debug.Log(" Path  ==> " + path);
-        FileInfo file = new FileInfo(path);
-        if (file.Exists)
+
+        float bz = 1;
+        float bzbz = 640f / 480f;
+
+        if (tex.width > tex.height) //700 500
         {
-            // file.Delete();
-            yield return new WaitForSeconds(0.02f);
-            this.GetComponent<ShowVideoManager>().url = path;
-            if(JinRuRenwu.Instance.Video.activeSelf)
-                this.GetComponent<ShowVideoManager>().playeVideo();
+            bz = tex.height/480f  ;
+
+            Debug.Log(" bizhi====>"+ bz);
+            this.transform.localScale = new Vector3(1,  bz/ (float)(tex.width / 640f), 1);
+
         }
         else
         {
-            Stream sw = File.Create(path);
-            // FileStream sw = new FileStream(path);
-
-            sw.Write(bytes, 0, bytes.Length);
+            bz = tex.width/640f  ;
+            Debug.Log(" bizhi====>" + bz );
+            this.transform.localScale = new Vector3(bz/ (float)(tex.height / 480f), 1, 1);
 
-            sw.Close();
-            sw.Dispose();
-            yield return new WaitForSeconds(0.02f);
-            this.GetComponent<ShowVideoManager>().url = path;
-            if (JinRuRenwu.Instance.Video.activeSelf)
-                this.GetComponent<ShowVideoManager>().playeVideo();
         }
-
     }
 
-    private IEnumerator SaveModel(string path, byte[] bytes)
+    private IEnumerator SaveMp4(string path, byte[] bytes)
     {
-        Debug.Log(" Path  ==> " + path);
-        FileInfo file = new FileInfo(path);
-        if (file.Exists)
-        {
-            // file.Delete();
-            yield return new WaitForSeconds(0.02f);
-            this.GetComponent<ShowModelManager>().Onupdate(path);
+        this.GetComponent<ShowVideoManager>().url = path;
+        if (JinRuRenwu.Instance.Video.activeSelf)
+            this.GetComponent<ShowVideoManager>().playeVideo();
+        // file.Delete();
+        yield return new WaitForSeconds(0.02f);
 
-        }
-        else
-        {
-            Stream sw = File.Create(path);
-            // FileStream sw = new FileStream(path);
+    }
 
-            sw.Write(bytes, 0, bytes.Length);
 
-            sw.Close();
-            sw.Dispose();
-            yield return new WaitForSeconds(0.02f);
+    private IEnumerator SaveModel(string path, byte[] bytes)
+    {
+            info.text = "";
             this.GetComponent<ShowModelManager>().Onupdate(path);
-        }
-
+        // file.Delete();
+        yield return new WaitForSeconds(0.02f);
     }
 
     private Sprite GetSprite(Byte[] bytes)
@@ -216,7 +216,7 @@ public class RenWuTypeWindow : MonoBehaviour
         Texture2D texture = new Texture2D(10, 10);
         texture.LoadImage(bytes);//流数据转换成Texture2D
         //创建一个Sprite,以Texture2D对象为基础
-        Sprite sp = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
+        Sprite sp = Sprite.Create(texture, new UnityEngine.Rect(0, 0, texture.width, texture.height), Vector2.zero);
         return sp;
     }
 }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowModelManager.cs

@@ -22,6 +22,8 @@ public class ShowModelManager : MonoBehaviour
             Destroy(root);
             root = null;
         }
+        info.gameObject.SetActive(true);
+        info.text = "模型努力加载中";
 
         TriLibModelLoad.Load(url, (AssetLoaderContext ac) => {
             ac.RootGameObject.SetActive(false);
@@ -40,8 +42,8 @@ public class ShowModelManager : MonoBehaviour
             ac.RootGameObject.transform.localPosition = Vector3.zero;
             Bounds bounds = GetAllBounds.GetRendererBounds(root);
             GameObject obj = new GameObject("Test");
-            obj.transform.SetParent(ac.RootGameObject.transform);
             obj.transform.position = bounds.center;
+            obj.transform.SetParent(ac.RootGameObject.transform);
             float bizhi = 0.4f / bounds.size.x;
             ac.RootGameObject.transform.localScale = Vector3.one*bizhi;
             ac.RootGameObject.transform.SetParent(this.transform);
@@ -54,7 +56,7 @@ public class ShowModelManager : MonoBehaviour
             info.text = "模型努力加载中\n" + (f*100).ToString("F2") + "%";
             if(f==1)
             {
-                info.gameObject.SetActive(false);
+                info.gameObject.SetActive(false); info.text = "" ;
 
             }
             //Debug.Log("加载中==》" + f);

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowVideoManager.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using XRTool.Util;
 
 public class ShowVideoManager : MonoBehaviour
 {
@@ -11,16 +12,44 @@ public class ShowVideoManager : MonoBehaviour
     {
         playeVideo();
     }
-
+    Timer timers;
     public void playeVideo()
     {
 
         if (url != null && url != "")
         {
+
             avpro = this.GetComponent<AVProVideoPlayer>();
-            avpro.SetUrl(url);
-            avpro.Play();
+            avpro.Stop();
+#if !UNITY_EDITOR
+                if(!url.Contains("file://") && !url.Contains("//"))
+                {
+                    url = "file://" + url;
+                }
+#endif
+            if (this.GetComponent<MediaPlayerCtrl>()&&url == this.GetComponent<MediaPlayerCtrl>().pathLoad)
+            {
+                avpro.SetUrl(url);
+                avpro.Play();
+            }
+            else
+            {
+                avpro.SetUrl(url);
+                this.GetComponent<MediaPlayerCtrl>().Load(this.GetComponent<MediaPlayerCtrl>().pathLoad);
+
+            }
+            TimerMgr.Instance.DestroyTimer(timers);
+
+            timers = TimerMgr.Instance.CreateTimer(()=> {
+                Texture tex = avpro.getTexture();
+                if(tex!=null)
+                {
+                    TimerMgr.Instance.DestroyTimer(timers);
+                    this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
+                }
+            },1f,-1);
         }
+
         plbt.SetActive(false);
     }
 
@@ -33,20 +62,23 @@ public class ShowVideoManager : MonoBehaviour
             if (avpro.IsPlaying())
             {
                 plbt.SetActive(true);
-                avpro.Stop();
+                avpro.Pause();
             }
             else
             {
+                Texture tex = avpro.getTexture();
+                this.GetComponent<RenWuTypeWindow>().changebizhi(tex);
                 plbt.SetActive(false);
                 avpro.Play();
             }
         }
     }
 
-    private void OnDisable()
+    public void OnDisable()
     {
         if(avpro!=null)
         {
+            //url = "";
             plbt.SetActive(true);
             avpro.Stop();
         }

Assets/HotUpdate/Scripts/Scripts/RoomFileMinio.cs

@@ -73,6 +73,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
         rfdb.Nowfd = Nowfd;
         backQueue.Enqueue(rfdb);*/
         RoomFileData rfd = new RoomFileData();
+        rfd.objectName = Nowfd.objectName;
         StatObjectArgs statObjectArgs = new StatObjectArgs()
                                               .WithBucket(Nowfd.bucket)
                                               .WithObject(Nowfd.objectName);
@@ -111,7 +112,6 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
         {
             yield return null;
         }
-
         Debug.Log(" DGJ  getFile DoSomeWork rfdb" + tk.Result);
         string url = tk.Result;
         rfd.url = url;
@@ -125,8 +125,18 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
 
     }
 
+    private void savefile(string path, byte[] bytes)
+    {
+        Stream sw = File.Create(path);
+        // FileStream sw = new FileStream(path);
+
+        sw.Write(bytes, 0, bytes.Length);
+
+        sw.Close();
+        sw.Dispose();
+    }
 
-        private IEnumerator UploadFile()
+    private IEnumerator UploadFile()
     {
 
        // await minio.ListBucketsAsync().ConfigureAwait(false);
@@ -228,7 +238,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     }
 
     Queue<GetFileData> fdQueue = new Queue<GetFileData>();
-    public void getFile( string bucket, string objectName, Action<RoomFileData> callBack, string roomId=null)//, string path
+    public void getFile( string bucket, string objectName,string uuid, Action<RoomFileData> callBack, string roomId=null)//, string path
     {
         Debug.Log(" DGJ  getFile " +bucket+"  "+ objectName);
         if (this.projectId != roomId)
@@ -239,6 +249,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
         GetFileData getFileData = new GetFileData();
         getFileData.bucket = bucket;
         getFileData.objectName = objectName;
+        getFileData.uuid = uuid;
         getFileData.callBack = callBack;
         fdQueue.Enqueue(getFileData);
     }
@@ -264,6 +275,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     {
         public byte[] bytes;
         public string url;
+        public string objectName;
     }
     public class RoomFileDataBack
     {
@@ -317,6 +329,9 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
             RoomFileDataBack rfdb = backQueue.Dequeue();
             try
             {
+
+                savefile(Application.persistentDataPath + "/" + rfdb.Nowfd.uuid + Path.GetExtension(rfdb.Nowfd.objectName), rfdb.rfd.bytes);
+
                 rfdb.Nowfd.callBack?.Invoke(rfdb.rfd);
 
             }
@@ -334,6 +349,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     {
         public string bucket;
         public string objectName;
+        public string uuid;
         public Action<RoomFileData> callBack;
     }
 

Assets/Slime_01.fbx.meta

@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: f65af901af2ea4269a56eb16c711f002
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Slime_02.fbx.meta

@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 0a4e1fb51e51b4f90a0e75ab81c535ea
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Slime_03.fbx.meta

@@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 6be3067664c684bb3953128a15456ffe
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset

@@ -272,7 +272,7 @@ Texture2D:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
+  serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
@@ -306,6 +306,3 @@ Texture2D:
     offset: 0
     size: 0
     path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset

@@ -272,7 +272,7 @@ Texture2D:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
+  serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
@@ -306,6 +306,3 @@ Texture2D:
     offset: 0
     size: 0
     path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset

@@ -272,7 +272,7 @@ Texture2D:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
+  serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
@@ -306,6 +306,3 @@ Texture2D:
     offset: 0
     size: 0
     path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset

@@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2147374
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Oswald Bold SDF Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -39,6 +40,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -68,9 +70,9 @@ Material:
     - _OutlineWidth: 0
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.8333333
-    - _ScaleRatioB: 0.6770833
-    - _ScaleRatioC: 0.6770833
+    - _ScaleRatioA: 0.9
+    - _ScaleRatioB: 0.73125
+    - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
@@ -102,6 +104,7 @@ Material:
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_BuildTextureStacks: []
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -119,15 +122,16 @@ MonoBehaviour:
   materialHashCode: 1112331510
   m_Version: 1.1.0
   m_SourceFontFileGUID: c9f6d0e7bc8541498c9a4799ba184ede
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: c9f6d0e7bc8541498c9a4799ba184ede,
-    type: 3}
+  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: c9f6d0e7bc8541498c9a4799ba184ede, type: 3}
   m_SourceFontFile: {fileID: 12800000, guid: c9f6d0e7bc8541498c9a4799ba184ede, type: 3}
   m_AtlasPopulationMode: 1
   m_FaceInfo:
+    m_FaceIndex: 0
     m_FamilyName: Oswald
     m_StyleName: Bold
     m_PointSize: 90
     m_Scale: 1
+    m_UnitsPerEM: 0
     m_LineHeight: 133.37402
     m_AscentLine: 107.40234
     m_CapLine: 80
@@ -267,15 +271,20 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
   serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
+  m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
   m_IsReadable: 1
+  m_IsPreProcessed: 0
+  m_IgnoreMasterTextureLimit: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
+  m_VTOnly: 0
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
@@ -289,9 +298,11 @@ Texture2D:
     m_WrapW: 0
   m_LightmapFormat: 0
   m_ColorSpace: 0
+  m_PlatformBlob: 
   image data: 0
   _typelessdata: 
   m_StreamData:
+    serializedVersion: 2
     offset: 0
     size: 0
     path: 

Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset

@@ -272,7 +272,7 @@ Texture2D:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
+  serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
@@ -306,6 +306,3 @@ Texture2D:
     offset: 0
     size: 0
     path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -109,9 +109,9 @@ Material:
     - _Parallax: 0.02
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.90909094
+    - _ScaleRatioA: 0.9
     - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.7386364
+    - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0

Assets/Unity中文字库7000.txt

@@ -1,5 +1,5 @@
 1234567890-=！@#￥%……&*()~:"{}[]|\?/<>,.;'+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ（）：、；. ，。？：；（）、-“”！% ‰ @ * & + = > < / ……《》℃   °  ℉ Ω ·  ′ ㎡ m³ μ〔〕一丨丿丶乛
-
+珺
 一
 乙