ソースを参照

增加新的功能

“hujiajun” 1 年間 前
コミット
20dd312cf9
38 ファイル変更1184 行追加440 行削除
  1. 1 1
      Assets/HotUpdate/CheckIsUse.cs
  2. 2 0
      Assets/HotUpdate/DataConfig.cs
  3. 8 8
      Assets/HotUpdate/EditorPanel.cs
  4. 12 0
      Assets/HotUpdate/FollowHead.cs
  5. 11 0
      Assets/HotUpdate/FollowHead.cs.meta
  6. 16 3
      Assets/HotUpdate/GameManager.cs
  7. 1 1
      Assets/HotUpdate/ImmersalLocalizerController.cs
  8. 3 1
      Assets/HotUpdate/MoveChange.cs
  9. 127 1
      Assets/HotUpdate/SettingPanel.cs
  10. 25 0
      Assets/HybridCLRGenerate/AOTGenericReferences.cs
  11. 11 1
      Assets/MRNavigatorPro.unity
  12. 868 57
      Assets/MRNavigatorStart/MRNavigatorStart.prefab
  13. BIN
      Assets/Plugins/Android/EasyMovieTexture.jar
  14. 0 21
      Assets/Plugins/Android/EasyMovieTexture.jar.meta
  15. 0 9
      Assets/Plugins/Android/assets.meta
  16. 0 9
      Assets/Plugins/Android/assets/Shader.meta
  17. 0 15
      Assets/Plugins/Android/assets/Shader/MeshFragShader.fsh
  18. 0 6
      Assets/Plugins/Android/assets/Shader/MeshFragShader.fsh.meta
  19. 0 35
      Assets/Plugins/Android/assets/Shader/MeshVertShader.vsh
  20. 0 6
      Assets/Plugins/Android/assets/Shader/MeshVertShader.vsh.meta
  21. 0 9
      Assets/Plugins/Android/libs.meta
  22. 0 8
      Assets/Plugins/Android/libs/arm64-v8a.meta
  23. BIN
      Assets/Plugins/Android/libs/arm64-v8a/libBlueDoveMediaRender.so
  24. 0 32
      Assets/Plugins/Android/libs/arm64-v8a/libBlueDoveMediaRender.so.meta
  25. 0 9
      Assets/Plugins/Android/libs/armeabi-v7a.meta
  26. BIN
      Assets/Plugins/Android/libs/armeabi-v7a/libBlueDoveMediaRender.so
  27. 0 22
      Assets/Plugins/Android/libs/armeabi-v7a/libBlueDoveMediaRender.so.meta
  28. 0 9
      Assets/Plugins/Android/libs/x86.meta
  29. BIN
      Assets/Plugins/Android/libs/x86/libBlueDoveMediaRender.so
  30. 0 22
      Assets/Plugins/Android/libs/x86/libBlueDoveMediaRender.so.meta
  31. BIN
      Assets/Plugins/Android/zip_file.jar
  32. 0 21
      Assets/Plugins/Android/zip_file.jar.meta
  33. 20 121
      Assets/Resources/Warning/WarningPopUp.prefab
  34. 57 0
      Assets/bianpao.cs
  35. 11 0
      Assets/bianpao.cs.meta
  36. 2 2
      Packages/manifest.json
  37. 6 8
      Packages/packages-lock.json
  38. 3 3
      ProjectSettings/ProjectSettings.asset

+ 1 - 1
Assets/HotUpdate/CheckIsUse.cs

@@ -16,7 +16,7 @@ public class CheckIsUse : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (ARSpace.isFind)
+        if (ARSpace.isFind&& !MoveChange.islixian)
         {
             t.interactable = true;
         }

+ 2 - 0
Assets/HotUpdate/DataConfig.cs

@@ -396,6 +396,8 @@ public class SpoitValue
     /// 景点和触发范围信息
     /// </summary>
     public SpoitPos triggerRange { get; set; }
+
+    public bool location;
 }
 
 public class SpoitValueDetail

+ 8 - 8
Assets/HotUpdate/EditorPanel.cs

@@ -8,19 +8,19 @@ public class EditorPanel : MonoBehaviour
     /// <summary>
     /// 景点
     /// </summary>
-    private UISpoitsPanel m_SpoitsPanel;
+    public UISpoitsPanel m_SpoitsPanel;
     /// <summary>
     /// 素材面板
     /// </summary>
-    private UIMaterialsPanel m_MaterialsPanel;
+    public UIMaterialsPanel m_MaterialsPanel;
     /// <summary>
     /// 添加素材面板
     /// </summary>
