android端发布前微调

.gitignore

@@ -94,6 +94,9 @@ GPUCache
 Assets/Shatalmic/plugin.unitypackage.meta
 .idea
 Assets/AVProVideo
+Assets/StreamingAssets/AVProVideoSamples
+Assets/StreamingAssets/AVProVideoSamples.meta
+Assets/StreamingAssets
 Assets/FacebookSDK
 Assets/StreamingAssets
 Assets/Models/MC_animations
@@ -101,3 +104,6 @@ Assets/Models/MC_max
 Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset
 Assets/FacebookSDK/SDK/Resources/FacebookSettings.asset
 Assets/AVProVideo.meta
+Packages
+Assets/Tree_Textures.meta
+Packages

Assets/LongMessageScript.cs

@@ -1,4 +1,5 @@
-using DG.Tweening;
+using Assets.Scripts;
+using DG.Tweening;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -22,51 +23,50 @@ public class LongMessageScript : MonoBehaviour
     {
 
     }
-    float timer = 2;
+    float timer = 1;
     public float? textWidth = null;
     private bool isAnimated = false;
+    Transform content;
     public void Initial(string txt)
     {
-        var txtTransform = transform.Find("TextContainer/Content");
+        content = transform.Find("TextContainer/Content");
-        txtTransform.GetComponent<Text>().text = txt;
+        content.GetComponent<Text>().text = txt;
-        LayoutRebuilder.ForceRebuildLayoutImmediate(txtTransform.GetComponent<RectTransform>());
+        LayoutRebuilder.ForceRebuildLayoutImmediate(content.GetComponent<RectTransform>());
-        txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
+        content.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
         isAnimated = false;
         timer = 2;
     }
     float playtime = 0;
+    float speed = 10f;
+    float datatimer = 300f;
 #if UNITY_STANDALONE_WIN
     float maxWidth = 1087;
 #else
     float maxWidth = 350;
 #endif
+
+    private bool animating = false;
     // Update is called once per frame
     void Update()
     {
+        //动画
         timer -= Time.deltaTime;
         if (timer <= 0)
         {
-            var width = transform.Find("TextContainer/Content").GetComponent<RectTransform>().sizeDelta.x;
+            if (animating)
-            if (textWidth != width) 
+                return;
-            {
+            var currentWith = ((RectTransform)content).rect.width;
-                this.textWidth = width;
+
-            }
+            animating = true;
-            //do
+            var wait = Mathf.Max(Mathf.Floor(currentWith / speed), 2f);
-            if (textWidth.HasValue)
+
-            {
+            var tween = content.DOLocalMoveX(-currentWith, wait).SetEase(Ease.Linear);
-                var offset = textWidth.Value;
+            tween.onComplete += () => {
-                var game = transform.Find("TextContainer/Content");
+                //初始化位置
-                var v = 20 / 0.3f;
+                content.transform.localPosition = new Vector3(maxWidth, 0, 0);
-                playtime = offset / v;
+                animating = false;
-                //匀速播放
+            };
-                game.DOLocalMoveX(startX - offset, playtime).onComplete
+            datatimer += 5f;
-                    = () => 
-                    {
-                        var txtTransform = transform.Find("TextContainer/Content");
-                        txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y);
-                    };
-            }
-            timer += (playtime + 0.5f);
         }
     }
     void returnAni()

Assets/Models/MC_animations/animations.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a1e43bb033650884fa2d63c2b3705140
+guid: a9ab0c778dcfcb346b5e6d8f2c0beff4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab

@@ -94,7 +94,7 @@ RectTransform:
   - {fileID: 6085868649272925420}
   - {fileID: 6069148929894531044}
   m_Father: {fileID: 5111540946519637648}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -246,6 +246,266 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!1 &3511851900551312009
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5084285991598898290}
+  - component: {fileID: 3350419339364523282}
+  - component: {fileID: 9132821006707307989}
+  - component: {fileID: 248328982109218136}
+  m_Layer: 5
+  m_Name: Text (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5084285991598898290
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3511851900551312009}
+  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_Children: []
+  m_Father: {fileID: 2276712436942977009}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.42, y: -42}
+  m_SizeDelta: {x: 487.94348, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3350419339364523282
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3511851900551312009}
+  m_CullTransparentMesh: 0
+--- !u!114 &9132821006707307989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3511851900551312009}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: Please make sure the device is powered on and awakened
+--- !u!114 &248328982109218136
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3511851900551312009}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
+--- !u!1 &3676862961734695485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2276712436942977009}
+  - component: {fileID: 1582482539964428320}
+  - component: {fileID: 713547944254549228}
+  m_Layer: 5
+  m_Name: Error
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2276712436942977009
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3676862961734695485}
+  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_Children:
+  - {fileID: 4510268157665608170}
+  - {fileID: 5084285991598898290}
+  m_Father: {fileID: 5111540946519637648}
+  m_RootOrder: 0
+  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: -4.600006, y: 25.800003}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1582482539964428320
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3676862961734695485}
+  m_CullTransparentMesh: 0
+--- !u!114 &713547944254549228
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3676862961734695485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 23324df2738e17840a880b3a6a667a98, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3801269395900302017
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4510268157665608170}
+  - component: {fileID: 754022446696266723}
+  - component: {fileID: 1220032410243128616}
+  - component: {fileID: 5473348149231437577}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4510268157665608170
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3801269395900302017}
+  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_Children: []
+  m_Father: {fileID: 2276712436942977009}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -16}
+  m_SizeDelta: {x: 192, y: 26}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &754022446696266723
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3801269395900302017}
+  m_CullTransparentMesh: 0
+--- !u!114 &1220032410243128616
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3801269395900302017}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: NO DEVICE
+--- !u!114 &5473348149231437577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3801269395900302017}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: 
 --- !u!1 &3878003491430181822
 GameObject:
   m_ObjectHideFlags: 0
@@ -1329,6 +1589,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2276712436942977009}
   - {fileID: 2253444633616264453}
   m_Father: {fileID: 8260988677505792498}
   m_RootOrder: 3

Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab

@@ -2358,9 +2358,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'Average Slope
+  m_Text: Average Slope
-
-'
 --- !u!114 &709734528897680087
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/Panel/ActivityAdPanel.prefab

@@ -737,7 +737,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Resources/UI/Prefab/Panel/Mobile/ActivityAdPanel.prefab

@@ -737,7 +737,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Resources/UI/Prefab/Ride/Panel.prefab

@@ -814,10 +814,10 @@ RectTransform:
   m_Father: {fileID: 765892905722509247}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 30, y: 0}
-  m_SizeDelta: {x: 0, y: 22}
+  m_SizeDelta: {x: 10, y: 22}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &765892904885005464
 CanvasRenderer:
@@ -6433,7 +6433,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -136, y: 162.49998}
-  m_SizeDelta: {x: 272, y: 0}
+  m_SizeDelta: {x: 272, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &765892905338139661
 MonoBehaviour:
@@ -10140,7 +10140,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -20, y: -42}
-  m_SizeDelta: {x: 0, y: 22}
+  m_SizeDelta: {x: 30, y: 22}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &765892905722509241
 MonoBehaviour:
@@ -13196,7 +13196,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &765892906023544648
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15523,9 +15523,9 @@ RectTransform:
   m_Father: {fileID: 765892905722509247}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 10, y: -11}
   m_SizeDelta: {x: 20, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &765892906267196362
@@ -25209,7 +25209,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8549018679981657489}
+  - {fileID: 8114426001779768535}
   - {fileID: 3591901196367126761}
   m_Father: {fileID: 765892906030958096}
   m_RootOrder: 3
@@ -25555,84 +25555,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: 
---- !u!1 &3075987232541714798
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3694918533359065793}
-  - component: {fileID: 8364613527472133658}
-  - component: {fileID: 19063464151113989}
-  - component: {fileID: 8952758982009149639}
-  m_Layer: 5
-  m_Name: Lines
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3694918533359065793
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075987232541714798}
-  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_Children: []
-  m_Father: {fileID: 3871394633124702465}
-  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_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &8364613527472133658
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075987232541714798}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!222 &19063464151113989
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075987232541714798}
-  m_CullTransparentMesh: 0
---- !u!114 &8952758982009149639
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3075987232541714798}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  Thickness: 4
 --- !u!1 &3099866506288012949
 GameObject:
   m_ObjectHideFlags: 0
@@ -26219,109 +26141,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: 
---- !u!1 &3537653414625576574
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3871394633124702465}
-  - component: {fileID: 4000142723929418597}
-  - component: {fileID: 7262479824823150357}
-  - component: {fileID: 1030392325987976435}
-  - component: {fileID: 5853403825487318073}
-  m_Layer: 5
-  m_Name: RectMask(Clone)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3871394633124702465
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3537653414625576574}
-  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_Children:
-  - {fileID: 3694918533359065793}
-  - {fileID: 2614412552366794739}
-  m_Father: {fileID: 8549018679981657489}
-  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: 88}
-  m_SizeDelta: {x: 1542, y: 88}
-  m_Pivot: {x: 0, y: 1}
---- !u!114 &4000142723929418597
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3537653414625576574}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0
---- !u!222 &7262479824823150357
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3537653414625576574}
-  m_CullTransparentMesh: 0
---- !u!114 &1030392325987976435
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3537653414625576574}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5853403825487318073
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3537653414625576574}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &3591901196157647153
 GameObject:
   m_ObjectHideFlags: 0
@@ -26970,6 +26789,84 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &4000886959473034618
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6926331801272995026}
+  - component: {fileID: 8418395580626646040}
+  - component: {fileID: 814544509977506445}
+  - component: {fileID: 6900790818799103908}
+  m_Layer: 5
+  m_Name: Lines
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6926331801272995026
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4000886959473034618}
+  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_Children: []
+  m_Father: {fileID: 9193403737532664630}
+  m_RootOrder: 1
+  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_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8418395580626646040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4000886959473034618}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!222 &814544509977506445
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4000886959473034618}
+  m_CullTransparentMesh: 0
+--- !u!114 &6900790818799103908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4000886959473034618}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  Thickness: 2
 --- !u!1 &4192129661743811864
 GameObject:
   m_ObjectHideFlags: 0
@@ -28088,7 +27985,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
---- !u!1 &5564064332382454106
+--- !u!1 &5694774901869735929
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -28096,8 +27993,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8549018679981657489}
+  - component: {fileID: 8114426001779768535}
-  - component: {fileID: 3423552543996963677}
+  - component: {fileID: 1156779043549724470}
   m_Layer: 0
   m_Name: New Game Object
   m_TagString: Untagged
@@ -28105,19 +28002,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8549018679981657489
+--- !u!224 &8114426001779768535
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5564064332382454106}
+  m_GameObject: {fileID: 5694774901869735929}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1}
   m_Children:
-  - {fileID: 3871394633124702465}
+  - {fileID: 9193403737532664630}
-  - {fileID: 567942056506869371}
+  - {fileID: 4245466416346911936}
   m_Father: {fileID: 2877296740073624297}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -28126,19 +28023,19 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1542, y: 88}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3423552543996963677
+--- !u!114 &1156779043549724470
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5564064332382454106}
+  m_GameObject: {fileID: 5694774901869735929}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &6094079271033004157
+--- !u!1 &6319512440116008240
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -28146,61 +28043,101 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 567942056506869371}
+  - component: {fileID: 9193403737532664630}
-  - component: {fileID: 6011351313382958003}
+  - component: {fileID: 6396573189645668369}
-  - component: {fileID: 886396440819218481}
+  - component: {fileID: 4568840319039725425}
+  - component: {fileID: 5361332186553637106}
+  - component: {fileID: 6324088958277473080}
   m_Layer: 5
-  m_Name: textController
+  m_Name: RectMask(Clone)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &567942056506869371
+--- !u!224 &9193403737532664630
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6094079271033004157}
+  m_GameObject: {fileID: 6319512440116008240}
   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_Children: []
+  m_Children:
-  m_Father: {fileID: 8549018679981657489}
+  - {fileID: 7786485683688515923}
-  m_RootOrder: 1
+  - {fileID: 6926331801272995026}
+  m_Father: {fileID: 8114426001779768535}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -771, y: -44}
+  m_AnchoredPosition: {x: 0, y: 88}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 1542, y: 88}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
---- !u!114 &6011351313382958003
+--- !u!114 &6396573189645668369
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6094079271033004157}
+  m_GameObject: {fileID: 6319512440116008240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!222 &4568840319039725425
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319512440116008240}
+  m_CullTransparentMesh: 0
+--- !u!114 &5361332186553637106
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319512440116008240}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6324088958277473080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319512440116008240}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &886396440819218481
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6094079271033004157}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Camera: {fileID: 0}
-  PlaneDistance: 20
 --- !u!1 &6653291467032316143
 GameObject:
   m_ObjectHideFlags: 0
@@ -28463,6 +28400,84 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &6825177969333175903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7786485683688515923}
+  - component: {fileID: 7603423084146976147}
+  - component: {fileID: 3617563644843539539}
+  - component: {fileID: 3226606896982451350}
+  m_Layer: 5
+  m_Name: Lines
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7786485683688515923
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825177969333175903}
+  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_Children: []
+  m_Father: {fileID: 9193403737532664630}
+  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_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7603423084146976147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825177969333175903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!222 &3617563644843539539
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825177969333175903}
+  m_CullTransparentMesh: 0
+--- !u!114 &3226606896982451350
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825177969333175903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  Thickness: 4
 --- !u!1 &6885174058740936923
 GameObject:
   m_ObjectHideFlags: 0
@@ -28570,84 +28585,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   key: 
---- !u!1 &6906562334060751214
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2614412552366794739}
-  - component: {fileID: 5703099670693099964}
-  - component: {fileID: 4680310398977077456}
-  - component: {fileID: 6165029926963759066}
-  m_Layer: 5
-  m_Name: Lines
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2614412552366794739
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6906562334060751214}
-  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_Children: []
-  m_Father: {fileID: 3871394633124702465}
-  m_RootOrder: 1
-  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_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &5703099670693099964
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6906562334060751214}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!222 &4680310398977077456
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6906562334060751214}
-  m_CullTransparentMesh: 0
---- !u!114 &6165029926963759066
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6906562334060751214}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  Thickness: 2
 --- !u!1 &6995211675033818181
 GameObject:
   m_ObjectHideFlags: 0
@@ -30773,6 +30710,69 @@ MonoBehaviour:
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
+--- !u!1 &7663819453709184172
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4245466416346911936}
+  - component: {fileID: 7207738168889598605}
+  - component: {fileID: 5430980719993386703}
+  m_Layer: 5
+  m_Name: textController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4245466416346911936
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7663819453709184172}
+  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_Children: []
+  m_Father: {fileID: 8114426001779768535}
+  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: -771, y: -44}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7207738168889598605
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7663819453709184172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &5430980719993386703
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7663819453709184172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Camera: {fileID: 0}
+  PlaneDistance: 20
 --- !u!1 &7664492388540968627
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/UI/direction.txt

@@ -1,51 +1,61 @@
-113:16.4,0,0,-1,3,45
+10:10,-5,0,-,-,-
-268:-2.8,0,0.7550681,-1,4.069226,45
+243:-15,10,0,-,-,-
-298:-17.2,6.1,0.4818666,-1,4.246056,45
+250:-2,0,0.1980198,-1,3,0.346829
-372:-28,5.6,-0.4048006,-1,3.479697,45
+312:-15,10,0.5903499,-1,4.181554,0.346829
-429:-24,5.6,-0.9346578,-1,5.473352,45
+656:-3.2,0.8,0.5766783,-1,3.424655,0.346829
-547:-21.2,5.6,-0.2429728,-1,3.972845,45
+849:30,-10,2,-,-,-
-611:-12.4,1.1,-0.32109,-1,4.237999,45
+853:15.6,-3.2,1.724637,-1,3,0.346829
-749:1.8,1.1,0.7453919,-1,3.78505,45
+902:29.4,-9,1.548859,-1,3,0.346829
-817:7,1.1,1.333951,-1,3.931795,45
+937:39.2,-9,1.886684,-1,3,0.346829
-864:21,-5.1,1.333951,-1,3.931795,45
+1055:15,-15,1,-,-,-
-898:32.2,-11.6,2.157078,-1,3.931795,45
+1100:10,0,0,-,-,-
-1044:30.2,-11.6,2.88893,-1,3.598711,45
+1220:10,5,0,-,-,-
-1093:22.8,-2.3,2.180352,-1,3.786387,45
+1330:-10,5,0,-,-,-
-1135:18.4,0.5,2.315585,-1,4.375738,45
+1899:5,-5,1,-,-,-
-1264:8.6,5.7,1.755207,-1,3.704368,45
+1925:10,-5,1,-,-,-
-1344:-6.2,0,0.9801137,-1,3.537684,45
+2524:-5,5,1,-,-,-
-1547:-22.6,6.1,0.8330526,-1,3.407704,45
+2960:10,-5,1,-,-,-
-1714:-19.4,5.2,0.6406997,-1,3.9143,45
+3120:15,-5,0,-,-,-
-1843:-7.2,-2,0.9479414,-1,4.46124,45
+3300:5,5,0,-,-,-
-1948:9,-2,1.416687,-1,4.631541,45
+3555:-10,5,0,-,-,-
-2349:5.6,1.4,1.416687,-1,4.631541,45
+3967:-10,5,1,-,-,-
-2463:-7.6,6.7,1.182605,-1,3.425815,45
+4483:10,-5,1,-,-,-
-2640:-7.6,6.7,0.5427184,-1,3.291988,45
+4590:15,-5,1,-,-,-
-2959:5.2,-0.8,0.5427184,-1,3.291988,45
+4817:-5,0,1,-,-,-
-3045:14.2,0,0.7456276,-1,3.291988,45
+5191:5,0,1,-,-,-
-3324:3.6,0,0.7773573,-1,3.291988,45
+5279:10,0,1,-,-,-
-3519:-1.6,0,0.422653,-1,4.233258,45
+5327:-29.2,14.6,1,-1,3,0.103382
-3634:-14.6,0,-0.4799475,-1,4.233258,45
+5347:6.182,0,0.8091168,-1,3,0.103382
-3777:-4.8,0,0.09549108,-1,4.030807,45
+5630:-10,0,0,-,-,-
-3866:0,0,0,-1,3,45
+6551:7,-3.5,0.437785,-1,3,0.2581649
-4013:-15.6,0,0.09549108,-1,4.030807,45
+6578:5,-5,0,-,-,-
-4329:-7,0,0.3505953,-1,4.030807,45
+6650:5,-5,0.5274182,-1,4.056354,0.2581649
-4435:0,0,0.7336217,-1,3,45
+6722:5,-5,1.109839,-1,4.776485,0.2581649
-4545:15,-6.4,0.979607,-1,3.860944,45
+6746:9.6,-4.8,0.6498283,-1,3.204519,0.1984781
-4645:25,-5.9,1.752236,-1,3.860944,45
+7838:5,-5,1,-,-,-
-4817:8.8,2.5,1.175218,-1,3.860944,45
+7919:15,0,1,-,-,-
-5008:-10.2,0,-0.082,-1,3.861,45
+8258:7.6,-3.8,0.3524806,-1,3,0.0379531
-5142:-0.4,0,0.253,-1,4.01,45
+8471:10,0,1,-,-,-
-5232:9.6,0,0.606,-1,3,45
+9343:0.208,0.816,0.5723592,-1,3,0.1984781
-5303:19.6,0.9,1.166,-1,3.345,45
+9498:-2,1,0.8148468,-1,3,0.2581649
-5596:2.2,0,0.606,-1,3,45
+9536:-5,0,0,-,-,-
-5641:-4.8,5.3,0.605,-1,3.172,45
+9605:-10,0,0,-,-,-
-6252:-4.8,-1.6,0.605,-1,3.172,45
+9819:-5.4,2.7,0,-1,3,0.2581649
-6606:2.2,-0.9,0.707,-1,3.172,45
+10012:-0.8,0.4,0.03605918,-1,2.8166,0.0379531
-6875:6.2,-3.5,0.707,-1,3.172,45
+10123:5,0,0,-,-,-
-7276:7.8,-3.9,1.409,-1,4.114,45
+10396:7.8,-3.9,0.3329708,-1,3,0.2581649
-7662:-5,2.5,0.677,-1,4.114,45
+10500:-5,0,0,-,-,-
-7859:9.4,0,0.677,-1,4.114,45
+10546:3,-1.5,0,-1,3,0.2581649
-7927:14.6,0,1.215,-1,3,45
+10807:5,0,0,-,-,-
-8070:7.8,5,1.215,-1,3,45
+10834:15,-5,1,-,-,-
-9037:-5,5,0.519,-1,3,45
+10989:18.6,-9.3,0.3640011,-1,3,0.1984781
+11033:5,-5,1,-,-,-
+11348:8.6,-4.3,0,-1,3,0.2581649
+11400:5,-5,1,-,-,-
+11528:5,0,1,-,-,-
+11734:-5,0,0,-,-,-
+11956:8.400001,-4.2,0,-1,3,0.2581649
+12170:-25,5,0,-,-,-
+12244:-25,12.5,0,-1,3,0.2566484
+12381:0.6,-0.3,-0.2828478,-1,4.114982,0.1984781
+12604:1.6,-0.8,0,-1,3,0.2566484

Assets/Scenes/MainScene.unity

@@ -138,7 +138,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &43982090
 RectTransform:
   m_ObjectHideFlags: 0
@@ -365,92 +365,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 154299661}
   m_CullTransparentMesh: 0
---- !u!21 &197542326
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
 --- !u!1 &273807000
 GameObject:
   m_ObjectHideFlags: 0
@@ -1053,7 +967,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
---- !u!21 &981288972
+--- !u!21 &1232598253
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -1138,7 +1052,7 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 50, g: 50, b: 50, a: 0}
+    - _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
 --- !u!1 &1378474435
 GameObject:
   m_ObjectHideFlags: 0
@@ -1441,6 +1355,92 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1426339558}
   m_PrefabAsset: {fileID: 0}
+--- !u!21 &1455036627
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RoundedCornersTextureMaterial(Clone)
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Height: 50
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Radius: 15
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _Width: 50
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _WidthHeightRadius: {r: 50, g: 50, b: 50, a: 0}
 --- !u!1 &1565405865 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,

Assets/Scripts/Scenes/MainController.cs

@@ -309,25 +309,25 @@ public class MainController : BaseScene
         //{
         //    UIManager.ShowHomePanel();
         //});
-#if UNITY_ANDROID || UNITY_IOS
+//#if UNITY_ANDROID || UNITY_IOS
 
-        #region 划船机功能：隐藏骑行
+//        #region 划船机功能：隐藏骑行
-        UIManager.ShowRowerPanel();
+//        UIManager.ShowRowerPanel();
-        return;
+//        return;
-        #endregion
+//        #endregion
-        if (!App.IsRowerMode.HasValue)
+//        if (!App.IsRowerMode.HasValue)
-        {
+//        {
-            UIManager.ShowHomePanel();
+//            UIManager.ShowHomePanel();
-            UIManager.ShowRowerSelector();
+//            UIManager.ShowRowerSelector();
-            return;
+//            return;
-        }
+//        }
-        if (App.IsRowerMode == true)
+//        if (App.IsRowerMode == true)
-        {
+//        {
-            UIManager.ShowHomePanel();
+//            UIManager.ShowHomePanel();
-            UIManager.ShowRowerPanel();
+//            UIManager.ShowRowerPanel();
-            return;
+//            return;
-        }
+//        }
-#endif
+//#endif
         LastRide();//检查本地异常中断的骑行并弹窗提示继续
         if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
         {

Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs

@@ -291,6 +291,9 @@ namespace Assets.Scenes.Ride.Scripts
 			//计算当前海拔和坡度&当前区间距离
 			elevation = pointList[CurrentIndex].Elevation;
 			currentSlope = pointList[CurrentIndex].Grade;
+			//格式化坡度最大不能超过15，-15
+			PreSlope = PreSlope > 0 ?Math.Min(PreSlope, 15) : Math.Max(PreSlope, -15);
+			currentSlope = currentSlope > 0? Math.Min(PreSlope, 15) : Math.Max(PreSlope, -15);
 			CurrentDistance = pointList[CurrentIndex].Distance;
 			//计算下一个海拔和坡度&当前区间距离
 			nextSlope = pointList[nextIndex].Grade;

Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs

@@ -148,22 +148,12 @@ namespace Assets.Scenes.Ride.Scripts
 			DrawMapRouteAsync(route.Id);
 			AddProcess(10);
 			//查询排行榜 
-			var list = mapApi.GetRouteRanking(route.Id, "1", 0, 10000, "");
+			var list = mapApi.GetRouteRanking(route.Id, "1", 0, 8, "");
 			if (list.result)
 			{
-				//if (list.data.list.Count > RankingPageSize)
-				//{
-				//	var ViewAll = panel.transform.Find("ViewAll").gameObject;
-				//	ViewAll.SetActive(true);
-				//	UIManager.AddEvent(ViewAll, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
-				//	{
-				//		Application.OpenURL($"{App.CurrentUser.WebHost}Routes/{cyclingController.mapRoute.Id}?Token={App.CurrentUser.cookie}");
-				//	});
-				//}
 				CreateRankingList(list.data.list);
 				AddProcess(10);
 			}
-			//StartCoroutine(HiddenLoading());
 		}
 
 		//创建排行榜

Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs

@@ -335,7 +335,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             }
         }
         //显示人物海拔图的头像
-        public void CreateHeadImage() 
+        protected virtual void CreateHeadImage() 
         {
             if (head == null)
             {

Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs

@@ -96,6 +96,12 @@ namespace Assets.Scripts.Scenes.VideoRide
         {
             base.ComputeVideo();
         }
+        protected override void CreateHeadImage()
+        {
+            base.CreateHeadImage();
+            if (diff < 0)
+                ((RectTransform)head.transform).anchoredPosition = new Vector2(((RectTransform)head.transform).anchoredPosition.x, -800f);
+        }
 
         //设置当前玩家属性
         public void SetPlayer(string name, double distance, double totalDistance, double cadance,double heartRate, double wkg, int userId,double power,double currentPlayerDistance,int frame)

Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs

@@ -128,7 +128,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             recorderData.PreDistance = Math.Round(preDistance, 6, MidpointRounding.AwayFromZero);
             recorderData.EndDistance = Math.Round(targetData._Distance, 6, MidpointRounding.AwayFromZero);
             recorderData.RiderDatas.Add(targetData);
-
+            //默认启用多圈
             //if (totalDistance >= mapData.TotalDistance)
             //{
             //    start = false;

Assets/Scripts/UI/Prefab/Activity/ActivityController.cs

@@ -196,7 +196,9 @@ public class ActivityController : PFUIPanel
     {
         CancelInvoke("StartPageFunc");
         Close();
-        //webView.LoadHTMLString("<div style=\"background:#23232d\" />", this.url);
+#if !UNITY_STANDALONE_WIN
+        webView.LoadHTMLString("<div style=\"background:#23232d\" />", this.url);
+#endif
         //Destroy(gameObject);
         //UIManager.Instance.mActivityController = null;
     }

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs

@@ -53,7 +53,9 @@ public class ConnectDeviceModal : PFUIPanel
         deviceList = new Dictionary<string, DeviceItem>();
 
         var container = this.transform.Find("GameObject");
+
         deviceNotFound = container.Find("Panel/Error").gameObject;
+     
         var closeBtn = container.Find("CloseBtn");
         Logo = container.Find("Logo").GetComponent<Image>();
         Title = container.Find("Title").GetComponent<Text>();
@@ -261,7 +263,9 @@ public class ConnectDeviceModal : PFUIPanel
             //如果没有可连接的设备按钮只读
             connectBtn.mButton.enabled = deviceList.Count > 0;
             connectBtn.mButton.interactable = deviceList.Count > 0;
+
             deviceNotFound.SetActive(deviceList.Count <= 0);
+
         }   
     }
     //选中需要连接的设备

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -151,13 +151,43 @@ public class DeviceView : MonoBehaviour
             {
                 return;
             }
-            mDisconnectButtonClick();
+            var device = GetDevice();
+            if (device != null && device.State == DeviceState.Connected)
+            {
+                UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Disconnect the device?"), () =>
+                {
+                    device.Disconnect(false);
+                    DeviceCache.Remove(device);
+                    UIManager.CloseConfirm();
+                }, 2, () => {
+                    UIManager.CloseConfirm();
+                });
+            }
+            else
+            {
+                mDisconnectButtonClick();
+            }
         }));
 #endif
 
 
         UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
+#if UNITY_IOS || UNITY_ANDROID
+            var device = GetDevice();
+            if (device != null && device.State == DeviceState.Connected)
+            {
+                UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Disconnect the device?"), () =>
+                {
+                    device.Disconnect(false);
+                    DeviceCache.Remove(device);
+                    UIManager.CloseConfirm();
+                }, 2, () => {
+                    UIManager.CloseConfirm();
+                });
+            }
+#else
             mDisconnectButtonClick();
+#endif
         }));
 
     }
@@ -280,8 +310,6 @@ public class DeviceView : MonoBehaviour
 
             logo.sprite = sprite0;
            
-            searchState.text = App.GetLocalString("Searching...");
-
             var hasDevice = false;
             if (SensorType == SensorType.SpeedCadence) {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType.SpeedCadence || d.Sensor == SensorType.Cadence);
@@ -289,8 +317,10 @@ public class DeviceView : MonoBehaviour
             else {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
             }
-            noDevice.text = hasDevice? App.GetLocalString("CHOOSE DEVICE") : App.GetLocalString("NO DEVICE");
+
-            //Debug.Log(hasDevice);
+            searchState.text = hasDevice ? App.GetLocalString("CHOOSE DEVICE") : App.GetLocalString("NO DEVICE");
+            noDevice.text = "";// App.GetLocalString("NOCONN DEVICE"); //hasDevice ? App.GetLocalString("CHOOSE DEVICE") : ;
+
             if (hasDevice)
             {
                 mSearchButton.SetActive(false);

Assets/Scripts/UI/Prefab/MainNav.cs

@@ -92,7 +92,7 @@ public class MainNav : MonoBehaviour
 
     private void ShowMailDot(object sender, EventArgs e)
     {
-        if (transform) 
+        if (transform!=null) 
         {
             transform.Find("Mail/Dot").gameObject.SetActive((bool)sender);
         }

Assets/Scripts/UI/Prefab/NewMainNav.cs

@@ -61,7 +61,7 @@ public class NewMainNav : MonoBehaviour
         this.custom = custom;
         this.custom2 = custom2;
         this.custom3 = custom3;
-        if (custom != null) 
+        if (custom != null)
         {
             transform.Find("Custom").GetComponent<Button>().onClick.RemoveAllListeners();
             transform.Find("Custom").GetComponent<Button>().onClick.AddListener(custom.action);

Assets/Scripts/UI/Prefab/Panel/BigMapController.cs

@@ -72,7 +72,7 @@ public class BigMapController : PFUIPanel
         StartCoroutine("Main");
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("Canvas/Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2,
+        nav.SetButtonActive(new List<int> { 2, 3, 6, 7 }, 2,
             custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/搜索"), () =>
             {
                 mapManager.Destroy();

Assets/Scripts/UI/Prefab/Panel/EarthController.cs

@@ -71,7 +71,7 @@ public class EarthController : PFUIPanel
 #if UNITY_ANDROID || UNITY_IOS
         SetRounded(panel.transform, 20);
         var nav = transform.Find("Canvas/Panel/Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2,
+        nav.SetButtonActive(new List<int> { 2, 3, 6, 7 }, 2,
             custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/搜索"), () =>
             {
                 UIManager.ShowNewRouteOverviewPanel();

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

@@ -46,6 +46,7 @@ public class HomeController : PFUIPanel
         {
             UIManager.ShowRowerSelector();
         },false));
+        nav.HideButton("Custom");
         newNav = nav;
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {

Assets/Scripts/UI/Prefab/Panel/MapListController.cs

@@ -103,7 +103,7 @@ public class MapListController : PFUIPanel
         map = Resources.Load<GameObject>("UI/Prefab/MapList/MapItem-Mobile");
         Debug.Log(98);
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0,
+        nav.SetButtonActive(new List<int> { 0, 3, 6, 7 }, 0,
             new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Mobile/map_筛选"), () =>
             {
                 OpenFilter(false);
@@ -585,4 +585,8 @@ public class MapListController : PFUIPanel
         GC.Collect();
         Debug.Log("list empty");
     }
+    protected override void OnDisable()
+    {
+        App.CurrentRouteType = "";
+    }
 }

Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs

@@ -87,7 +87,7 @@ public class NewRouteDetailController : PFUIPanel
         });
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0);
+        nav.SetButtonActive(new List<int> { 0, 3, 6, 7 }, 0);
         newNav = nav;
         
 #else

Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs

@@ -67,7 +67,7 @@ public class NewRouteOverviewController: PFUIPanel
         tmpItem = Resources.Load<Transform>("UI/Prefab/NewRoute/RouteItem");
 #else
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2,
+        nav.SetButtonActive(new List<int> { 2, 3, 6, 7 }, 2,
             new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/map_mode"),()=>
             {
                 UIManager.PopStack();

Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs

@@ -76,7 +76,7 @@ public class RaceHomeScript : RaceScript
 #else
         btnGoList = rightContainer.Find("BtnGoList");
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2);
+        nav.SetButtonActive(new List<int> { 2, 3,6, 7 }, 2);
         newNav = nav;
 #endif
         if (btnGoList != null) 

Assets/Scripts/UI/Prefab/Race/RaceListScript.cs

@@ -248,7 +248,7 @@ public class RaceListScript : RaceScript
             CloseFilter();
         });
         var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0,
+        nav.SetButtonActive(new List<int> { 0, 3, 6, 7 }, 0,
             custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Mobile/map_筛选"), () =>
             {
                 OpenFilter();

Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs

@@ -119,18 +119,19 @@ public class ResultListController : PFUIPanel
 #if UNITY_ANDROID || UNITY_IOS
         GetList(2);
 #endif
-        #region 划船机功能：隐藏骑行记录
+        btnRower.gameObject.SetActive(false);
-#if UNITY_ANDROID || UNITY_IOS
+        //        #region 划船机功能：隐藏骑行记录
-        btnRower.transform.localPosition = new Vector3(btnRower.transform.localPosition.x, btnRoute.transform.localPosition.y, btnRower.transform.localPosition.z);
+        //#if UNITY_ANDROID || UNITY_IOS
-        btnRoute.gameObject.SetActive(false);
+        //        btnRower.transform.localPosition = new Vector3(btnRower.transform.localPosition.x, btnRoute.transform.localPosition.y, btnRower.transform.localPosition.z);
-        btnMatch.gameObject.SetActive(false);
+        //        btnRoute.gameObject.SetActive(false);
-        transform.Find("ListPanel/Line").gameObject.SetActive(false);
+        //        btnMatch.gameObject.SetActive(false);
-        transform.Find("ListPanel/Line2").gameObject.SetActive(false);
+        //        transform.Find("ListPanel/Line").gameObject.SetActive(false);
-        StartScroll(2);
+        //        transform.Find("ListPanel/Line2").gameObject.SetActive(false);
-        //scrollContent.localPosition = new Vector3(674 * -2, scrollContent.localPosition.y, scrollContent.localPosition.z);//.DOLocalMoveX(674 * index * -1, 0.3f);
+        //        StartScroll(2);
-        //btnRower.GetComponent<Text>().color = Utils.HexToColor("#ffffff");
+        //        //scrollContent.localPosition = new Vector3(674 * -2, scrollContent.localPosition.y, scrollContent.localPosition.z);//.DOLocalMoveX(674 * index * -1, 0.3f);
-#endif
+        //        //btnRower.GetComponent<Text>().color = Utils.HexToColor("#ffffff");
-        #endregion
+        //#endif
+        //        #endregion
 
     }
 

Packages/manifest.json

@@ -1,46 +0,0 @@
-{
-  "dependencies": {
-    "com.coffee.softmask-for-ugui": "https://github.com/mob-sakai/SoftMaskForUGUI.git",
-    "com.oddworm.heapexplorer": "https://github.com/pschraut/UnityHeapExplorer.git#4.0.0",
-    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.cinemachine": "2.6.3",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ide.rider": "1.1.4",
-    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.performance.profile-analyzer": "1.1.1",
-    "com.unity.test-framework": "1.1.22",
-    "com.unity.timeline": "1.2.18",
-    "com.unity.ugui": "1.0.0",
-    "com.unity.modules.ai": "1.0.0",
-    "com.unity.modules.androidjni": "1.0.0",
-    "com.unity.modules.animation": "1.0.0",
-    "com.unity.modules.assetbundle": "1.0.0",
-    "com.unity.modules.audio": "1.0.0",
-    "com.unity.modules.cloth": "1.0.0",
-    "com.unity.modules.director": "1.0.0",
-    "com.unity.modules.imageconversion": "1.0.0",
-    "com.unity.modules.imgui": "1.0.0",
-    "com.unity.modules.jsonserialize": "1.0.0",
-    "com.unity.modules.particlesystem": "1.0.0",
-    "com.unity.modules.physics": "1.0.0",
-    "com.unity.modules.physics2d": "1.0.0",
-    "com.unity.modules.screencapture": "1.0.0",
-    "com.unity.modules.terrain": "1.0.0",
-    "com.unity.modules.terrainphysics": "1.0.0",
-    "com.unity.modules.tilemap": "1.0.0",
-    "com.unity.modules.ui": "1.0.0",
-    "com.unity.modules.uielements": "1.0.0",
-    "com.unity.modules.umbra": "1.0.0",
-    "com.unity.modules.unityanalytics": "1.0.0",
-    "com.unity.modules.unitywebrequest": "1.0.0",
-    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
-    "com.unity.modules.unitywebrequestaudio": "1.0.0",
-    "com.unity.modules.unitywebrequesttexture": "1.0.0",
-    "com.unity.modules.unitywebrequestwww": "1.0.0",
-    "com.unity.modules.vehicles": "1.0.0",
-    "com.unity.modules.video": "1.0.0",
-    "com.unity.modules.vr": "1.0.0",
-    "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0"
-  }
-}

Packages/packages-lock.json

@@ -1,342 +0,0 @@
-{
-  "dependencies": {
-    "com.coffee.softmask-for-ugui": {
-      "version": "https://github.com/mob-sakai/SoftMaskForUGUI.git",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "f59d147fe04be6a84b3cd7eb93bce149410911be"
-    },
-    "com.oddworm.heapexplorer": {
-      "version": "https://github.com/pschraut/UnityHeapExplorer.git#4.0.0",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "b00fee6b4415cb66cfe1664c47e8aa683b834565"
-    },
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.cinemachine": {
-      "version": "2.6.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.collab-proxy": {
-      "version": "1.2.16",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.ext.nunit": {
-      "version": "1.0.6",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.ide.rider": {
-      "version": "1.1.4",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.test-framework": "1.1.1"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.ide.vscode": {
-      "version": "1.2.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.performance.profile-analyzer": {
-      "version": "1.1.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.test-framework": {
-      "version": "1.1.22",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.timeline": {
-      "version": "1.2.18",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.director": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.particlesystem": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.ugui": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0"
-      }
-    },
-    "com.unity.modules.ai": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.androidjni": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.animation": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.assetbundle": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.audio": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.cloth": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.physics": "1.0.0"
-      }
-    },
-    "com.unity.modules.director": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.animation": "1.0.0"
-      }
-    },
-    "com.unity.modules.imageconversion": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.imgui": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.jsonserialize": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.particlesystem": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.physics": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.physics2d": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.screencapture": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.imageconversion": "1.0.0"
-      }
-    },
-    "com.unity.modules.subsystems": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0"
-      }
-    },
-    "com.unity.modules.terrain": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.terrainphysics": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.terrain": "1.0.0"
-      }
-    },
-    "com.unity.modules.tilemap": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.physics2d": "1.0.0"
-      }
-    },
-    "com.unity.modules.ui": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.uielements": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      }
-    },
-    "com.unity.modules.umbra": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.unityanalytics": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      }
-    },
-    "com.unity.modules.unitywebrequest": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.unitywebrequestassetbundle": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.assetbundle": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      }
-    },
-    "com.unity.modules.unitywebrequestaudio": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.audio": "1.0.0"
-      }
-    },
-    "com.unity.modules.unitywebrequesttexture": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0"
-      }
-    },
-    "com.unity.modules.unitywebrequestwww": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
-        "com.unity.modules.unitywebrequestaudio": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.assetbundle": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0"
-      }
-    },
-    "com.unity.modules.vehicles": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.physics": "1.0.0"
-      }
-    },
-    "com.unity.modules.video": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      }
-    },
-    "com.unity.modules.vr": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.xr": "1.0.0"
-      }
-    },
-    "com.unity.modules.wind": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.modules.xr": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.subsystems": "1.0.0"
-      }
-    }
-  }
-}

ProjectSettings/EditorBuildSettings.asset

@@ -11,9 +11,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc
-  - enabled: 1
-    path: Assets/Scenes/VideoPlay.unity
-    guid: f25b9f482e27079448d130ae1ed0ea34
   - enabled: 1
     path: Assets/Scenes/Ride.unity
     guid: d9f6ee75d0d54714fb4d2f90016a28bc

ProjectSettings/ProjectSettings.asset

@@ -256,7 +256,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@4.2.8
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  AndroidTargetArchitectures: 3
+  AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 0
   il2cppCompilerConfiguration:
     Standalone: 0