AR初版可用阶段提交

Assets/AR/ARObject.cs

@@ -37,6 +37,8 @@ namespace Assets.AR
 
         public float ManualVisibility { get; set; }
 
+        public bool IsMain { get; set; }
+
         public ARRoute Route
         {
             get => this.route;

Assets/AR/ARObjectsController.cs

@@ -112,7 +112,7 @@ namespace Assets.AR
             }
         }
 
-        protected virtual bool IsArObjectActive(ARObject arObject) => (double)arObject.VisibilityLevel > 0.0;
+        protected virtual bool IsArObjectActive(ARObject arObject) => (double)arObject.VisibilityLevel > 0.0 ;
      
 
         protected virtual Material GetTrajectoryMaterial() => this.matShadow;
@@ -128,7 +128,7 @@ namespace Assets.AR
                 this.cameraPositionOffset = this.Route.GetCameraPosition(num1) - this.CameraOriginOffset;
                 Camera.main.transform.position = this.CameraOriginOffset;
                 Camera.main.transform.rotation = this.Route.GetCameraRotation(num1);
-                this.Route.SetCameraProjection(num1, Camera.main);
+                //this.Route.SetCameraProjection(num1, Camera.main); //TODO:暂时注释掉
             }
             this.CameraDistance = this.videoSync.GetDistanceForVideoFrame(num1 + this.FrameIndexDistanceCorrection);
             float num2 = Mathf.Min(float.MaxValue, this.Route.GetVisibility(num1));

Assets/AR/ARTrainingController.cs

@@ -76,8 +76,8 @@ namespace Assets.AR
 
         protected override void Update()
         {
-            if (manager.IsQuit())
+            //if (manager.IsQuit())
-                return;
+            //    return;
 
             timers -= Time.deltaTime;
 
@@ -96,6 +96,7 @@ namespace Assets.AR
                     item.DeltaDistance = (float)(dic.Key.EndDistance - dic.Key.PreDistance);
                     item.Route = Route;
                     item.VideoSync = videoPointsSync;
+                    item.IsAtFinish = dic.Key.EndDistance >= manager.GetMapRoute().Distance*1000f;
                     if (!this.arObjects.Contains(item))
                         this.arObjects.Add(item);
                     if (!this.riderObjects.ContainsKey(item.GetInstanceID()))
@@ -112,10 +113,6 @@ namespace Assets.AR
                 var offset = obj.DeltaDistance * delta;
                 obj.Distance += offset;
                 obj.RouteDistance += offset;
-                if (obj.Distance >= Route.GetTotalDistance())
-                {
-                    obj.IsAtFinish = true;
-                }
             }
 
             this.FrameIndexDistanceCorrection = this.VideoPlayerControl.FrameIndexDistanceCorrection;

Assets/AR/ExampleClass.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace Assets.AR
+{
+    public class ExampleClass : MonoBehaviour
+    {
+        public Matrix4x4 originalProjection;
+        Camera cam;
+
+        void Start()
+        {
+            cam = GetComponent<Camera>();
+            originalProjection = cam.projectionMatrix;
+        }
+
+        void Update()
+        {
+            Matrix4x4 p = originalProjection;
+            p.m01 += Mathf.Sin(Time.time * 1.2F) * 0.1F;
+            p.m10 += Mathf.Sin(Time.time * 1.5F) * 0.1F;
+            cam.projectionMatrix = p;
+        }
+    }
+}

Assets/AR/ExampleClass.cs.meta

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

Assets/Models/ViewPlayer.controller

@@ -161,7 +161,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-6280473346169069233
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -192,7 +192,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-6197807439964194722
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -323,7 +323,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-5028631798582772322
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -373,7 +373,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-4448948008395002896
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -448,7 +448,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-3789228838010061756
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -475,7 +475,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-3680733670995154060
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -525,7 +525,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-3206231950487047934
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -597,7 +597,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-2690597925175035265
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -626,7 +626,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-2561558923055515796
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -662,7 +662,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-2474074929572245477
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -729,7 +729,7 @@ AnimatorTransition:
   serializedVersion: 1
 --- !u!1102 &-1921903986252914710
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -757,7 +757,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-1867621270447226975
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -865,7 +865,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-1696406813102555496
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -893,7 +893,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &-1674479558448565141
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -924,7 +924,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1107 &-1637695127637103515
 AnimatorStateMachine:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1066,11 +1066,8 @@ AnimatorStateTransition:
     m_ConditionEvent: grade
     m_EventTreshold: 5
   - m_ConditionMode: 3
