Browse Source

美化了巡检,处理了3d的套口模型

wartheking 4 months ago
parent
commit
ebe16c3c6e

+ 2 - 2
Assets/CheckPathLine.mat

@@ -41,7 +41,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 414693b704610af458bee4eb63e98205, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 100, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -78,6 +78,6 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MainCol: {r: 0, g: 1, b: 0.20115566, a: 1}
+    - _MainCol: {r: 0, g: 0.6836562, b: 1, a: 1}
     - _OffsetSpeed: {r: 1, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

+ 3 - 3
Assets/Enviro 3 - Sky and Weather/Profiles/Weather Types/Cloudy 1.asset

@@ -17,7 +17,7 @@ MonoBehaviour:
   showCloudControls: 1
   showFlatCloudControls: 1
   showFogControls: 0
-  showLightingControls: 0
+  showLightingControls: 1
   showAuroraControls: 0
   showEnvironmentControls: 0
   showAudioControls: 0
@@ -69,8 +69,8 @@ MonoBehaviour:
     flatCloudsAmbientIntensity: 1.05
     flatCloudsAbsorbtion: 1.814
   lightingOverride:
-    directLightIntensityModifier: 1
-    ambientIntensityModifier: 1
+    directLightIntensityModifier: 1.04
+    ambientIntensityModifier: 0.24
   fogOverride:
     fogDensity: 0
     fogHeightFalloff: 0.0024

+ 5 - 6
Assets/Prefabs/UI/Item/taskPoint.prefab

@@ -26,8 +26,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6218954533803156374}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 63.75, z: 0}
-  m_LocalScale: {x: 24, y: 27.5, z: 1}
+  m_LocalPosition: {x: 0, y: 3.8, z: 0}
+  m_LocalScale: {x: 4, y: 5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7653964312536426446}
@@ -222,7 +222,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 271d35a4f07e1ca489eb820258b47573, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  targetPoint: {fileID: 0}
-  rect: {fileID: 7653964312536426446}
-  button: {fileID: 0}
-  canvas: {fileID: 0}
+  mat: {fileID: 0}
+  _Camera: {fileID: 0}
+  quadT: {fileID: 0}

File diff suppressed because it is too large
+ 354 - 4
Assets/Scene 1.unity


+ 2 - 1
Assets/Scripts/UI/UIView/3D/GCZLLayer.cs

@@ -187,7 +187,7 @@ public class GCZLLayer : MonoBehaviour
     async void Start()
     {
         await InitData();
-        StaticLod.instance.OnFoucusStatic(0);
+        //StaticLod.instance.OnFoucusStatic(0);
         CameraManager.SwitchCamera(0);
         InitButton();
         InitInformation(0);
@@ -242,6 +242,7 @@ public class GCZLLayer : MonoBehaviour
                     GameObject obj = Instantiate(informationPrefab);
                     string realName = GlobalData.layerUnitDatas[i].name;
                     string priName = GlobalData.layerUnitDatas[i].namePri;
+                    priName = priName.Replace("TaoKou", "NewTaoKou");
                     var objType = GlobalData.layerUnitDatas[i].type;
                     string className = GlobalData.layerUnitDatas[i].GetTypeName();
                     obj.transform.SetParent(informationContent);

+ 5 - 0
Assets/Scripts/UI/UIView/3D/ThreeDNav.cs

@@ -21,6 +21,7 @@ public class ThreeDNav : MonoBehaviour
     {
         CameraManager.SwitchCamera(0);
         InitButton();
+        StaticLod.instance.OnFoucusStatic("NewTaoKou");
     }
     void InitButton()
     {
@@ -61,6 +62,10 @@ public class ThreeDNav : MonoBehaviour
                 {
                     StaticLod.instance.OnFoucusStatic("Bird0");
                 }
+                else {
+
+                    StaticLod.instance.OnFoucusStatic("NewTaoKou");
+                }
             });
         }
     }

+ 15 - 1
Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -88,6 +88,8 @@ public class GCYWLayer : YZTRootLayer
     public List<TaskPointIcon> taskPointIcons = new List<TaskPointIcon>();
     public LineRenderer taskPointLineRenderer;
 
+    public Button closePanelBtn;
+
     private void Awake()
     {
         Init();
@@ -158,6 +160,18 @@ public class GCYWLayer : YZTRootLayer
         TaoKouDataButton = this.transform.Find("TaoKouButton").GetComponent<Button>();
         button_CG2 = TaoKouDataButton.GetComponent<CanvasGroup>();
         TaoKouDataButton.onClick.AddListener(() => { ChangeData(1); });
+
+        closePanelBtn.onClick.AddListener(() =>
+        {
+            taskListPanel.gameObject.SetActive(false);
+            taskPointLineRenderer.positionCount = 0;
+            for (int i = 0; i < taskPointIcons.Count; i++)
+            {
+                Destroy(taskPointIcons[i].gameObject);
+            }
+
+            taskPointIcons.Clear();
+        });
     }
 
     private async void ChangeData(int type)
@@ -373,7 +387,7 @@ public class GCYWLayer : YZTRootLayer
         taskPointLineRenderer.positionCount = itemsArray.Length;
         for (int i = 0; i < taskPointIcons.Count; i++)
         {
-            taskPointLineRenderer.SetPosition(i, taskPointIcons[i].transform.position += Vector3.up * 50);
+            taskPointLineRenderer.SetPosition(i, taskPointIcons[i].transform.position += Vector3.up * 41);
         }
     }
 

+ 2 - 1
Assets/Scripts/UI/UIView/GCYW/TaskListPanel.cs

@@ -13,6 +13,7 @@ public class TaskListPanel : MonoBehaviour
     public Button taskTpye_jianZhuButton;
     public Button taskTpye_zhuanXiangButton;
 
+
     public GameObject taskItemPrefab;
     
     public Transform itemContent;
@@ -23,7 +24,7 @@ public class TaskListPanel : MonoBehaviour
 
     private void Awake()
     {
-           
+        
     }
 
     public void SetData(GCYWLayer baseLayer)

Some files were not shown because too many files changed in this diff