tcp发送增加ar视频播放帧数&首页布局还原到初版

Assets/BannerController.cs

@@ -193,7 +193,7 @@ public class BannerController : MonoBehaviour
         right.GetComponent<Button>().onClick.AddListener(Right);
     }
 #if UNITY_STANDALONE_WIN
-    float offset = 232;
+    float offset = 110;
 #else
     float offset = 43;
 #endif

Assets/MessageScript.cs

@@ -21,7 +21,7 @@ public class MessageScript : MonoBehaviour
     private void Awake()
     {
         content = (RectTransform)transform.Find("Scroll View/Viewport/Content");
-        EventQueueSystem.AddListener<LinkedMessageEvent>(LinkedMessageHandler);
+        //EventQueueSystem.AddListener<LinkedMessageEvent>(LinkedMessageHandler);
     }
     private void LinkedMessageHandler(LinkedMessageEvent e)
     {

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

@@ -427,7 +427,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5293747630605020807
 RectTransform:
   m_ObjectHideFlags: 0
@@ -498,7 +498,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6345747845794331902
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scenes/MainScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
+  m_IndirectSpecularColor: {r: 0.4230843, g: 0.45397156, b: 0.47664893, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -207,92 +207,6 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _WidthHeightRadius: {r: 30, g: 30, b: 26, a: 0}
---- !u!21 &143725575
-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 &154299661
 GameObject:
   m_ObjectHideFlags: 0
@@ -468,7 +382,7 @@ RectTransform:
   - {fileID: 1985738406}
   - {fileID: 684809390}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -684,7 +598,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &728460487
 GameObject:
@@ -982,6 +896,237 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 90, y: -30, z: 0}
+--- !u!1 &972337804
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 972337807}
+  - component: {fileID: 972337806}
+  - component: {fileID: 972337805}
+  - component: {fileID: 972337808}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &972337805
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972337804}
+  m_Enabled: 1
+--- !u!20 &972337806
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972337804}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 8400000, guid: a3213a4c6055980459a37a7f589d9653, type: 2}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &972337807
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972337804}
+  m_LocalRotation: {x: 0.0066756317, y: 0.9909454, z: -0.053867284, w: 0.122805275}
+  m_LocalPosition: {x: -2.4, y: 2.5, z: 11.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 173.777, y: -14.129, z: -180}
+--- !u!108 &972337808
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 972337804}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!21 &1296702055
+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 &1378474435
 GameObject:
   m_ObjectHideFlags: 0
@@ -1466,92 +1611,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1726804851}
   m_CullTransparentMesh: 0
---- !u!21 &1941025298
-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 &1962586925
 GameObject:
   m_ObjectHideFlags: 0
@@ -1646,6 +1705,92 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   newNav: {fileID: 0}
+--- !u!21 &2004096518
+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 &2038446772
 GameObject:
   m_ObjectHideFlags: 0
@@ -1674,7 +1819,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &2774579553011762
 Transform:
@@ -4519,7 +4664,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!137 &1300012074390985158
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
@@ -6391,7 +6536,7 @@ Transform:
   - {fileID: 6590448722702074255}
   - {fileID: 5778854759407804238}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 6.2230005, y: 0, z: 0}
 --- !u!1 &1933277876730984402
 GameObject:

Assets/Scenes/PlayerTexture.renderTexture

@@ -13,8 +13,8 @@ RenderTexture:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   serializedVersion: 3
-  m_Width: 256
+  m_Width: 1080
-  m_Height: 256
+  m_Height: 1080
   m_AntiAliasing: 1
   m_MipCount: -1
   m_DepthFormat: 2
@@ -24,7 +24,7 @@ RenderTexture:
   m_SRGB: 0
   m_UseDynamicScale: 0
   m_BindMS: 0
-  m_EnableCompatibleFormat: 1
+  m_EnableCompatibleFormat: 0
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1
@@ -34,4 +34,4 @@ RenderTexture:
     m_WrapV: 1
     m_WrapW: 1
   m_Dimension: 2
-  m_VolumeDepth: 1
+  m_VolumeDepth: 1080

Assets/Scripts/Scenes/MainController.cs

@@ -53,7 +53,7 @@ public class MainController : BaseScene
         modalRect.sizeDelta = new Vector2(1600, 900);
         App.MainDeviceAdapter.StartScan();
 #endif