-    m_ConditionEvent: bearing
+    m_ConditionEvent: speed
-    m_EventTreshold: -1
+    m_EventTreshold: 0
-  - m_ConditionMode: 4
-    m_ConditionEvent: bearing
-    m_EventTreshold: 1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 8037845210809518626}
   m_Solo: 0
@@ -1109,7 +1106,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &-149237661038222874
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1231,7 +1228,7 @@ AnimatorController:
     m_Controller: {fileID: 9100000}
 --- !u!1102 &57360962280543080
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1259,7 +1256,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &152988074441697560
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1315,7 +1312,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &646349641302932126
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1343,7 +1340,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &1018308057553964354
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1496,7 +1493,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &3705284127588475039
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1524,7 +1521,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &3857089115179635187
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1597,7 +1594,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &4213284675513532716
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1703,7 +1700,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &5931569063321047081
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1731,7 +1728,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &5932869819320440490
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1834,7 +1831,7 @@ AnimatorTransition:
   serializedVersion: 1
 --- !u!1102 &7167068954877030447
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1978,7 +1975,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &8037845210809518626
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2103,7 +2100,7 @@ AnimatorStateTransition:
   m_CanTransitionToSelf: 1
 --- !u!1102 &8758911657893801591
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2131,7 +2128,7 @@ AnimatorState:
   m_TimeParameter: 
 --- !u!1102 &9029427672491609446
 AnimatorState:
-  serializedVersion: 5
+  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}

Assets/NV_Models/ViewPlayer_NV.controller

@@ -587,6 +587,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 3
     m_ConditionEvent: grade
     m_EventTreshold: 5
+  - m_ConditionMode: 3
+    m_ConditionEvent: speed
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 8037845210809518626}
   m_Solo: 0

Assets/Resources/UI/Prefab/AR/HeadPanel.prefab

@@ -100,7 +100,7 @@ GameObject:
   - component: {fileID: 6567413963156607631}
   - component: {fileID: 1061149481108037856}
   m_Layer: 5
-  m_Name: Image
+  m_Name: Main
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -123,7 +123,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16.13, y: 22}
+  m_SizeDelta: {x: 10.08, y: 14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6567413963156607631
 CanvasRenderer:
@@ -152,7 +152,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: eab6d6d13749eb94cb5ca787d1280ad5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 37bf3594f0624974b98d9f801e606577, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resources/UI/Prefab/AR/VideoPlayerInfo.prefab

@@ -729,7 +729,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6265415831168584355
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/UI/Prefab/MapList/MapItem.prefab

@@ -230,6 +230,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1225770215118290286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6815917023124247089}
+  - component: {fileID: 1306696869565011078}
+  - component: {fileID: 6195649910952055824}
+  m_Layer: 5
+  m_Name: AR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6815917023124247089
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1225770215118290286}
+  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: 5836440878484963209}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 103, y: -14}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1306696869565011078
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1225770215118290286}
+  m_CullTransparentMesh: 0
+--- !u!114 &6195649910952055824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1225770215118290286}
+  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: 80ca2c4b44afce842834c2afcb41da14, 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 &1325622395784352471
 GameObject:
   m_ObjectHideFlags: 0
@@ -1966,6 +2040,7 @@ RectTransform:
   - {fileID: 5144962272042509941}
   - {fileID: 5307116754629177247}
   - {fileID: 5836440877148088560}
+  - {fileID: 6815917023124247089}
   m_Father: {fileID: 5262667172184159172}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@@ -3671,7 +3671,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3D
+  m_Text: AR
 --- !u!1 &4853418148442413175
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/MainScene.unity

@@ -906,7 +906,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 1
+    m_Bits: 4294967295
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
@@ -1136,6 +1136,92 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: -3.896, z: 0}
+--- !u!21 &866930765
+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 &871660769
 GameObject:
   m_ObjectHideFlags: 0
@@ -1451,6 +1537,92 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: -3.896, z: 0}
+--- !u!21 &1277262929
+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 &1378474435
 GameObject:
   m_ObjectHideFlags: 0