-    private UIAddMaterialPanel m_AddMaterialPanel;
+    public UIAddMaterialPanel m_AddMaterialPanel;
     /// <summary>
     /// 素材编辑面板
     /// </summary>
-    private UIEditorPanel m_EditorPanel;
+    public UIEditorPanel m_EditorPanel;
 
   //  private UIAnchorsPanel m_AnchorsPanel;
     /// <summary>
@@ -30,16 +30,16 @@ public class EditorPanel : MonoBehaviour
 
     private void Awake()
     {
-        m_SpoitsPanel = transform.Find("UISpoits").gameObject.AddComponent<UISpoitsPanel>();
-        m_MaterialsPanel = transform.Find("UIMaterials").gameObject.AddComponent<UIMaterialsPanel>();
+      //  m_SpoitsPanel = transform.Find("UISpoits").gameObject.AddComponent<UISpoitsPanel>();
+      //  m_MaterialsPanel = transform.Find("UIMaterials").gameObject.AddComponent<UIMaterialsPanel>();
         m_MaterialsPanel.EditorPanel = this;
        // m_AnchorsPanel = transform.Find("UIAnchor").gameObject.GetComponent<UIAnchorsPanel>();
 
-        m_AddMaterialPanel = transform.Find("UIAddMaterial").gameObject.AddComponent<UIAddMaterialPanel>();
+      //  m_AddMaterialPanel = transform.Find("UIAddMaterial").gameObject.AddComponent<UIAddMaterialPanel>();
         m_AddMaterialPanel.EditorPanel = this;
         m_AddMaterialPanel.OnClickAddMatBtn += OnClickAddMatBtn;
 
-        m_EditorPanel = transform.Find("UIEditor").gameObject.GetComponent<UIEditorPanel>();
+      //  m_EditorPanel = transform.Find("UIEditor").gameObject.GetComponent<UIEditorPanel>();
         m_EditorPanel.OnClickRemoveBtn += onClickRemoveBtn;
 
       

+ 12 - 0
Assets/HotUpdate/FollowHead.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FollowHead : MonoBehaviour
+{
+    void Update()
+    {
+        this.transform.position = OpenXRCamera.Instance.head.position;
+        this.transform.eulerAngles = OpenXRCamera.Instance.head.eulerAngles;
+    }
+}

+ 11 - 0
Assets/HotUpdate/FollowHead.cs.meta

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

+ 16 - 3
Assets/HotUpdate/GameManager.cs

@@ -356,7 +356,7 @@ public class GameManager : MonoSingleton<GameManager>
         MoveChange.islixian = false;
         SetLocalTime.isFind = true;
         ARSpace.isFind=false;
-
+        SettingPanel.dingweilist.Clear();
         allobjs.Clear();
         ARSpace.transformToSpace.Clear();
         ARSpace.spaceToTransform.Clear();
@@ -559,6 +559,17 @@ public class GameManager : MonoSingleton<GameManager>
         thread.Start();
 
         StartCoroutine(startSendPos());
+
+
+        TimerMgr.Instance.CreateTimer(()=> {
+
+            if(GameManager.Instance.armap.enabled&& !XRLocalizer.Instance.isLocalizing)
+            {
+               // XRLocalizer.Instance.isLocalizing = true;
+              //  XRLocalizer.Instance.Localize();
+            }
+
+        },0.5f,-1);
     }
 
         IEnumerator startSendPos()
@@ -1076,8 +1087,8 @@ public class GameManager : MonoSingleton<GameManager>
         if (ison)
         {
             Debug.Log(OpenXRCamera.Instance.head.forward);
-            m_SettingPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward;
-            m_SettingPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+           // m_SettingPanel.transform.position = OpenXRCamera.Instance.head.position + Player.transform.forward;
+           // m_SettingPanel.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
         }
     }
 
@@ -2153,6 +2164,7 @@ public class GameManager : MonoSingleton<GameManager>
                 SpoitIndex = i;
                 ListCrystals[SpoitIndex].gameObject.SetActive(false);
                 m_EditorPanel.SetSpoit(SpoitValues[i]);
+                m_SettingPanel.setMsg(SpoitValues[i]);
                 return;
             }
         }
@@ -2184,6 +2196,7 @@ public class GameManager : MonoSingleton<GameManager>
             m_EditorPanel.ClosePanel();
             SpoitIndex = -1;
         }
+        m_SettingPanel.setMsg(null);
     }
 
     /// <summary>

+ 1 - 1
Assets/HotUpdate/ImmersalLocalizerController.cs

