Browse Source

修改UI显示

DGJ 1 year ago
parent
commit
73249b1049

+ 2 - 2
Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/Mp4Item.prefab

@@ -2329,8 +2329,8 @@ MonoBehaviour:
   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_Material: {fileID: 2100000, guid: 30a5154778bcbad48901337c6de9346d, type: 2}
+  m_Color: {r: 0, g: 1, b: 0.07326913, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 2 - 2
Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/PngJpgItem.prefab

@@ -1021,8 +1021,8 @@ MonoBehaviour:
   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_Material: {fileID: 2100000, guid: 30a5154778bcbad48901337c6de9346d, type: 2}
+  m_Color: {r: 0, g: 1, b: 0.07837677, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 2 - 1
Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Scripts/NewJiantou.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -11,6 +11,7 @@ public class NewJiantou : MonoBehaviour
     void Start()
     {
         cButton.onClick.AddListener(ClickOnBtn);
+        transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
     }
 
     public void Init(int num)

+ 81 - 35
Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -237,12 +237,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 470572325008059687}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6325526256269672135}
+  m_Father: {fileID: 7170918326526118468}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -2989,6 +2989,83 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &2450518144050647029
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7170918326526118468}
+  - component: {fileID: 2354165860971608295}
+  - component: {fileID: 8041133824467914880}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7170918326526118468
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2450518144050647029}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4892795879643234645}
+  m_Father: {fileID: 6325526256269672135}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2354165860971608295
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2450518144050647029}
+  m_CullTransparentMesh: 1
+--- !u!114 &8041133824467914880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2450518144050647029}
+  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: 0.49019608}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, 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 &3563751836224059374
 GameObject:
   m_ObjectHideFlags: 0
@@ -3785,7 +3862,6 @@ GameObject:
   m_Component:
   - component: {fileID: 6325526256269672135}
   - component: {fileID: 4947460359587142076}
-  - component: {fileID: 7501073047456095219}
   - component: {fileID: 101371371462617081}
   m_Layer: 5
   m_Name: HideBtn
@@ -3806,7 +3882,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4892795879643234645}
+  - {fileID: 7170918326526118468}
   m_Father: {fileID: 557765135052244206}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3823,36 +3899,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5573040390527793210}
   m_CullTransparentMesh: 1
---- !u!114 &7501073047456095219
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5573040390527793210}
-  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, 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!114 &101371371462617081
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3893,7 +3939,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 7501073047456095219}
+  m_TargetGraphic: {fileID: 8041133824467914880}
   toggleTransition: 1
   graphic: {fileID: 1336672265609253050}
   m_Group: {fileID: 0}

+ 1 - 1
Assets/Prefab/Route/Materials/LineMat_1_High.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 0f32cd85f823fe84abe068e17c59e180, type: 3}
         m_Scale: {x: 1, y: 3}
-        m_Offset: {x: 0, y: -4.6499996}
+        m_Offset: {x: 0, y: -6.000005}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 14 - 1
Assets/Scenes/LangChaoDemo2.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -16900,6 +16900,7 @@ GameObject:
   - component: {fileID: 1191395393}
   - component: {fileID: 1191395392}
   - component: {fileID: 1191395391}
+  - component: {fileID: 1191395394}
   m_Layer: 0
   m_Name: Canvas
   m_TagString: Untagged
@@ -16989,6 +16990,18 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!114 &1191395394
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1191395389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1195914727
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/Managers/BladeServerManager.cs

@@ -121,7 +121,7 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 #endif
         //  Debug.Log(state);
 
-            if(isDaoHang)
+            //if(isDaoHang)
             TagSynchronization();
     }
 

+ 2 - 2
Assets/Scripts/Managers/WayFindingManager.cs

@@ -92,7 +92,7 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
 
     public void NavigatorServer(MachineObj serverItem)
     {
-        if(listRoot!=null)
+       // if(listRoot!=null)
         for (int i = 0; i < listRoot.Count; i++)
         {
             listRoot[i].gameObject.SetActive(false);
@@ -269,7 +269,7 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
             route1.SetActive(true);
             listRoot.Add(route1.transform.GetChild(0).GetComponent<Route>());
 
-           // listRoot[i].SetRoute(route1.transform.position, lookPoint.position, 0,lookPoint);
+            listRoot[i].SetRoute(route1.transform.position, lookPoint.position, 0,lookPoint);
         }
 
         if (isdevice && machineObj)