@@ -1753,92 +1925,6 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1426339558}
   m_PrefabAsset: {fileID: 0}
---- !u!21 &1443577897
-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 &1565405865 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3342506722007875022, guid: 10e54cf0bec9cbc4b94d1d40e437f87c,
@@ -2021,92 +2107,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1726804851}
   m_CullTransparentMesh: 0
---- !u!21 &1888707701
-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 &1899149616
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/App.cs

@@ -59,7 +59,7 @@ public static class App
     public static string pageName { get; set; }
     public static int firstEnter { get; set; }
 
-    public static IPEndPoint UdpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
+    public static IPEndPoint UdpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21000);
     public static IPEndPoint TcpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
     public static UpdateModel UpdateObject { get; set; }
     public static int CompetionId { get; set; }//比赛id
@@ -213,7 +213,7 @@ public static class App
     {
         InitLanguage();
 #if !UNITY_EDITOR
-        //Host = "http://pf.juze.pro/";
+        Host = "http://pf.juze.pro/";
         UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
         TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
         //线上
@@ -226,8 +226,8 @@ public static class App
         //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
         Debug.unityLogger.logEnabled = false;
 #else
-        //Host = "http://pf.juze.pro/"; //"http://192.168.0.102:5082/";//
+        Host = "http://pf.juze.pro/";//"http://pf.juze.pro/"; //"http://192.168.0.102:5082/";//
-        UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
+        //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
         TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
 #endif
         var now = DateTime.Now;

Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs

@@ -62,6 +62,8 @@ namespace Assets.Scripts.Scenes.VideoRide
 
         public bool IsStart = false;
 
+        public double mockpower { get; set; }
+
         protected virtual void Start()
         {
             animator = GetComponent<Animator>();

Assets/Scripts/Scenes/VideoRide/ElevationBarDataFeed.cs

@@ -7,7 +7,6 @@ namespace Assets.Scripts.Scenes.VideoRide
 {
     public class ElevationBarDataFeed : MonoBehaviour
     {
-        GameObject head { get; set; }
         VideoGameManager manager { get; set; }
         [SerializeField]
         Material _lightColor;
@@ -22,7 +21,6 @@ namespace Assets.Scripts.Scenes.VideoRide
 
         void Start()
         {
-            head = transform.Find("HeadPanel").gameObject;
             manager= FindObjectOfType<VideoGameManager>();
 
             BarChart barChart = GetComponent<BarChart>();
@@ -34,10 +32,9 @@ namespace Assets.Scripts.Scenes.VideoRide
                 for (int i = 0; i < list.Count; i++)
                 {
                     barChart.DataSource.AddCategory($"Player {i}", getChartMaterial(list[i].Grade));
-                    barChart.DataSource.SetValue($"Player {i}", "Group 1", list[i].Grade);
+                    barChart.DataSource.SetValue($"Player {i}", "Group 1", list[i].Elevation);
                 }
             }
-
             headPanel = Resources.Load<GameObject>("UI/Prefab/AR/HeadPanel");
         }
 
@@ -47,22 +44,13 @@ namespace Assets.Scripts.Scenes.VideoRide
             timer -= Time.deltaTime;
             while (timer < 0)
             {
-                MoveCurrentPlayerHead();
+                
-                MoveOnlinePlayerHead();
+                timer += 0.5f;
-                timer += 1f;
             }
+            MoveOnlinePlayerHead();
         }
-        //移动当前骑行者头像
+       
-        private void MoveCurrentPlayerHead()
+        //移动海拔线上人物位置
-        {
-            var videoPlayer = manager.CurrentPlayer;
-            var index = videoPlayer != null ? videoPlayer.currentIndex : 0;
-            BarChart barChart = GetComponent<BarChart>();
-            Vector3 vector3 = Vector3.back;
-            barChart.GetBarTrackPosition($"Player {index}", "Group 1", out vector3);
-            head.transform.position = vector3;
-        }
-        //移动当前线上其他人头像
         private void MoveOnlinePlayerHead()
         {
             if (manager.cyclingController == null)
@@ -74,26 +62,26 @@ namespace Assets.Scripts.Scenes.VideoRide
             {
                 BarChart barChart = GetComponent<BarChart>();
                 Vector3 vector3 = Vector3.back;
-                var distance = item.EndDistance % manager.mapRoute.Distance;
+                var distance = item.EndDistance; //% manager.mapRoute.Distance;
       
-                var currentIndex = Math.Round(distance / manager.mapRoute.Distance * manager.GetMapData().List.Count);
+                var currentIndex = Mathf.Clamp((float)(distance / manager.mapRoute.Distance * manager.GetMapData().List.Count),0, manager.GetMapData().List.Count-1);
-                barChart.GetBarTrackPosition($"Player {currentIndex}", "Group 1", out vector3);
+                barChart.GetBarTrackPosition($"Player {Math.Round(currentIndex,0)}", "Group 1", out vector3);
 
                 var currentHead = headList.Where(c => c.UserId == item.UserId).FirstOrDefault();
-
-                if (videoPlayer != null)
-                {
-                    var diff = distance - videoPlayer.totalDistance % manager.mapRoute.Distance;
-                    if (diff < 0) 
-                    {
-                        vector3.y = -800f;
-                    }
-                }
                 if (currentHead == null)
                 {
                     var onlineHead = Instantiate(headPanel, transform);
                     onlineHead.GetComponent<HeadScript>().UserId = item.UserId;
                     onlineHead.transform.position = vector3;
+                    if (item.IsSelf)
+                    {
+                        onlineHead.transform.Find("Main").gameObject.SetActive(true);
+                        onlineHead.transform.SetAsLastSibling();
+                    }
+                    else
+                    {
+                        onlineHead.transform.SetAsFirstSibling();
+                    }
                 }
                 else
                 {

Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs

@@ -232,15 +232,20 @@ namespace Assets.Scripts.Scenes.VideoRide
                                 var playerprefabNV = Resources.Load<GameObject>("UI/Prefab/AR/VidePlayer_NV");
                                 videoPlayer = Instantiate(playerprefabNV, transform);
                             }
+
                             CurrentPlayer = videoPlayer.GetComponent<AbstractVideoPlayer>();
                             var vv = videoPlayer.GetComponent<VideoPlayer>();
                             vv.SetEndDistance(item.EndDistance);
                             CurrentPlayer.SetStartDistance(item.EndDistance);
+
                             var rideObj = videoPlayer.GetComponent<RiderRenderer>();
                             rideObj.Distance = (float)CurrentPlayer.StartDistance;
                             rideObj.RouteDistance = rideObj.Distance;
+                            rideObj.IsMain = true;
+                            Debug.Log("IsMain = true");
                             rideObjs.Add(CurrentPlayer, rideObj);
                             visibleRiders.Add(CurrentPlayer);
+
                             CurrentPlayer.SetPlayer(onlineRider.NickName, onlineRider.Speed, onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance, onlineRider.FrameRate.Value);
                         }
                     }
@@ -318,7 +323,6 @@ namespace Assets.Scripts.Scenes.VideoRide
         public void SetCyclingModel(CyclingModel mode)
         {
             //startTime = UIManager.Now.GetDateTime();
-            Debug.Log("SetCyclingModel" + mode.ToString());
             this.cyclingModel = mode;
             switch (cyclingModel)
             {

Assets/Scripts/Scenes/VideoRide/VideoLoading.cs

@@ -287,6 +287,12 @@ namespace Assets.Scripts.Scenes.VideoRide
             File.WriteAllBytes($"{dataPath}/{route.Id}.json", res1.downloadHandler.data);
             File.WriteAllBytes($"{dataPath}/route-{route.Id}.json", res2.downloadHandler.data);
             File.WriteAllBytes($"{path}/{route.FileName}", res3.downloadHandler.data);
+
+            rideNow.enabled = true;
+            rideNow.interactable = true;
+            downloadText.text = App.GetLocalString("Ride Now");
+            var filepath = $"{path}/{route.FileName}";
+            manager.SetMedia(filepath);
         }
 
         public void Report(float value)
@@ -301,15 +307,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             }
             else
             {
-                var route = manager.mapRoute;
-                var path = PFConstants.VideoFolder;
-                rideNow.enabled = true;
-                rideNow.interactable = true;
-                downloadText.text = App.GetLocalString("Ride Now");
-                //watch.SetActive(true);
                 slider.value = 100;
-                var filepath = $"{path}/{route.FileName}";
-                manager.SetMedia(filepath);
             }
         }
         //进入观察模式

Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs

@@ -58,8 +58,9 @@ namespace Assets.Scripts.Scenes.VideoRide
             heartRate = manager.UpDateHeart();
             power = manager.UpdatePower();
             cadance = manager.UpdateCadence();
-//#if UNITY_EDITOR
+//#if UNITY_EDITOR 
-            power = 230;
+            if(mockpower > 0)
+                power = mockpower;//TODO:动态
             cadance = 50;
             heartRate = 120;
 //#endif
@@ -128,7 +129,6 @@ namespace Assets.Scripts.Scenes.VideoRide
             //默认启用多圈
             if (isSingle && totalDistance >= mapData.TotalDistance)
             {
-                Debug.Log($"{totalDistance}-{mapData.TotalDistance}");
                 Complete();
             }
         }

Assets/Scripts/Scenes/VideoRide/VideoUIManager.cs

@@ -51,7 +51,10 @@ namespace Assets.Scripts.Scenes.VideoRide
         GameObject ftpPanel { get; set; }
         Image ftpImage { get; set; }
         Text wkg { get; set; }
-    
+
+        public Text PowerText;
+        public Slider PowerSlider;
+
         // Start is called before the first frame update
         void Start()
         {
@@ -143,6 +146,11 @@ namespace Assets.Scripts.Scenes.VideoRide
             UIManager.AddEvent(changeViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeViewClick);
             UIManager.AddEvent(deviceBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, DeviceClick);
             UIManager.AddEvent(quitBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, QuitClick);
+            PowerSlider.onValueChanged.AddListener(e =>
+            {
+                PowerText.text = e.ToString("f0") + "W";
+                manager.CurrentPlayer.mockpower = e;
+            });
         }
         //设置坡度信息
         private void SetSlopePanel()

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -78,7 +78,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         var tabContainer = transform.Find("TabContainer");
         var diff = tabContainer.Find("Diff");
         diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
-        tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
+        tabContainer.Find("3d").gameObject.SetActive(!myMap.EnableAR && myMap.Enable3D);
+        tabContainer.Find("AR").gameObject.SetActive(myMap.EnableAR);
         tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
         transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
         transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);

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

@@ -260,6 +260,8 @@ public class MapListController : PFUIPanel
         favContainer = topContainer.Find("FavContainer");
         if (tdContainer != null) 
         {
+            tdContainer.Find("Gou").gameObject.SetActive(true);
+            is3d = true;
             UIManager.AddEvent(tdContainer.gameObject, EventTriggerType.PointerClick, (b) =>
             {
                 var gou = tdContainer.Find("Gou").gameObject;
@@ -439,14 +441,14 @@ public class MapListController : PFUIPanel
     string ftname = "";
     string distance = "";
     List<string> hands = new List<string>();
-    bool is3d = false,isFav = false,isMine = false,isRecent = false;
+    bool is3d = true,isFav = false,isMine = false,isRecent = false;
     string sort = "",sortDire = "";
     //string name = "";
     //string name = "";
     async void GetList() 
     {
         if (isEnd) return;
-        var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname,distance,string.Join(",",hands),is3d,sort,sortDire,isFav,isMine,isRecent);
+        var res = await ConfigHelper.mapApi.GetList(pageIndex, pageSize, ftname,distance,string.Join(",",hands),false,sort,sortDire,isFav,isMine,isRecent, is3d);
         if (res.result)
         {
             if (res.data.Count == 0)
@@ -510,7 +512,7 @@ public class MapListController : PFUIPanel
             hands = new List<string>();
             var text = distanceOptions.GetComponent<Dropdown>().options[0].text;
             distance = MapFilterOptions.distanceDict[text];
-            is3d = false;
+            is3d = true;
             isFav = false;
             //empty ui
             searchInput.GetComponent<InputField>().text = string.Empty;
@@ -534,7 +536,7 @@ public class MapListController : PFUIPanel
             var isfav = favContainer.Find("Gou").gameObject;
             isfav.SetActive(false);
             var is3dUI = tdContainer.Find("Gou").gameObject;
-            is3dUI.SetActive(false);
+            is3dUI.SetActive(true);
 
             if (sorts != null)
             {