整合2.0代码

Assets/2.0/GameScene.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class GameoScene : MonoSingleton<GameoScene>
+public class GameScene : MonoSingleton<GameScene>
 {
     // Start is called before the first frame update
     void Start()

Assets/2.0/Tools/DownLoadItem.cs

@@ -7,6 +7,17 @@ using UnityEngine.Networking;
 
 public class DownLoadItem : MonoBehaviour
 {
+    public delegate void DownLoadCallBack(bool b);
+    public delegate void DownLoadPressOn(float f);
+
+    //下载回调
+    public DownLoadCallBack callback;
+    //下载进度回调
+    public DownLoadPressOn onProgress;
+
+    //下载ID
+    public string id;
+
     /// <summary>
     ///  下载地址
     /// </summary>
@@ -28,16 +39,20 @@ public class DownLoadItem : MonoBehaviour
     /// </summary>
     public string downLoadState;
 
+    //下载后是否有处理
+    public bool isAction;
+
     private UnityWebRequest webRequest;
     private string baseurl = "http://office.ghz-tech.com:9904/api";
 
-    public void Init(string downLoadPath, Action<bool> CallBacke)
+    public void Init(string downLoadPath,string id)
     {
         this.downLoadPath = downLoadPath;
-        StartCoroutine(DownloadFile(CallBacke));
+        this.id = id;
+        StartCoroutine(DownloadFile());
     }
 
-    private System.Collections.IEnumerator DownloadFile(Action<bool> CallBacke)
+    private System.Collections.IEnumerator DownloadFile()
     {
         string url = baseurl + "/file/download";
         using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
@@ -51,7 +66,8 @@ public class DownLoadItem : MonoBehaviour
             {
                 // 此处可以显示下载进度条等UI操作
                 progress = webRequest.downloadProgress;
-               // Debug.Log("Download Progress: " + progress);
+                onProgress?.Invoke(progress);
+                // Debug.Log("Download Progress: " + progress);
                 yield return null;
             }
 
@@ -67,25 +83,8 @@ public class DownLoadItem : MonoBehaviour
                 downLoadState = "下载成功";
                 downLoadData = webRequest.downloadHandler.data;
                 isDownLoad = true;
-                MsgHandler.AddListener("AAAA", HandleMsg);
-
-                Msg msg = new Msg("akdfakdf", new object());
-                MsgHandler.SendMsg("AAA", msg)
             }
-            CallBacke(isDownLoad);
-        }
-    }
-
-    private void HandleMsg(Msg msg)
-    {
-        try
-        {
-           
-        }
-        catch (System.Exception e)
-        {
-
-           // ErrorLogPanel.Instance.Show(" 返回生成素材出现错误 " + e.Message);
+            callback?.Invoke(isDownLoad);
         }
     }
 

Assets/2.0/Tools/LoadManager.cs

@@ -6,17 +6,53 @@ using UnityEngine;
 public class LoadManager : Singleton<LoadManager>
 {
     public Dictionary<string, DownLoadItem> downList = new Dictionary<string, DownLoadItem>();
-    public void load(string url,string version, Action<float> presson, Action<GameObject> callback)
+    public void load(ModelItem model, Action<float> onProgress, Action<GameObject> callback)
     {
-        string dName = getLoadName(url, version);
-        if (downList.ContainsKey(dName))
+        string dName = getLoadName(model.url, model.Version);
+        if (!downList.ContainsKey(dName))
         {
-        }else
-        {
-
+            GameObject obj = new GameObject(dName);
+            DownLoadItem dli = obj.AddComponent<DownLoadItem>();
+            dli.Init(model.url, model.id);
         }
+
+
+        downList[dName].onProgress += (float f) => {
+
+            onProgress.Invoke(f);
+        };
+
+        downList[dName].callback += (bool b) => {
+
+            if(b)
+            {
+                if (!downList[dName].isAction)
+                {
+                    //下载成功并无处理
+                    switch (model.type)
+                    {
+                        case ModelItem.ModelType.Image:
+
+                            break;
+                        case ModelItem.ModelType.Video:
+
+                            break;
+                        case ModelItem.ModelType.ABModel:
+
+                            break;
+                    }
+                }
+
+            }
+            else
+            {
+                //下载失败
+            }
+        };
     }
 
+
+
     public string getLoadName(string url, string version)
     {
         return url + "_" + version;

Assets/UnityTool/Singleton.cs.meta → Assets/2.0/Tools/Singleton.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 969fd196789807c44941066ec6b44617
+guid: 4a1ba0246edcfe040830a627c898e0d2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/2.0/Tools/SingletonMono.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace XRTool.Util
+{
+    public abstract class SingletonMono<T> : MonoBehaviour where T : MonoBehaviour
+    {
+        private static T instance;
+
+        private static object lockObj = new object();
+
+        public static T Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = (T)FindObjectOfType(typeof(T));
+
+                    if (instance == null)
+                    {
+                        lock (lockObj)
+                        {
+                            if (instance == null)
+                            {
+                                GameObject singleton = new GameObject();
+                                instance = singleton.AddComponent<T>();
+                                singleton.name = "(Singleton) " + typeof(T).Name;
+                                DontDestroyOnLoad(singleton);
+                            }
+                        }
+                    }
+                }
+                return instance;
+            }
+        }
+    }
+}