-        //EventQueueSystem.AddListener<LinkedMessageEvent>(LinkedMessageHandler);
+        EventQueueSystem.AddListener<LinkedMessageEvent>(LinkedMessageHandler);
         App.isHomeChanged -= OnIsHomeChanged;
         App.isHomeChanged += OnIsHomeChanged;
     }
@@ -149,8 +149,7 @@ public class MainController : BaseScene
         emptyt = 0;
         if (App.currentPageIsHome)
         {
-            //DoMessage6(e);
+            DoMessage6(e);
-            DoTopMessage(e);
         }
     }
 
@@ -159,11 +158,6 @@ public class MainController : BaseScene
 #else
     float moveOffset = 38;
 #endif
-    private void DoTopMessage(LinkedMessageEvent e)
-    { 
-    
-        
-    }
     private void DoMessage6(LinkedMessageEvent e)
     {
         //Resources.UnloadUnusedAssets();
@@ -290,7 +284,7 @@ public class MainController : BaseScene
             $"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%";
         transform.Find("MobileInfo/TimeText").GetComponent<Text>().text =
             DateTime.Now.ToString("HH:mm");
-        //ShowQueueMessage();
+        ShowQueueMessage();
 #if UNITY_EDITOR
         if (App.CurrentUser == null) //App.CurrentUser == null
         {

Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs

@@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                     MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId,
                         new double[] { lastData._Lat, lastData._Lon },
                         recorderData.IsCompleted, false, recorderData.EndDistance,
-                        true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks);
+                        true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0));
                 }
                 else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况
                 {

Assets/Scripts/Scenes/Ride/Model/CyclingModels/SingleModel.cs

@@ -80,6 +80,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                     EndDistance = item.EndDistance,
                     PreDistance = item.PreDistance,
                     WeightKg = item.WeightKg,
+                    FrameRate = item.FrameRate,
                 });
             }
 

Assets/Scripts/Scenes/Ride/Model/OutModel.cs

@@ -376,6 +376,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
         public bool Saved { get; set; }
 
         //public int V { get; set; }
+
+        public int FrameRate { get; set; }
     }
 
     public class GzipMsgModel
@@ -436,11 +438,12 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         public string WatchIdList { get; set; }
 
+        public int? FrameRate { get; set; }
 
         public static ReceiveMsgModel Parse(string str)
         {
             var list = str.Split(',');
-            if (list.Length != 14)
+            if (list.Length != 15)
             {
                 return null;
             }
@@ -464,6 +467,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
                     HeartRate = Convert.ToDouble(list[11], CultureInfo.InvariantCulture),
                     Cadence = Convert.ToDouble(list[12], CultureInfo.InvariantCulture),
                     TotoalTicks = Convert.ToInt32(list[13], CultureInfo.InvariantCulture),
+                    FrameRate = Convert.ToInt32(list[14], CultureInfo.InvariantCulture),
                 };
             }
             catch
@@ -595,6 +599,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
         public string Country { get; set; }
 
         public DateTime CreateTime { get; set; }
+
+        public int? FrameRate { get; set; }
     }
 
     public class KeyPaire

Assets/Scripts/Scenes/Ride/Model/RiderModels/OnlineRiderModel.cs

@@ -19,6 +19,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.RiderModels
         /// </summary>
         public GeographicPosition Point { get; set; }
 
+        public int? FrameRate { get; set; } = 0;
+
         public OutUser GetOutUser(double preDistance, double currentDistance, TurfHelper turfHelper, CyclingStateEnum cyclingState)
         {
             if (this.IsSelf)

Assets/Scripts/Scenes/Ride/Model/TargetData.cs

@@ -34,6 +34,9 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         //public double _Bearing = 0d;
 
+        //视频帧数
+        public int? _FrameRate = 0;
+
         public TargetData Clone()
         {
             return (TargetData)MemberwiseClone();

Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs

@@ -207,7 +207,7 @@ namespace Assets.Scenes.Ride.Scripts
         /// <param name="exit">是否退出</param>
         public static void Send(int RouteId, int MemberId, double[] Point, bool IsCompleted = false, bool exit = false,
             double endDistance = 0, bool showVirtual = false, byte commandType = 1, double speed = 0, bool isVirtual = false, double preDistance = 0,
-            double weightKg = 0, int competitionId = 0, bool saved = false,double? heartRate = 0, double power = 0, double? cadence = 0,int totalTicks = 0)
+            double weightKg = 0, int competitionId = 0, bool saved = false,double? heartRate = 0, double power = 0, double? cadence = 0,int totalTicks = 0, int frameRate = 0)
         {
             try
             {
@@ -235,6 +235,7 @@ namespace Assets.Scenes.Ride.Scripts
                     WeightKg = weightKg,
                     Competitionid = competitionId,
                     Saved = saved,
+                    FrameRate = frameRate
                     //V = 1
                 };
                 var sendBytes = Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(model));
@@ -491,6 +492,7 @@ namespace Assets.Scenes.Ride.Scripts
                             }
                             user.IsWatcher = user.WatcherList.Contains(item.MemberId);
                             user.CreateTime = DateTime.MaxValue;