@@ -27,7 +27,7 @@ public class ImmersalLocalizerController: AbstractController
 
         if(time > rateTime  && startLocalizer && !SetSceneActive.Instance.active)
         {
-            XRLocalizer.Localize();
+            //XRLocalizer.Localize();
             time= 0;
         }
     }

+ 3 - 1
Assets/HotUpdate/MoveChange.cs

@@ -105,13 +105,15 @@ public class MoveChange : MonoBehaviour
                 txtTip.SetActive(!islixian);
                 txtTip.GetComponent<ShowTipTime>().TimeFloat = 3;
                 txtTip.GetComponent<ShowTipTime>().t = 0;
-                txtTip.GetComponentInChildren<Text>().text = "空间定位成功";
+                txtTip.GetComponentInChildren<Text>().text = "空间定位成功";
+                XRLocalizer.Instance.gameObject.SetActive(false);
             }
             isCx = true;
         }
         else
         {
 
+
             txtTip.SetActive(false);
             saomiao.SetActive(true);
            // txtTip.GetComponentInChildren<Text>().text = "请扫描周围环境以进行空间定位";

+ 127 - 1
Assets/HotUpdate/SettingPanel.cs

@@ -5,11 +5,20 @@ using UnityEngine.UI;
 using System;
 using SC.XR.Unity;
 using Blue;
+using LitJson;
+using Immersal.AR;
+using XRTool.Util;
 
 public class SettingPanel : AbstractController
 {
+    public Text spMRtext;
+
     public Toggle MinMap;
+    public Toggle NoMinMap;
+    public Toggle DingWei;
+    public Toggle feiDingWei;
     public Toggle LuJIng;
+    public Toggle NoLuJIng;
     public Transform ChooseLine;
     public Toggle LineItem;
     public Transform LineItemParent;
@@ -21,6 +30,8 @@ public class SettingPanel : AbstractController
     private RouteCtr m_RouteCtr;
 
     private List<Toggle> Lines;
+    SpoitValue nowsp;
+    public static Dictionary<int, bool> dingweilist = new Dictionary<int, bool>();
 
     private void Awake()
     {
@@ -28,11 +39,117 @@ public class SettingPanel : AbstractController
         SaveData.onClick.AddListener(OnClickSaveData);
         MinMap.onValueChanged.AddListener(OnMinMapValueChange);
         LuJIng.onValueChanged.AddListener(OnLuJIngValueChange);
+        DingWei.onValueChanged.AddListener(DingWeiValueChange);
+        setMsg(null);
+    }
+
+    private void DingWeiValueChange(bool arg0)
+    {
+        if(nowsp!=null)
+        {
+            if (dingweilist.ContainsKey(nowsp.id))
+            {
+                dingweilist[nowsp.id] = arg0;
+            }
+            else
+            {
+                dingweilist.Add(nowsp.id,arg0);
+            }
+
+            JsonData data = new JsonData();
+            data["id"] = nowsp.id;
+            data["projectId"] = SceneChoose.Sid;
+            data["location"] = arg0;
+            HttpTool.Instance.Post("/viewpoint/locationPoint", data.ToJson(), (string str) => { });
+        }
     }
+
     private void OnEnable()
     {
-        MinMap.isOn = this.GetService<IMinMapService>().setMinMap == 1 ? true : false;
+        MinMap.interactable = false;
+        NoMinMap.interactable = false;
+        HttpTool.Instance.Get("/user/getUserInfo", (string str) =>
+        {
+            MinMap.interactable = true;
+            NoMinMap.interactable = true;
+            JsonData data = JsonMapper.ToObject(str);
+            if (data["data"]["minMap"].ToString() == "0")
+            {
+                NoMinMap.isOn = true;
+                m_MinMap.gameObject.SetActive(false);
+
+            }
+            else
+            {
+
+                MinMap.isOn = true;
+                m_MinMap.gameObject.SetActive(true);
+            }
+        });
+        //   HttpTool.Instance.Post("/viewpoint/locationPoint", data.ToJson(), (string str) => { });
+        // MinMap.isOn = this.GetService<IMinMapService>().setMinMap == 1 ? true : false;
     }
+
+    public void setMsg(SpoitValue sv)
+    {
+        nowsp = sv;
+        if (sv!=null)
+        {
+            feiDingWei.gameObject.SetActive(true);
+            DingWei.gameObject.SetActive(true);
+            spMRtext.text = sv.name;
+
+            if (dingweilist.ContainsKey(nowsp.id))
+            {
+                if(dingweilist[nowsp.id])
+                {
+                    XRLocalizer.Instance.gameObject.SetActive(true);
+                    DingWei.isOn = true;
+                }
+                else
+                {
+
+                    if (ARSpace.isFind)
+                    {
+                        XRLocalizer.Instance.gameObject.SetActive(false);
+                    }
+                    feiDingWei.isOn = true;
+                }
+            }
+            else
+            {
+                if(sv.location)
+                {
+                    dingweilist.Add(nowsp.id,true);
+                    XRLocalizer.Instance.gameObject.SetActive(true);
+                    DingWei.isOn = true;
+
+                }
+                else
+                {
+                    if (ARSpace.isFind)
+                    {
+                        XRLocalizer.Instance.gameObject.SetActive(false);
+                    }
+                    feiDingWei.isOn = true;
+                }
+
+            }
+
+        }
+        else
+        {
+            spMRtext.text = "----";
+            feiDingWei.isOn = false;
+            feiDingWei.gameObject.SetActive(false);
+            DingWei.gameObject.SetActive(false);
+            //if(ARSpace.isFind)
+            //{
+                XRLocalizer.Instance.gameObject.SetActive(true);
+            //}
+        }
+    }
+
     public void Init()
     {
         CreateLines();
@@ -49,6 +166,11 @@ public class SettingPanel : AbstractController
 
     private void OnMinMapValueChange(bool ison)
     {
+        //Debug.Log(data);
+        JsonData data = new JsonData();
+
+        data["minMap"] = ison?1:0;
+        HttpTool.Instance.Post("/user/settings", data.ToJson(), (string str)=> { });
         m_MinMap.gameObject.SetActive(ison);
     }
 
@@ -90,4 +212,8 @@ public class SettingPanel : AbstractController
          GameManager.Instance.StartCoroutine(UIEditorPanel.Instance.SetSpoitInfo());
         DataManager.Instance.IsSavedData = true;
     }
+
+
+
+
 }

+ 25 - 0
Assets/HybridCLRGenerate/AOTGenericReferences.cs

@@ -67,6 +67,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Comparer<long>
 	// System.Collections.Generic.Comparer<object>
 	// System.Collections.Generic.Dictionary.Enumerator<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary.Enumerator<int,byte>
 	// System.Collections.Generic.Dictionary.Enumerator<int,object>
 	// System.Collections.Generic.Dictionary.Enumerator<long,object>
 	// System.Collections.Generic.Dictionary.Enumerator<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -75,6 +76,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Dictionary.Enumerator<object,long>
 	// System.Collections.Generic.Dictionary.Enumerator<object,object>
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<int,byte>
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<int,object>
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<long,object>
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -83,6 +85,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<object,long>
 	// System.Collections.Generic.Dictionary.KeyCollection.Enumerator<object,object>
 	// System.Collections.Generic.Dictionary.KeyCollection<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary.KeyCollection<int,byte>
 	// System.Collections.Generic.Dictionary.KeyCollection<int,object>
 	// System.Collections.Generic.Dictionary.KeyCollection<long,object>
 	// System.Collections.Generic.Dictionary.KeyCollection<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -91,6 +94,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Dictionary.KeyCollection<object,long>
 	// System.Collections.Generic.Dictionary.KeyCollection<object,object>
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<int,byte>
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<int,object>
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<long,object>
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -99,6 +103,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<object,long>
 	// System.Collections.Generic.Dictionary.ValueCollection.Enumerator<object,object>
 	// System.Collections.Generic.Dictionary.ValueCollection<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary.ValueCollection<int,byte>
 	// System.Collections.Generic.Dictionary.ValueCollection<int,object>
 	// System.Collections.Generic.Dictionary.ValueCollection<long,object>
 	// System.Collections.Generic.Dictionary.ValueCollection<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -107,6 +112,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.Dictionary.ValueCollection<object,long>
 	// System.Collections.Generic.Dictionary.ValueCollection<object,object>
 	// System.Collections.Generic.Dictionary<int,UnityEngine.Vector3>
+	// System.Collections.Generic.Dictionary<int,byte>
 	// System.Collections.Generic.Dictionary<int,object>
 	// System.Collections.Generic.Dictionary<long,object>
 	// System.Collections.Generic.Dictionary<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -130,6 +136,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.ICollection<IngameDebugConsole.DebugLogEntryTimestamp>
 	// System.Collections.Generic.ICollection<Loom.DelayedQueueItem>
 	// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<int,UnityEngine.Vector3>>
+	// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<int,byte>>
 	// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<int,object>>
 	// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<long,object>>
 	// System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<object,System.Collections.Generic.KeyValuePair<int,object>>>
@@ -162,6 +169,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.IEnumerable<IngameDebugConsole.DebugLogEntryTimestamp>
 	// System.Collections.Generic.IEnumerable<Loom.DelayedQueueItem>
 	// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<int,UnityEngine.Vector3>>
+	// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<int,byte>>
 	// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<int,object>>
 	// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<long,object>>
 	// System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<object,System.Collections.Generic.KeyValuePair<int,object>>>
@@ -180,6 +188,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.IEnumerator<IngameDebugConsole.DebugLogEntryTimestamp>
 	// System.Collections.Generic.IEnumerator<Loom.DelayedQueueItem>
 	// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<int,UnityEngine.Vector3>>
+	// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<int,byte>>
 	// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<int,object>>
 	// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<long,object>>
 	// System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<object,System.Collections.Generic.KeyValuePair<int,object>>>
@@ -208,6 +217,7 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Collections.Generic.IList<long>
 	// System.Collections.Generic.IList<object>
 	// System.Collections.Generic.KeyValuePair<int,UnityEngine.Vector3>
+	// System.Collections.Generic.KeyValuePair<int,byte>
 	// System.Collections.Generic.KeyValuePair<int,object>
 	// System.Collections.Generic.KeyValuePair<long,object>
 	// System.Collections.Generic.KeyValuePair<object,System.Collections.Generic.KeyValuePair<int,object>>
@@ -303,7 +313,9 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Func<Loom.DelayedQueueItem,byte>
 	// System.Func<System.Threading.Tasks.VoidTaskResult>
 	// System.Func<UnityEngine.Vector2,UnityEngine.Matrix4x4>
+	// System.Func<int>
 	// System.Func<object,System.Threading.Tasks.VoidTaskResult>
+	// System.Func<object,int>
 	// System.Func<object,object,object>
 	// System.Func<object,object>
 	// System.Func<object>
@@ -332,35 +344,45 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 	// System.Runtime.CompilerServices.ConditionalWeakTable.Enumerator<object,object>
 	// System.Runtime.CompilerServices.ConditionalWeakTable<object,object>
 	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<System.Threading.Tasks.VoidTaskResult>
+	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<int>
 	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>
 	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable<System.Threading.Tasks.VoidTaskResult>
+	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable<int>
 	// System.Runtime.CompilerServices.ConfiguredTaskAwaitable<object>
 	// System.Runtime.CompilerServices.TaskAwaiter<System.Threading.Tasks.VoidTaskResult>
+	// System.Runtime.CompilerServices.TaskAwaiter<int>
 	// System.Runtime.CompilerServices.TaskAwaiter<object>
 	// System.Threading.Tasks.ContinuationTaskFromResultTask<System.Threading.Tasks.VoidTaskResult>
+	// System.Threading.Tasks.ContinuationTaskFromResultTask<int>
 	// System.Threading.Tasks.ContinuationTaskFromResultTask<object>
 	// System.Threading.Tasks.Task<System.Threading.Tasks.VoidTaskResult>
+	// System.Threading.Tasks.Task<int>
 	// System.Threading.Tasks.Task<object>
 	// System.Threading.Tasks.TaskCompletionSource<object>
 	// System.Threading.Tasks.TaskFactory.<>c__DisplayClass35_0<System.Threading.Tasks.VoidTaskResult>
+	// System.Threading.Tasks.TaskFactory.<>c__DisplayClass35_0<int>
 	// System.Threading.Tasks.TaskFactory.<>c__DisplayClass35_0<object>
 	// System.Threading.Tasks.TaskFactory<System.Threading.Tasks.VoidTaskResult>
+	// System.Threading.Tasks.TaskFactory<int>
 	// System.Threading.Tasks.TaskFactory<object>
 	// TMPro.FastAction<object>
 	// UnityEngine.Events.InvokableCall<UnityEngine.Vector2>
 	// UnityEngine.Events.InvokableCall<byte>
+	// UnityEngine.Events.InvokableCall<int>
 	// UnityEngine.Events.InvokableCall<object,int,int>
 	// UnityEngine.Events.InvokableCall<object,object,int>
 	// UnityEngine.Events.InvokableCall<object>
 	// UnityEngine.Events.InvokableCall<ushort,int>
 	// UnityEngine.Events.UnityAction<UnityEngine.Vector2>
 	// UnityEngine.Events.UnityAction<byte>
+	// UnityEngine.Events.UnityAction<int>
 	// UnityEngine.Events.UnityAction<object,int,int>
 	// UnityEngine.Events.UnityAction<object,object,int>
 	// UnityEngine.Events.UnityAction<object>
 	// UnityEngine.Events.UnityAction<ushort,int>
 	// UnityEngine.Events.UnityEvent<UnityEngine.Vector2>
 	// UnityEngine.Events.UnityEvent<byte>
+	// UnityEngine.Events.UnityEvent<int>
 	// UnityEngine.Events.UnityEvent<object,int,int>
 	// UnityEngine.Events.UnityEvent<object,object,int>
 	// UnityEngine.Events.UnityEvent<object>
@@ -395,15 +417,18 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<COSXMLDemo.Program.<GetObject>d__6>(COSXMLDemo.Program.<GetObject>d__6&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<COSXMLDemo.Program.<Main>d__1>(COSXMLDemo.Program.<Main>d__1&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<object>.Start<COSXMLDemo.Program.<PutObject>d__4>(COSXMLDemo.Program.<PutObject>d__4&)
+		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<int>,GameInit.<TestDownloadObject>d__5>(System.Runtime.CompilerServices.TaskAwaiter<int>&,GameInit.<TestDownloadObject>d__5&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,COSDownLoad.<TestDownloadObject>d__19>(System.Runtime.CompilerServices.TaskAwaiter<object>&,COSDownLoad.<TestDownloadObject>d__19&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,COSDownLoad.<TransferBatchDownloadObjects>d__23>(System.Runtime.CompilerServices.TaskAwaiter<object>&,COSDownLoad.<TransferBatchDownloadObjects>d__23&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,COSDownLoad.<TransferDownloadObject>d__20>(System.Runtime.CompilerServices.TaskAwaiter<object>&,COSDownLoad.<TransferDownloadObject>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<COSDownLoad.<TestDownloadObject>d__19>(COSDownLoad.<TestDownloadObject>d__19&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<COSDownLoad.<TransferBatchDownloadObjects>d__23>(COSDownLoad.<TransferBatchDownloadObjects>d__23&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<COSDownLoad.<TransferDownloadObject>d__20>(COSDownLoad.<TransferDownloadObject>d__20&)
+		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<GameInit.<TestDownloadObject>d__5>(GameInit.<TestDownloadObject>d__5&)
 		// object& System.Runtime.CompilerServices.Unsafe.As<object,object>(object&)
 		// System.Void* System.Runtime.CompilerServices.Unsafe.AsPointer<object>(object&)
 		// object System.Threading.Interlocked.CompareExchange<object>(object&,object,object)
+		// System.Threading.Tasks.Task<int> System.Threading.Tasks.Task.Run<int>(System.Func<int>)
 		// System.Threading.Tasks.Task<object> System.Threading.Tasks.Task.Run<object>(System.Func<object>)
 		// object UnityEngine.AndroidJNIHelper.ConvertFromJNIArray<object>(System.IntPtr)
 		// System.IntPtr UnityEngine.AndroidJNIHelper.GetFieldID<object>(System.IntPtr,string,bool)

+ 11 - 1
Assets/MRNavigatorPro.unity

@@ -160,6 +160,11 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 4002528868428170379, guid: 9aa3328b080774e6a968fc5910820dbf,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4002528868567245461, guid: 9aa3328b080774e6a968fc5910820dbf,
         type: 3}
       propertyPath: m_Name
@@ -452,6 +457,11 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5142388694561437953, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: isHand
@@ -465,7 +475,7 @@ PrefabInstance:
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}

ファイルの差分が大きいため隠しています
+ 868 - 57
Assets/MRNavigatorStart/MRNavigatorStart.prefab


BIN
Assets/Plugins/Android/EasyMovieTexture.jar


+ 0 - 21
Assets/Plugins/Android/EasyMovieTexture.jar.meta

@@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 6fe6744bff85f3b48a2f9d4354e34eb3
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings: {}
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/Android/assets.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 102ba9a9d3337124485924cbcbe25c2f
-folderAsset: yes
-timeCreated: 1464875204
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/Android/assets/Shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 81ffe077049d44d4db144ec705737a4b
-folderAsset: yes
-timeCreated: 1464875204
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 15
Assets/Plugins/Android/assets/Shader/MeshFragShader.fsh

@@ -1,15 +0,0 @@
-#extension GL_OES_EGL_image_external : require
-uniform samplerExternalOES sTexture;
-
-uniform lowp float AlphaValue;
-
-varying mediump vec2   TexCoord;
-
-void main()
-{
-	lowp vec4 color = texture2D(sTexture, TexCoord) ;
-	
-	color = vec4(color.rgb,color.a * AlphaValue);
-    gl_FragColor = color;
-    
-}

+ 0 - 6
Assets/Plugins/Android/assets/Shader/MeshFragShader.fsh.meta

@@ -1,6 +0,0 @@
-fileFormatVersion: 2
-guid: 37ea0318f9ddb874a8201850b988f440
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 35
Assets/Plugins/Android/assets/Shader/MeshVertShader.vsh

@@ -1,35 +0,0 @@
-attribute highp   vec3  inVertex;
-attribute mediump vec3  inNormal;
-attribute mediump vec2  inTexCoord;
-
-
-
-uniform highp   mat4  MVPMatrix;
-uniform mediump vec2 TexCoordMove; 
-
-varying mediump vec2   TexCoord;
-
-
-void main()
-{
-	highp vec4 vPos = vec4(0,0,0,1);
-	
-	vPos.x = ( inTexCoord.x * 2.0 - 1.0 );
-	vPos.y = ( inTexCoord.y * 2.0 - 1.0 );
-	
-	gl_Position = vPos;
-
-	// Pass through texcoords
-	//inTexCoord.x += TexCoordMove.x;
-	
-	
-	 mediump vec4 vec4Temp  = vec4(inTexCoord.x - TexCoordMove.x,inTexCoord.y - TexCoordMove.y,0,1.0);
-	 vec4Temp  = MVPMatrix * vec4Temp;
-	 
-	 vec4Temp.xyz = vec4Temp.xyz / vec4Temp.w;
-	 TexCoord = vec4Temp.xy; 
-	 
-
-	//TexCoord = inTexCoord;
-	
-}

+ 0 - 6
Assets/Plugins/Android/assets/Shader/MeshVertShader.vsh.meta

@@ -1,6 +0,0 @@
-fileFormatVersion: 2
-guid: 425cdd00884a5894b934e1b27b91645b
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/Android/libs.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 46b285a33bad2b64a80d08f75b9bd174
-folderAsset: yes
-timeCreated: 1464875204
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Assets/Plugins/Android/libs/arm64-v8a.meta

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

BIN
Assets/Plugins/Android/libs/arm64-v8a/libBlueDoveMediaRender.so


+ 0 - 32
Assets/Plugins/Android/libs/arm64-v8a/libBlueDoveMediaRender.so.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: ce287640cc454eb40bb0696f1f24cb6a
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings:
-        CPU: ARM64
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/Android/libs/armeabi-v7a.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: cbadc7fba8ced61469bc7afecba5ea40
-folderAsset: yes
-timeCreated: 1464875204
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Plugins/Android/libs/armeabi-v7a/libBlueDoveMediaRender.so


+ 0 - 22
Assets/Plugins/Android/libs/armeabi-v7a/libBlueDoveMediaRender.so.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 5a097070b68af32408a77884d8327427
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings:
-        CPU: ARMv7
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Plugins/Android/libs/x86.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f0728e3dee5bd1d4896f0a8df865c8d3
-folderAsset: yes
-timeCreated: 1464875204
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Plugins/Android/libs/x86/libBlueDoveMediaRender.so


+ 0 - 22
Assets/Plugins/Android/libs/x86/libBlueDoveMediaRender.so.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: e9d9f31f51f86b84fa7d50484d5cda96
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings:
-        CPU: x86
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Plugins/Android/zip_file.jar


+ 0 - 21
Assets/Plugins/Android/zip_file.jar.meta

@@ -1,21 +0,0 @@
-fileFormatVersion: 2
-guid: 5b66cd6595c88da4293dfe25a26847b8
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings: {}
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 20 - 121
Assets/Resources/Warning/WarningPopUp.prefab

@@ -1,50 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1363123130180002313
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2800013769068192779}
-  - component: {fileID: 6045897137272916022}
-  m_Layer: 5
-  m_Name: TMP SubMeshUI [WR SDF Material + LiberationSans SDF Atlas]
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2800013769068192779
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1363123130180002313}
-  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: 5559633863180776534}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6045897137272916022
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1363123130180002313}
-  m_CullTransparentMesh: 0
 --- !u!1 &2160148988178575977
 GameObject:
   m_ObjectHideFlags: 0
@@ -252,7 +207,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2993629249426603709
 RectTransform:
   m_ObjectHideFlags: 0
@@ -321,7 +276,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5559633863180776534}
   - component: {fileID: 1015603532000856430}
-  - component: {fileID: 9120909425996827788}
+  - component: {fileID: 6371093350515047528}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -340,14 +295,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2800013769068192779}
+  m_Children: []
   m_Father: {fileID: 2160148988178575978}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 21.86, y: 1.1}