Assets/2.0/Tools/SingletonMono.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f5904ee8318246345b51cfd332fc83bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/Model/ModelItem.cs

@@ -4,6 +4,15 @@ using UnityEngine;
 
 public class ModelItem 
 {
+    public enum ModelType
+    {
+        Image,
+
+        Video,
+
+        ABModel
+
+    }
     //模型所在场景
     public UserSceneItem sceneItem;
 
@@ -25,8 +34,7 @@ public class ModelItem
                 _model.transform.parent = sceneItem.SceneModel.transform;
                 _model.transform.localPosition = getInfoPos();
                 _model.transform.localEulerAngles = getInfoEul();
-
-                LoadManager.Instance.load(url, Version, (float f)=> {
+                LoadManager.Instance.load(this, (float f)=> {
 
                    //显示加载
                 
@@ -44,11 +52,13 @@ public class ModelItem
             return _model; }
     }
 
+
+
     //模型地址
     public string url;
 
     //模型类型
-    public string type;
+    public ModelType type;
 
     //模型原始信息
     public string info;
@@ -64,4 +74,5 @@ public class ModelItem
     {
         return Vector3.zero;
     }
+
 }

Assets/2.0/User/Spots.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ceb45d7d2829bc4ea9efb345c998a91
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/Spots/SpotsItem.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SpotsItem
+{
+    public string id;
+
+    //景点中的模型
+    public Dictionary<string, ModelItem> modelList = new Dictionary<string, ModelItem>();
+
+    //景点的扫描图
+    public VufroiaTrigger vufroiaTrigger;
+}

Assets/2.0/User/Spots/SpotsItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 113ae11d52b204648b64b92ed0a4f302
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/UserScene/UserSceneManager.cs → Assets/2.0/User/Spots/SpotsManager.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class UserSceneManager : MonoBehaviour
+public class SpotsManager : MonoBehaviour
 {
     // Start is called before the first frame update
     void Start()

Assets/2.0/User/Spots/SpotsManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b1c3b6a2cbae0ca41a3e0208b13b7ff9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/Trigger.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0bbed46566f128e448a415c93bca3233
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/Trigger/VufroiaTrigger.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class VufroiaTrigger : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/2.0/User/Trigger/VufroiaTrigger.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1d130aa2d57d090418d9b9061308b101
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/2.0/User/UserManager.cs

@@ -19,6 +19,7 @@ public class UserManager : SingletonMono<UserManager>
             HttpTool.Instance.Get("/project/index", (string msg) => {
 
                 Debug.Log("/project/index===>" + msg);
+                UserSceneManager.Instance.initScene(msg);
 
             });
         }

Assets/2.0/User/UserScene/UserSceneItem.cs

@@ -0,0 +1,53 @@
+using LitJson;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UserSceneItem
+{
+    //场景ID
+    public string id;
+
+    //场景名字
+    public string name;
+
+    //场景中的模型
+    public Dictionary<string, SpotsItem> SpotsList = new Dictionary<string, SpotsItem>();
+
+    GameObject _sceneModel;
+    public GameObject SceneModel
+    {
+        get
+        {
+            if (_sceneModel == null)
+            {
+                _sceneModel = new GameObject(name);
+                _sceneModel.transform.parent = GameScene.Instance.transform;
+                _sceneModel.transform.localPosition = Vector3.zero;
+                _sceneModel.transform.localEulerAngles = Vector3.zero;
+            }
+            return _sceneModel;
+        }
+    }
+
+    //场景原始信息
+    public string info;
+
+    public void init(string id, string name)
+    {
+        Debug.Log("UserSceneItem init");
+        this.id = id;
+        this.name = name;
+
+        SendSnInfo sendNet = new SendSnInfo();
+        sendNet.sn = SendSN.GetSN();
+        //sendNet.sn = "Nreal-SN";
+        //API_GSXR_Slam.SlamManager.plugin.SN;
+        sendNet.projectId =int.Parse( this.id);
+        string jsonData = JsonMapper.ToJson(sendNet);
+        GameScene.Instance.StartCoroutine(HttpTool.Instance.SendHttp("/client/snInfo", jsonData, (message) =>
+        {
+            Debug.Log("场景===》"+name+ "==id=>" + id+"=msg==>"+message);
+        }));
+    }
+}

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -0,0 +1,33 @@
+using LitJson;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
+{
+    //场景中的模型
+    public Dictionary<string, UserSceneItem> SceneList = new Dictionary<string, UserSceneItem>();
+    //初始化场景
+    public void initScene(string msg)
+    {
+        SceneList.Clear();
+        JsonData data = JsonMapper.ToObject(msg);
+        Debug.Log("initScene init");
+        if (data["data"].IsArray)
+        {
+            Debug.Log("initScene IsArray");
+            for (int i = 0; i < data["data"].Count; i++)
+            {
+                UserSceneItem usi = CreateItem(data["data"][i]);
+                SceneList.Add(usi.id, usi);
+            }
+        }
+    }
+
+    UserSceneItem CreateItem(JsonData msg)
+    {
+        UserSceneItem usi = new UserSceneItem();
+        usi.init(msg["id"].ToString(), msg["name"].ToString());
+        return usi;
+    }
+}

Assets/2.0/UserScene/UserSceneItem.cs

@@ -1,34 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class UserSceneItem 
-{
-    //场景ID
-    public string id;
-
-    //场景名字
-    public string name;
-
-    //场景中的模型
-    public Dictionary<string, ModelItem> modelList = new Dictionary<string, ModelItem>();
-
-    GameObject _sceneModel;
-    public GameObject SceneModel
-    {
-        get
-        {
-            if (_sceneModel == null)
-            {
-                _sceneModel = new GameObject(name);
-                _sceneModel.transform.parent = GameoScene.Instance.transform;
-                _sceneModel.transform.localPosition = Vector3.zero;
-                _sceneModel.transform.localEulerAngles = Vector3.zero;
-            }
-            return _sceneModel;
-        }
-    }
-
-    //场景原始信息
-    public string info;
-}

Assets/MRNavigatorPro.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1116,7 +1116,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1183460939}
+  m_Mesh: {fileID: 1473432789}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3068,170 +3068,6 @@ Transform:
   m_Father: {fileID: 1813820188}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &1183460939
-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 &1265688324
 GameObject:
   m_ObjectHideFlags: 0
@@ -4043,6 +3879,170 @@ PrefabInstance:
         type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7f34641aa9b798d4980647aff233a880, type: 3}
+--- !u!43 &1473432789
+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!1001 &1494370969
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4058,7 +4058,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0014267211
+      value: 0.00042339688
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4188,37 +4188,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.005905939
+      value: -0.006891171
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -101.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4228,62 +4228,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -6202,6 +6202,51 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2043733895}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2066434260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2066434262}
+  - component: {fileID: 2066434261}
+  m_Layer: 0
+  m_Name: GameoScene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2066434261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2066434260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a3fd997b64a3f24cb6c3b1b39af8fcd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  global: 1
+--- !u!4 &2066434262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2066434260}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2120824767
 GameObject:
   m_ObjectHideFlags: 0
@@ -6510,7 +6555,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.00096586207
+      value: -0.0016924221
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -10325,7 +10370,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.0017395174}
+  m_AnchoredPosition: {x: 0, y: -0.0032742948}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118