+                            user.FrameRate = item.FrameRate;
                         }
                         else
                         {

Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs

@@ -223,14 +223,12 @@ namespace Assets.Scripts.Scenes.VideoRide
             }
         }
 
-        private void Forward() 
+        protected virtual void Forward() 
         {
             try
             {
                 if (mapData == null)
                     mapData = manager.GetMapData();
-                distance = Math.Round(speed / 3600, 5, MidpointRounding.AwayFromZero);
-                totalDistance += distance;
                 currentlatLon = manager.Along(totalDistance % mapData.TotalDistance);
                 ////根据人物速度设置人物距离摄像头远近
                 //if (speed > 20 && speed < 30)

Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs

@@ -24,10 +24,10 @@ namespace Assets.Scripts.Scenes.VideoRide
             var current = manager.CurrentPlayer;
             if (current != null && current.UserId != UserId)
             {
-                var left = totalDistance % mapData.TotalDistance;
+                //var left = totalDistance % mapData.TotalDistance;
-                var right = current.totalDistance % mapData.TotalDistance;
+                //var right = current.totalDistance % mapData.TotalDistance;
-                diff = (left - right) * 1000;
+                //diff = (left - right) * 1000;
-                if (Math.Abs(diff) > 50)
+                if (Math.Abs(diff) > 150)
                 {
                     Destroy();
                 }
@@ -76,25 +76,14 @@ namespace Assets.Scripts.Scenes.VideoRide
             //    print(e.Message);
             //}
         }
+
+        private int currentFrame { get; set; }
         protected override void ComputeAnimator()
         {
             base.ComputeAnimator();
             if (manager.CurrentPlayer == null || manager.CurrentPlayer.UserId != UserId)
             {
-                //var currentFrame = manager.GetFrameOffSet(diff);
+                var result = manager.mockDirection.Where(c => c.Start < currentFrame && c.End > currentFrame).FirstOrDefault();
-                var mainFrame = manager.GetCurrentFrame();
-                var currentFrame = mainFrame + diff * 10;
-                //var min = Math.Min(currentFrame, mainFrame);
-                //var max = Math.Max(currentFrame, mainFrame);
-                frames = (int)currentFrame;
-                var result = manager.mockDirection.Where(c => c.Start < frames && c.End > frames).FirstOrDefault();
-                bearing = result?.Value ?? 0;
-                animator.SetFloat("bearing", bearing);
-            }
-            else
-            {
-                var mainFrame = manager.GetCurrentFrame();
-                var result = manager.mockDirection.Where(c => c.Start < mainFrame && c.End > mainFrame).FirstOrDefault();
                 bearing = result?.Value ?? 0;
                 animator.SetFloat("bearing", bearing);
             }
@@ -109,7 +98,7 @@ namespace Assets.Scripts.Scenes.VideoRide
         }
 
         //设置当前玩家属性
-        public void SetPlayer(string name, double distance, double totalDistance, double cadance,double heartRate, double wkg, int userId,double power,double currentPlayerDistance)
+        public void SetPlayer(string name, double distance, double totalDistance, double cadance,double heartRate, double wkg, int userId,double power,double currentPlayerDistance,int frame)
         {
             this.wkg = wkg;
             this.UserName = name;
@@ -119,7 +108,8 @@ namespace Assets.Scripts.Scenes.VideoRide
             this.UserId = userId;
             this.power = power;
             this.speed = distance * 3600;
-            this.diff = currentPlayerDistance - totalDistance;
+            this.diff = totalDistance - currentPlayerDistance;
+            this.currentFrame = frame;
         }
     }
 }

Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs

@@ -165,7 +165,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                     var onlineRider = currentPlayer as OnlineRiderModel;
                     var obj = Instantiate(OnlinePlayer, transform);
                     var online = obj.GetComponent<OnlineVideoPlayer>();
-                    online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance-onlineRider.PreDistance, onlineRider.EndDistance, onlineRider.Cadence, onlineRider.HeartRate, onlineRider.TotalTicks, onlineRider.UserId, onlineRider.Power, onlineRider.EndDistance);
+                    online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance-onlineRider.PreDistance, onlineRider.EndDistance, onlineRider.Cadence, onlineRider.HeartRate, onlineRider.TotalTicks, onlineRider.UserId, onlineRider.Power, onlineRider.EndDistance,onlineRider.FrameRate.Value);
                     obj.transform.DOMoveX(0, 1);
                     ChangePlayer(currentPlayer.UserId);
                     CurrentPlayer = online;
@@ -198,7 +198,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 {
                     var online = exsit.GetComponent<OnlineVideoPlayer>();
     
-                    online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance - onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance);
+                    online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance - onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance, onlineRider.FrameRate.Value);
                 }
                 else
                 {
@@ -209,7 +209,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                         {
                             var obj = Instantiate(OnlinePlayer, transform);
                             var online = obj.GetComponent<OnlineVideoPlayer>();
-                            online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance - onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance);
+                            online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance - onlineRider.PreDistance, onlineRider.EndDistance, item.Cadence, item.HeartRate, onlineRider.WeightKg, item.UserId, onlineRider.Power, currentPlayerInfo.EndDistance, onlineRider.FrameRate.Value);
                             obj.transform.DOMoveX(slots[currentOnlineCount], 1);
                             currentOnlineCount++;
                         }
@@ -260,7 +260,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                         var onlineRider = currentPlayer as OnlineRiderModel;
                         var obj = Instantiate(OnlinePlayer, transform);
                         var online = obj.GetComponent<OnlineVideoPlayer>();
-                        online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance-onlineRider.PreDistance, onlineRider.EndDistance, onlineRider.Cadence, onlineRider.HeartRate, 0, onlineRider.UserId, onlineRider.Power, onlineRider.EndDistance);
+                        online.SetPlayer(onlineRider.NickName, onlineRider.EndDistance-onlineRider.PreDistance, onlineRider.EndDistance, onlineRider.Cadence, onlineRider.HeartRate, 0, onlineRider.UserId, onlineRider.Power, onlineRider.EndDistance, onlineRider.FrameRate.Value);
                         obj.transform.position = origin;
                         CurrentPlayer = online;
                         var currentFrames = DistanceToFrames(CurrentPlayer.totalDistance);

Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs

@@ -50,7 +50,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             power = manager.UpdatePower();
             cadance = manager.UpdateCadence();
             //#if UNITY_EDITOR
-            power = 150;
+            power = 50;
             cadance = 150;
             heartRate = 160;
             //#endif
@@ -87,6 +87,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 _Lat = currentlatLon.x,
                 _Lon = currentlatLon.y,
                 _TotalClimb = totalClimb,
+                _FrameRate = manager.GetCurrentFrame()
             };
             var preDistance = totalDistance >= mapData.TotalDistance ? targetData._Distance : targetData._Distance - distance;
             recorderData.PreDistance = Math.Round(preDistance, 6, MidpointRounding.AwayFromZero);
@@ -99,6 +100,13 @@ namespace Assets.Scripts.Scenes.VideoRide
             //    manager.Save(totalDistance);
             //}
         }
+
+        protected override void Forward()
+        {
+            base.Forward();
+            distance = Math.Round(speed / 3600, 5, MidpointRounding.AwayFromZero);
+            totalDistance += distance;
+        }
         //保存骑行记录
         public void Upload() 
         {

Assets/Scripts/UIManager.cs

@@ -684,8 +684,8 @@ public class UIManager : MonoBehaviour
         }
         if (UIManager.Instance.MainPanel != null && parent == UIManager.Instance.MainPanel) 
         {
-            //App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel);
+            App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.HomePanel);
-            App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.NewHomePanel);
+            //App.currentPageIsHome = panelToShow.Equals(UIManager.Instance.NewHomePanel);
         }
 
         if (modal)
@@ -815,10 +815,10 @@ public class UIManager : MonoBehaviour
 
     public static void ShowHomePanel()
     {
-#if !(UNITY_ANDROID || UNITY_IOS)
+//#if !(UNITY_ANDROID || UNITY_IOS)
-        ShowNewHomePanel();
+//        ShowNewHomePanel();
-        return;
+//        return;
-#endif
+//#endif
         App.IsRowerMode = false;
         stack.Clear();
         UIManager.Instance.MainPanel.GetComponent<Image>().sprite =