+  m_AnchoredPosition: {x: 0, y: 1.1}
   m_SizeDelta: {x: 178.42, y: 43.82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1015603532000856430
@@ -358,7 +312,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7734845245197674011}
   m_CullTransparentMesh: 0
---- !u!114 &9120909425996827788
+--- !u!114 &6371093350515047528
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -367,7 +321,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7734845245197674011}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -378,72 +332,17 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Save Fail
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4279196915
-  m_fontColor: {r: 0.9528302, g: 0.36229077, b: 0.05842829, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 16
-  m_fontSizeBase: 16
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 1
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 1
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0.67483616, y: 0, z: 0.2699118, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4FDD\u5B58\u6210\u529F"

+ 57 - 0
Assets/bianpao.cs

@@ -0,0 +1,57 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class bianpao : MonoBehaviour
+{
+    public float benjin = 100000;
+    public float gailv = 50;
+
+    public float zhouqi = 10000;
+
+    public float zongtouru = 0;
+
+    public float yinkui = 0;
+
+    public int xunhuan = 0;
+    public void Start()
+    {
+        zongtouru = benjin;
+    }
+
+    public void nextzhou()
+    {
+
+        for (int i = 0; i < xunhuan; i++)
+        {
+
+            bool zf = false;
+            int gl = Random.Range(-1, 100);
+            if (gailv >= gl)
+            {
+                zf = true;
+            }
+
+            float gl2 = Random.Range(-1f, 10f);
+            gl2 = zf ? gl2 / 100 : -gl2 / 100;
+            benjin = benjin + benjin * gl2;
+
+            if (!zf)
+            {
+
+                zongtouru = zongtouru + zhouqi;
+                benjin = benjin + zhouqi;
+            }
+            else
+            {
+
+                zongtouru = zongtouru - zhouqi;
+                benjin = benjin - zhouqi;
+
+            }
+
+            yinkui = (benjin - zongtouru) / benjin;
+
+        }
+    }
+}

+ 11 - 0
Assets/bianpao.cs.meta

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

+ 2 - 2
Packages/manifest.json

@@ -19,10 +19,10 @@
     "com.unity.xr.arkit-face-tracking": "4.2.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.immersalsdk.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/ImmersalSDK.git#ImmersalSDK_Nreal",
+    "jh.immersalsdk.engine": "file:/Users/hujiajun/ghz/ImmersalSDK",
     "jh.opencvforunity.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/OpenCVForUnity.git",
     "jh.trilib.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/TriLibXR.git",
-    "jh.xr.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
+    "jh.xr.engine": "file:/Users/hujiajun/ghz/GHZSDKXR",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 6 - 8
Packages/packages-lock.json

@@ -280,15 +280,14 @@
       "url": "https://packages.unity.com"
     },
     "jh.immersalsdk.engine": {
-      "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/ImmersalSDK.git#ImmersalSDK_Nreal",
+      "version": "file:/Users/hujiajun/ghz/ImmersalSDK",
       "depth": 0,
-      "source": "git",
+      "source": "local",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
-      },
-      "hash": "12e268d7733ff732984a15a792f2bd2dc666915a"
+      }
     },
     "jh.opencvforunity.engine": {
       "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/OpenCVForUnity.git",
@@ -309,15 +308,14 @@
       "hash": "0124fefeb16d355c5f4affd25cfad240e7ef0f2d"
     },
     "jh.xr.engine": {
-      "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
+      "version": "file:/Users/hujiajun/ghz/GHZSDKXR",
       "depth": 0,
-      "source": "git",
+      "source": "local",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
-      },
-      "hash": "3fea32e6b476d1263feb964f80debcfa5e4a32e1"
+      }
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -841,7 +841,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: VUFORIA_ANDROID_SETTINGS;UNITY_CCU;CURVEDUI_TMP;TRILIB_ENABLE_DAE_IMPORT;TRILIB_FORCE_SYNC;TRILIB_ENABLE_UWP_THREADS;TRILIB_DRACO;ISLOCAL
+    Android: VUFORIA_ANDROID_SETTINGS;UNITY_CCU;CURVEDUI_TMP;TRILIB_ENABLE_DAE_IMPORT;TRILIB_FORCE_SYNC;TRILIB_ENABLE_UWP_THREADS;TRILIB_DRACO
     Standalone: 
     Windows Store Apps: VUFORIA_WSA_SETTINGS
     iPhone: VUFORIA_IOS_SETTINGS
@@ -938,6 +938,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -950,7 +951,6 @@ PlayerSettings:
       InternetClientServer: False
       VideosLibrary: False
       Objects3D: False
-      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -972,9 +972,9 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       Proximity: False
+      InternetClient: True
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      EnterpriseAuthentication: False
   metroTargetDeviceFamilies: {}
   metroFTAName: 
   metroFTAFileTypes: []

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません