8/26

GQ_TongXin/Assets/Prefabs/Prefabs/告警图标/报警.prefab

@@ -35,11 +35,11 @@ RectTransform:
   m_Father: {fileID: 7270231214890032694}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -143.29999, y: 21.748367}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 79.43, y: 18.01}
+  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &4017683969205238466
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -71,7 +71,7 @@ MonoBehaviour:
   m_text: HARD-8AD
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: -8092961139225985143, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -95,8 +95,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
+  m_fontSize: 15.5
-  m_fontSizeBase: 15
+  m_fontSizeBase: 15.5
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -134,7 +134,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!114 &7596031506882065901
@@ -218,7 +218,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
     m_FontSize: 100
     m_FontStyle: 0
     m_BestFit: 0
@@ -264,11 +264,11 @@ RectTransform:
   m_Father: {fileID: 5232969610057933956}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 18.75, y: 9.75}
+  m_AnchoredPosition: {x: 0.0012574, y: 0}
-  m_SizeDelta: {x: 321.5, y: 19.5}
+  m_SizeDelta: {x: 300, y: 19.5}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6043906610260620220
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -300,7 +300,7 @@ MonoBehaviour:
   m_text: "\u5BF9\u8C61\uFF1A110KV\u5B8B\u7126\u53D8ZXMPS385-1\u684667\u69FD1\u677F"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -324,8 +324,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 10
+  m_fontSize: 13
-  m_fontSizeBase: 10
+  m_fontSizeBase: 13
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -363,7 +363,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &2051890429797106856
@@ -501,8 +501,8 @@ RectTransform:
   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: -11.1, y: 13.1}
+  m_AnchoredPosition: {x: -9.65, y: 13.1}
-  m_SizeDelta: {x: 43.58, y: 30}
+  m_SizeDelta: {x: 41.51, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1638143673985635688
 CanvasRenderer:
@@ -535,7 +535,7 @@ MonoBehaviour:
   m_text: "\u544A\u8B66"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -565,7 +565,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -598,7 +598,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &3170989633102458883
@@ -712,11 +712,11 @@ RectTransform:
   m_Father: {fileID: 7270231214890032694}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.00001335144, y: -12.003349}
+  m_AnchoredPosition: {x: 0.0012512207, y: 0}
-  m_SizeDelta: {x: 359, y: 39}
+  m_SizeDelta: {x: 300, y: 39}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &83367186657582182
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -788,11 +788,11 @@ RectTransform:
   m_Father: {fileID: 5232969610057933956}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 18.75, y: -9.5}
+  m_AnchoredPosition: {x: 0, y: -9.500014}
-  m_SizeDelta: {x: 321.5, y: 19.5}
+  m_SizeDelta: {x: 300, y: 19.5}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5639951130010459929
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -824,7 +824,7 @@ MonoBehaviour:
   m_text: "\u65F6\u95F4\uFF1A2022-07-28  01 : 40 : 41"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -848,8 +848,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 10
+  m_fontSize: 13
-  m_fontSizeBase: 10
+  m_fontSizeBase: 13
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -887,7 +887,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5852380310537560375
@@ -925,9 +925,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 13.5, y: 0.000030517578}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 27, y: 28}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3728124431610591090
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1217,7 +1217,7 @@ GameObject:
   - component: {fileID: 6020242228778469068}
   - component: {fileID: 6020242228778469067}
   - component: {fileID: -80128037531062320}
-  m_Layer: 8
+  m_Layer: 7
   m_Name: "\u62A5\u8B66"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1388,9 +1388,9 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: -0.4815999}
   m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: -23.58}
 --- !u!223 &6020242229500997152
 Canvas:
   m_ObjectHideFlags: 0
@@ -1762,8 +1762,8 @@ RectTransform:
   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: -55, y: 158.6}
+  m_AnchoredPosition: {x: -55, y: 169.88}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 200, y: 27.44}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6112714208998125927
 CanvasRenderer:
@@ -1796,14 +1796,14 @@ MonoBehaviour:
   m_text: "\u544A\u8B66\u4FE1\u606F"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: -8092961139225985143, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4294832490
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.41740823, g: 0.9444232, b: 0.990566, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -1828,7 +1828,7 @@ MonoBehaviour:
   m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -1859,7 +1859,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6112714209819491448
@@ -2050,7 +2050,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: f945cd23a57e99b46ac65684d5bb3be8, type: 3}
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
@@ -2235,11 +2235,11 @@ RectTransform:
   m_Father: {fileID: 8800034579725163021}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.5, y: -31.5}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 365, y: 63}
+  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7020884873726396866
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2643,9 +2643,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 20}
+  m_SizeDelta: {x: 0, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8800034579073477875
 CanvasRenderer:
@@ -2675,8 +2675,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9ac55f1b87607be45947fd40fd667c3e, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2721,9 +2721,9 @@ RectTransform:
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 3, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &8800034579191869753
 CanvasRenderer:
@@ -2848,9 +2848,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 3, y: 3}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8800034579198215110
 CanvasRenderer:
@@ -2939,10 +2939,10 @@ RectTransform:
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 3}
+  m_SizeDelta: {x: 22.91, y: 0}
-  m_Pivot: {x: 1, y: 1}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8800034579660353736
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2971,8 +2971,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 6842aaff952ef154cbbff45f29896fc4, type: 3}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -3066,7 +3066,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.00010711836}
+  m_AnchoredPosition: {x: 0, y: 0.000010070305}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &8800034579725163020
@@ -3082,14 +3082,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 23
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 365, y: 63}
+  m_CellSize: {x: 315.15, y: 63}
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 1
   m_ConstraintCount: 1
@@ -3162,7 +3162,7 @@ MonoBehaviour:
   m_text: 999
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -3225,7 +3225,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &8800034580008906834
@@ -3262,7 +3262,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -3343,8 +3343,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: -37.3}
+  m_AnchoredPosition: {x: 11.95, y: -37.3}
-  m_SizeDelta: {x: 365, y: 377.41}
+  m_SizeDelta: {x: 323.33, y: 377.41}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8800034580144188160
 CanvasRenderer:

GQ_TongXin/Assets/Prefabs/Prefabs/容量图标/容量.prefab

@@ -146,7 +146,7 @@ GameObject:
   - component: {fileID: 6206996799886426826}
   - component: {fileID: 8948933970392760846}
   - component: {fileID: 1810871078493245601}
-  m_Layer: 8
+  m_Layer: 7
   m_Name: "\u5BB9\u91CF"
   m_TagString: Untagged
   m_Icon: {fileID: 0}

GQ_TongXin/Assets/Prefabs/Prefabs/开关门图标.meta

@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 528e17dcf3c5d36448535bf9aa9c1d5c
+guid: 098eb68284edbec4a9e7779021e29701
-PrefabImporter:
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

GQ_TongXin/Assets/Prefabs/Prefabs/搜索框选项.prefab

@@ -174,7 +174,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 190, y: 35}
+  m_SizeDelta: {x: 328, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1223891732822202744
 CanvasRenderer:
@@ -204,7 +204,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c3519ce271255094b9c09d64e9cbc0be, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88dd89560074aac41af381ec73b1595c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -243,9 +243,9 @@ MonoBehaviour:
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
-    m_HighlightedSprite: {fileID: 21300000, guid: c956b62b8e6f40c4a885966cd3eac87a, type: 3}
+    m_HighlightedSprite: {fileID: 21300000, guid: 9df5e701396ef664ca7e0ba1a03dec89, type: 3}
     m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 21300000, guid: c956b62b8e6f40c4a885966cd3eac87a, type: 3}
+    m_SelectedSprite: {fileID: 21300000, guid: 9df5e701396ef664ca7e0ba1a03dec89, type: 3}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal

GQ_TongXin/Assets/Prefabs/Prefabs/摄像头/摄像头_web.prefab

@@ -407,7 +407,7 @@ MonoBehaviour:
   m_text: "\u6444\u50CF01"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: 2319942340616284282, guid: b6aaf136d28747544b874374280f478b, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -695,7 +695,7 @@ GameObject:
   - component: {fileID: 6206996799886426826}
   - component: {fileID: 2305191433559606241}
   - component: {fileID: 7186680284490958309}
-  m_Layer: 8
+  m_Layer: 7
   m_Name: "\u6444\u50CF\u5934_web"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -863,9 +863,9 @@ RectTransform:
   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_AnchoredPosition: {x: 0.084800005, y: -0.6023998}
   m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 4.74, y: -29.62}
 --- !u!223 &6206996800505932326
 Canvas:
   m_ObjectHideFlags: 0

GQ_TongXin/Assets/Prefabs/Prefabs/温湿度图标/温湿度.prefab

@@ -314,6 +314,8 @@ MonoBehaviour:
   shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3}
   textMeshPro: {fileID: 6206996799658441959}
   text: {fileID: 3083355702494639820}
+  hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}
+  temperatureAndHumidity: {fileID: 6206996799886426826}
 --- !u!1 &6206996799886426827
 GameObject:
   m_ObjectHideFlags: 0
@@ -360,7 +362,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 68f1d702490dc544a925e44ca81f3b19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  sp_ui: {fileID: 6206996800221561049}
+  sp_ui: {fileID: 6206996799779127837}
   hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}
 --- !u!114 &-677389066425627936
 MonoBehaviour:
@@ -477,6 +479,8 @@ MonoBehaviour:
   shidu_expand: {fileID: 21300000, guid: 103d978a53ab87c48b69a1bd50d86390, type: 3}
   textMeshPro: {fileID: 6206996799658441959}
   text: {fileID: 3083355702494639820}
+  hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}
+  temperatureAndHumidity: {fileID: 6206996799886426826}
 --- !u!1 &6206996800505932347
 GameObject:
   m_ObjectHideFlags: 0

GQ_TongXin/Assets/Prefabs/Prefabs/红外线/红外线.prefab

@@ -149,7 +149,7 @@ MonoBehaviour:
   m_text: "\u6444\u50CF01"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
-  m_sharedMaterial: {fileID: 2319942340616284282, guid: b6aaf136d28747544b874374280f478b, type: 2}
+  m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -212,7 +212,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6206996799658441977
@@ -417,7 +417,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7053e73e8bfd8ea42b3eb2522d2e89c8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dd0c61f425d71ad4c9c9c185ca27a124, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -437,7 +437,8 @@ GameObject:
   m_Component:
   - component: {fileID: 6206996799886426826}
   - component: {fileID: 2773670996583366210}
-  m_Layer: 8
+  - component: {fileID: 3608763260073886438}
+  m_Layer: 7
   m_Name: "\u7EA2\u5916\u7EBF"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -472,6 +473,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492085b682af94848929d4a7e9be24ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3608763260073886438
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6206996799886426827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70ce68dbe5ab84647986a9dc95fec2c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetCamera: {fileID: 0}
+  distanceMultiplier: 0.05
 --- !u!1 &6206996800221561051
 GameObject:
   m_ObjectHideFlags: 0
@@ -588,9 +603,9 @@ RectTransform:
   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_AnchoredPosition: {x: 0.08640003, y: -0.5957999}
   m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 4.82, y: -29.29}
 --- !u!223 &6206996800505932326
 Canvas:
   m_ObjectHideFlags: 0

GQ_TongXin/Assets/Resources/AlwaysVisibleUI.shader

@@ -0,0 +1,50 @@
+Shader "Custom/AlwaysVisibleUI"
+{
+    Properties
+    {
+        _MainTex("Texture", 2D) = "white" {} // UI的纹理贴图
+    }
+
+        SubShader
+    {
+        Tags { "Queue" = "Overlay" } // 设置UI的渲染队列为 Overlay，使UI始终在其他物体之上
+        LOD 1000
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float4 vertex : SV_POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            sampler2D _MainTex;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = v.uv;
+                return o;
+            }
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}

GQ_TongXin/Assets/Resources/AlwaysVisibleUI.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 6857723deab94e24d99966a3453c1d13
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GQ_TongXin/Assets/Resources/Materials/1Tou.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: RedTou
+  m_Name: 1Tou
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords:
   - _ALPHABLEND_ON
@@ -78,6 +78,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 0
     m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 0.078431375}
+    - _Color: {r: 0.98039216, g: 0.1882353, b: 0, a: 0.1882353}
-    - _EmissionColor: {r: 8, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 4, g: 0.0627451, b: 0, a: 1}
   m_BuildTextureStacks: []

GQ_TongXin/Assets/Resources/Materials/2Tou.mat

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 2Tou
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.98039216, g: 0.6156863, b: 0, a: 0.45882353}
+    - _EmissionColor: {r: 0.98039216, g: 0.31550145, b: 0, a: 1}
+  m_BuildTextureStacks: []

GQ_TongXin/Assets/Resources/Materials/2Tou.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 2e498d1c8094910479dc3e1b768306a4
+guid: 85abaa01054d98f4587468930ed8ce8b
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GQ_TongXin/Assets/Resources/Materials/3Tou.mat

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 3Tou
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.94509804, g: 0.98039216, b: 0, a: 0.45882353}
+    - _EmissionColor: {r: 1, g: 0.81249994, b: 0, a: 1}
+  m_BuildTextureStacks: []

GQ_TongXin/Assets/Resources/Materials/3Tou.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8be3c2656e18be24a933f5cb5ef5243e
+guid: b744dead1c3cdf24ba52d93efb3ce899
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GQ_TongXin/Assets/Resources/Materials/4Tou.mat

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 4Tou
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.5058824, g: 0.98039216, b: 0, a: 0.1882353}
+    - _EmissionColor: {r: 0, g: 1.9607843, b: 0.023529412, a: 1}
+  m_BuildTextureStacks: []

GQ_TongXin/Assets/Resources/Materials/4Tou.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: e73a58f6e2794ae7b1b7e50b7fb811b0
+guid: fcefe2506f20ff0418fd3958a81f483d
-timeCreated: 1484172806
-licenseType: Pro
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GQ_TongXin/Assets/Resources/null.mat

@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: null
+  m_Shader: {fileID: 4800000, guid: 6857723deab94e24d99966a3453c1d13, type: 3}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  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_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

GQ_TongXin/Assets/Resources/null.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8f586378b4e144a9851e7b34d9b748ee
+guid: ee598e0da2f1f3d4d88cf9c6bac48f3e
-timeCreated: 1484171803
-licenseType: Pro
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GQ_TongXin/Assets/Resources/高亮.prefab

@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3489784258321174485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6593972720402440799}
+  - component: {fileID: 8879292236919044331}
+  - component: {fileID: 9097668286505323095}
+  m_Layer: 0
+  m_Name: "\u9AD8\u4EAE"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6593972720402440799
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3489784258321174485}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.004, z: -0}
+  m_LocalScale: {x: 0.70983, y: 0.6947834, z: 2.3133}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8879292236919044331
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3489784258321174485}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &9097668286505323095
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3489784258321174485}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c123eb6606afccb49b2a88ffaccb6e2c, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}

GQ_TongXin/Assets/Resources/高亮.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 98b5e43126c72984ea5943a644a9297d
+guid: dffd222292a0c4847b5a377fa2e8cb78
 PrefabImporter:
   externalObjects: {}
   userData: 

GQ_TongXin/Assets/Scripts/SearchName.cs

@@ -26,7 +26,7 @@ public class SearchName : MonoBehaviour
     {
         searchType = SearchType.None;
         //scrollView.SetActive(false);
-        InputFieldEvent();
+        //InputFieldEvent();
     }
 
     void InputFieldEvent()
@@ -144,7 +144,10 @@ public class SearchName : MonoBehaviour
         int childCount = SearchObjects.Count;
         for (int i = 0; i < childCount; i++)
         {
-            scrollViewContent.GetChild(i).GetComponent<Button>().onClick.RemoveAllListeners();
+            int eventCount = scrollViewContent.GetChild(i).GetComponent<Button>().onClick.GetPersistentEventCount();
+
+            if (eventCount > 0)
+                scrollViewContent.GetChild(i).GetComponent<Button>().onClick.RemoveAllListeners();
             //FindGo(objs, i, (go) =>
             //{
             var jigui = GameManager.Inst.FindParent(scrollViewContent.GetChild(i).gameObject, GameManager.Inst.IsDesiredParent);
@@ -309,6 +312,8 @@ public class SearchName : MonoBehaviour
         SearchObjects.Clear();
 
         inputField.transform.Find("Text Area/Placeholder").GetComponent<TextMeshProUGUI>().text = "ÇëÊäÈëÒªËÑË÷µÄ" + searchType.ToString().Split('_')[0];
+
+        scrollView.transform.Find("±íÍ·/Text (TMP)").GetComponent<TextMeshProUGUI>().text = searchType.ToString().Split('_')[0] + "Ãû³Æ";
     }
 
     private void Update()

GQ_TongXin/Assets/Scripts/WJ/CabinetUIBase.cs

@@ -11,15 +11,15 @@ public class CabinetUIBase : MonoBehaviour
         if (WebInteraction.Inst.isWorkPlay && menu != Menu.M_全景监控_现场作业)
             WebInteraction.Inst.CloseTicket();
 
-        if (menu == Menu.M_数字孪生_场景管理) 
+        //if (menu == Menu.M_数字孪生_场景管理) 
-        {
+        //{
 
-            Camera.main.GetComponent<PhysicsRaycaster>().enabled = true;
+        //    Camera.main.GetComponent<PhysicsRaycaster>().enabled = true;
-        }
+        //}
-        else
+        //else
-        {
+        //{
-            Camera.main.GetComponent<PhysicsRaycaster>().enabled = false;
+        //    Camera.main.GetComponent<PhysicsRaycaster>().enabled = false;
-        }
+        //}
 
         CreateLine createLine = PatternChoose.Inst.transform.Find("画线").GetComponent<CreateLine>();
         if (!CheckAllChildrenActive(createLine.gameObject) && menu != Menu.M_数字孪生_线缆连接_展示)

GQ_TongXin/Assets/Scripts/WJ/CabinetUIManager.cs

@@ -13,6 +13,8 @@ public class CabinetUIManager : MonoBehaviour
 
     public List<CabinetUIBase> cabinet_ui_base_list = new List<CabinetUIBase>();
 
+    public List<TransparentGlow> transparentGlows_list = new List<TransparentGlow>();
+
     private void Awake()
     {
         Instance = this;
@@ -21,6 +23,7 @@ public class CabinetUIManager : MonoBehaviour
     private void Start()
     {
         cabinet_ui_base_list = GetComponentsInChildren<CabinetUIBase>(true).ToList();
+        transparentGlows_list = GetComponentsInChildren<TransparentGlow>(true).ToList();
     }
 
     public static void ChangeMenu(Menu menu)

GQ_TongXin/Assets/Scripts/WJ/SpUI.cs

@@ -21,6 +21,9 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 
     public TextMeshProUGUI textMeshPro;
     public Text text;
+
+    public Color hightC;
+    public Transform temperatureAndHumidity;
     public void OnPointerEnter(PointerEventData eventData)
     {
         expand_image.gameObject.SetActive(true);
@@ -63,17 +66,35 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 
     public void ChangeWSD(string wsd)
     {
+        if (gameObject.name == "Expand") 
+            return;
+        string _a=null;
+        string _b=null;
         switch (TemperatureAndHumidity.current_state)
         {
             case "ζÈ":
-                my_image.sprite = wendu_normal;
+                {
+                    _a = temperatureAndHumidity.parent.GetComponent<ENVQuery>().eNVList_W.collectResult;
+                    _b = GameManager.Inst.arguments.heatThresholdValue;
+                    my_image.sprite = wendu_normal;
+                }
                 break;
             case "ʪ¶È":
-                my_image.sprite = shidu_normal;
+                {
+                    _a = temperatureAndHumidity.parent.GetComponent<ENVQuery>().eNVList_S.collectResult;
+                    _b = GameManager.Inst.arguments.humidityThresholdValue;
+                    my_image.sprite = shidu_normal;
+                }
                 break;
             default:
                 break;
         }
+        var a = string.IsNullOrEmpty(_a) ? "0" : _a;
+        var b = string.IsNullOrEmpty(_b) ? "0" : _b;
+        if (float.Parse(a) > float.Parse(b))
+            my_image.color = hightC;
+        else
+            my_image.color = new Color(1, 1, 1, 1);
     }
 
     void Update() 

GQ_TongXin/Assets/Scripts/WJ/TemperatureAndHumidity.cs

@@ -51,27 +51,11 @@ public class TemperatureAndHumidity : CabinetUIBase
         base.OnMenuChanged(menu);
         if (menu == Menu.M_全景监控_温度)
         {
-            var _a = transform.parent.GetComponent<ENVQuery>().eNVList_W.collectResult;
-            var _b = GameManager.Inst.arguments.heatThresholdValue;
-            var a = string.IsNullOrEmpty(_a) ? "0" : _a;
-            var b = string.IsNullOrEmpty(_b) ? "0" : _b;
-            if (float.Parse(a) > float.Parse(b))
-                transform.Find("Canvas/Icon").GetComponent<Image>().color = hightC;
-            else
-                transform.Find("Canvas/Icon").GetComponent<Image>().color = new Color(1, 1, 1, 1);
             gameObject.SetActive(true);
             ChangeState("温度");
         }
         else if (menu == Menu.M_全景监控_湿度)
         {
-            var _a = transform.parent.GetComponent<ENVQuery>().eNVList_S.collectResult;
-            var _b = GameManager.Inst.arguments.humidityThresholdValue;
-            var a = string.IsNullOrEmpty(_a) ? "0" : _a;
-            var b = string.IsNullOrEmpty(_b) ? "0" : _b;
-            if (float.Parse(a) > float.Parse(b))
-                transform.Find("Canvas/Icon").GetComponent<Image>().color = hightC;
-            else
-                transform.Find("Canvas/Icon").GetComponent<Image>().color = new Color(1, 1, 1, 1);
             gameObject.SetActive(true);
             ChangeState("湿度");
         }

GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs

@@ -32,6 +32,7 @@ public class UIToCabinet : MonoBehaviour
                     {
                         case "Toggle_设备告警":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 GameManager.Inst.search_box.SetActive(true);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_设备告警);
@@ -39,6 +40,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_全景监控":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 GameManager.Inst.search_box.SetActive(true);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_设备告警);
@@ -46,6 +48,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_数字孪生":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.DisplayCapacity(ison);
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_机柜容量);
@@ -53,6 +56,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_温湿度":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 GameManager.Inst.search_box.SetActive(true);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_温度);
@@ -60,6 +64,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_柜门状态":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.DoorCondition(/*ison*/);
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 GameManager.Inst.search_box.SetActive(true);
@@ -68,12 +73,14 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_红外监测":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.search_box.SetActive(false);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_红外监测);
                             }
                             break;
                         case "Toggle_现场作业":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 if (BoolMonitor.Value)
                                 {
                                     
@@ -85,6 +92,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_摄像头":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 //if (BoolMonitor.Value)
                                 //    WebInteraction.Inst.OpenVideo();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
@@ -93,16 +101,21 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_机柜容量":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 GameManager.Inst.DisplayCapacity(ison);
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_机柜容量);
                             }
                             break;
                         case "Toggle_接地网":
-                            CabinetUIManager.ChangeMenu(Menu.M_数字孪生_接地网);
+                            {
+                                ExtendedFlycam.Inst.QuanJing();
+                                CabinetUIManager.ChangeMenu(Menu.M_Êý×ÖÂÏÉú_½ÓµØÍø);
+                            }
                             break;
                         case "Toggle_线缆链接":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 CreateLine createLine = PatternChoose.Inst.transform.Find("画线").GetComponent<CreateLine>();
                                 createLine.OnMenuChanged(Menu.M_数字孪生_线缆连接_展示);
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_线缆连接_展示);
@@ -110,6 +123,7 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_场景管理":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.power_open();
                                 
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_场景管理);
@@ -117,31 +131,36 @@ public class UIToCabinet : MonoBehaviour
                             break;
                         case "Toggle_智能巡检":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.search_box.SetActive(false);
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_智能巡检);
                             }
                             break;
                         case "Toggle_温度":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_温度);
                             }
                             break;
                         case "Toggle_湿度":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 PatternChoose.Inst.transform.Find("Panel搜索框").GetComponent<SearchName>().LoadCabinet(SearchName.SearchType.机柜);
                                 CabinetUIManager.ChangeMenu(Menu.M_全景监控_湿度);
                             }
                             break;
                         case "Toggle_线缆连接展示":
                             {
+                                ExtendedFlycam.Inst.QuanJing();
                                 CreateLine createLine = PatternChoose.Inst.transform.Find("画线").GetComponent<CreateLine>();
                                 createLine.OnMenuChanged(Menu.M_数字孪生_线缆连接_展示);
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_线缆连接_展示);
                             }
                             break;
                         case "Toggle_线缆连接配置":
-                            {                                
+                            {
+                                ExtendedFlycam.Inst.QuanJing();
                                 GameManager.Inst.power_open();
                                 CabinetUIManager.ChangeMenu(Menu.M_数字孪生_线缆连接_配置);
                             }

GQ_TongXin/Assets/StreamingAssets/dz.txt

@@ -1 +1 @@
-http://fsttu5.natappfree.cc/
+http://6vjjw4.natappfree.cc/

GQ_TongXin/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat

@@ -1,106 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF - Drop Shadow
-  m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ShaderKeywords: OUTLINE_ON UNDERLAY_ON
-  m_LightmapFlags: 5
-  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}
-    - _Cube:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 28684132378477856, guid: 8f586378b4e144a9851e7b34d9b748ee,
-          type: 2}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OutlineTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _ColorMask: 15
-    - _Diffuse: 0.5
-    - _DiffusePower: 1
-    - _FaceDilate: 0.1
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.1
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.64125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SpecularPower: 2
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0.5
-    - _UnderlayOffsetY: -0.5
-    - _UnderlaySoftness: 0.05
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}

GQ_TongXin/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -1,356 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2180264
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF Material
-  m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 1
-  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}
-    - _Cube:
-        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}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 28268798066460806}
-        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}
-    - _OutlineTex:
-        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_Ints: []
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _CullMode: 0
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _Diffuse: 0.5
-    - _DstBlend: 0
-    - _FaceDilate: 0
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0
-    - _Parallax: 0.02
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.73125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SpecularPower: 2
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 512
-    - _TextureWidth: 512
-    - _UVSec: 0
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_BuildTextureStacks: []
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: LiberationSans SDF - Fallback
-  m_EditorClassIdentifier: 
-  hashCode: -1699145518
-  material: {fileID: 2180264}
-  materialHashCode: 462855346
-  m_Version: 1.1.0
-  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
-  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
-  m_AtlasPopulationMode: 1
-  m_FaceInfo:
-    m_FaceIndex: 0
-    m_FamilyName: Liberation Sans
-    m_StyleName: Regular
-    m_PointSize: 86
-    m_Scale: 1
-    m_LineHeight: 98.8916
-    m_AscentLine: 77.853516
-    m_CapLine: 59
-    m_MeanLine: 45
-    m_Baseline: 0
-    m_DescentLine: -18.22461
-    m_SuperscriptOffset: 77.853516
-    m_SuperscriptSize: 0.5
-    m_SubscriptOffset: -18.22461
-    m_SubscriptSize: 0.5
-    m_UnderlineOffset: -12.261719
-    m_UnderlineThickness: 6.298828
-    m_StrikethroughOffset: 18
-    m_StrikethroughThickness: 6.298828
-    m_TabWidth: 24
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: 28268798066460806}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 0
-  m_ClearDynamicDataOnBuild: 1
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 511
-    m_Height: 511
-  m_fontInfo:
-    Name: Liberation Sans
-    PointSize: 86
-    Scale: 1
-    CharacterCount: 250
-    LineHeight: 98.90625
-    Baseline: 0
-    Ascender: 77.84375
-    CapHeight: 59.1875
-    Descender: -18.21875
-    CenterLine: 0
-    SuperscriptOffset: 77.84375
-    SubscriptOffset: -12.261719
-    SubSize: 0.5
-    Underline: -12.261719
-    UnderlineThickness: 6.298828
-    strikethrough: 23.675
-    strikethroughThickness: 0
-    TabWidth: 239.0625
-    Padding: 9
-    AtlasWidth: 1024
-    AtlasHeight: 1024
-  atlas: {fileID: 0}
-  m_AtlasWidth: 512
-  m_AtlasHeight: 512
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4169
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
-  m_FallbackFontAssetTable: []
-  m_CreationSettings:
-    sourceFontFileName: 
-    sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-    pointSizeSamplingMode: 0
-    pointSize: 86
-    padding: 9
-    packingMode: 4
-    atlasWidth: 512
-    atlasHeight: 512
-    characterSetSelectionMode: 1
-    characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
-    referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4169
-    includeFontFeatures: 1
-  m_FontWeightTable:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  fontWeights:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  normalStyle: 0
-  normalSpacingOffset: 0
-  boldStyle: 0.75
-  boldSpacing: 7
-  italicStyle: 35
-  tabSize: 10
---- !u!28 &28268798066460806
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF Atlas
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
-  m_MipsStripped: 0
-  m_TextureFormat: 1
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_VTOnly: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 0
-  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

GQ_TongXin/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat

@@ -1,104 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF - Outline
-  m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ShaderKeywords: OUTLINE_ON
-  m_LightmapFlags: 5
-  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}
-    - _Cube:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 28684132378477856, guid: 8f586378b4e144a9851e7b34d9b748ee,
-          type: 2}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OutlineTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _ColorMask: 15
-    - _Diffuse: 0.5
-    - _FaceDilate: 0.1
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.1
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.64125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SpecularPower: 2
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}

GQ_TongXin/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 79459efec17a4d00a321bdcc27bbc385
-timeCreated: 1484172856
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GQ_TongXin/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

@@ -1,269 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2180264
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF Material
-  m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 28684132378477856}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _CullMode: 0
-    - _FaceDilate: 0
-    - _GradientScale: 10
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineWidth: 0
-    - _PerspectiveFilter: 0.875
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 1
-    - _ScaleRatioC: 0.73125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_BuildTextureStacks: []
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: LiberationSans SDF
-  m_EditorClassIdentifier: 
-  hashCode: 231247347
-  material: {fileID: 2180264}
-  materialHashCode: 198912371
-  m_Version: 1.1.0
-  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
-  m_SourceFontFile: {fileID: 0}
-  m_AtlasPopulationMode: 0
-  m_FaceInfo:
-    m_FaceIndex: 0
-    m_FamilyName: Liberation Sans
-    m_StyleName: Regular
-    m_PointSize: 86
-    m_Scale: 1
-    m_LineHeight: 98.8916
-    m_AscentLine: 77.853516
-    m_CapLine: 59
-    m_MeanLine: 45
-    m_Baseline: 0
-    m_DescentLine: -18.22461
-    m_SuperscriptOffset: 77.853516
-    m_SuperscriptSize: 0.5
-    m_SubscriptOffset: -18.22461
-    m_SubscriptSize: 0.5
-    m_UnderlineOffset: -12.261719
-    m_UnderlineThickness: 6.298828
-    m_StrikethroughOffset: 18
-    m_StrikethroughThickness: 6.298828
-    m_TabWidth: 24
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: 28684132378477856}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 0
-  m_ClearDynamicDataOnBuild: 0
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 1023
-    m_Height: 1023
-  m_fontInfo:
-    Name: Liberation Sans
-    PointSize: 86
-    Scale: 1
-    CharacterCount: 250
-    LineHeight: 98.90625
-    Baseline: 0
-    Ascender: 77.84375
-    CapHeight: 59.1875
-    Descender: -18.21875
-    CenterLine: 0
-    SuperscriptOffset: 77.84375
-    SubscriptOffset: -12.261719
-    SubSize: 0.5
-    Underline: -12.261719
-    UnderlineThickness: 6.298828
-    strikethrough: 23.675
-    strikethroughThickness: 0
-    TabWidth: 239.0625
-    Padding: 9
-    AtlasWidth: 1024
-    AtlasHeight: 1024
-  atlas: {fileID: 0}
-  m_AtlasWidth: 1024
-  m_AtlasHeight: 1024
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4169
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
-  m_FallbackFontAssetTable:
-  - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
-  m_CreationSettings:
-    sourceFontFileName: 
-    sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-    pointSizeSamplingMode: 0
-    pointSize: 86
-    padding: 9
-    packingMode: 4
-    atlasWidth: 1024
-    atlasHeight: 1024
-    characterSetSelectionMode: 1
-    characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
-    referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4169
-    includeFontFeatures: 1
-  m_FontWeightTable:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  fontWeights:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  normalStyle: 0
-  normalSpacingOffset: 0
-  boldStyle: 0.75
-  boldSpacing: 7
-  italicStyle: 35
-  tabSize: 10
---- !u!28 &28684132378477856
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: LiberationSans SDF Atlas
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 3
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
-  m_MipsStripped: 0
-  m_TextureFormat: 1
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: -92
-  m_VTOnly: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 0
-  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
-  m_OriginalWidth: 0
-  m_OriginalHeight: 0
-  m_OriginalAssetGuid: 00000000000000000000000000000000

GQ_TongXin/Assets/UI/古泉切图/门把手.png.meta

@@ -0,0 +1,134 @@
+fileFormatVersion: 2
+guid: fac36483583954b4cb254ec88575b88a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GQ_TongXin/Assets/prefab/机柜/机柜和机柜门打组.prefab

@@ -10002,7 +10002,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6514586771589566833}
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 3.9565144, y: 1.1303972, z: -8.936959}
+  m_LocalPosition: {x: -3.002, y: 1.1303972, z: -8.936959}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

GQ_TongXin/Assets/script/GameManager.cs

@@ -115,7 +115,7 @@ public class GameManager : MonoBehaviour
     /// 场景方大状态
     /// </summary>
     [Header("----------场景方大状态--------------")]
-    public bool magnifyState=false;
+    public bool magnifyState = false;
 
     private void Awake()
     {
@@ -133,7 +133,7 @@ public class GameManager : MonoBehaviour
 
     private void Start()
     {
-        
+
     }
 
     private void OnEnable()
@@ -316,6 +316,7 @@ public class GameManager : MonoBehaviour
         {
             //板卡下所有设备
             var dk = TmsCards_go[i].transform.GetComponentsInChildren<PortQuery>().ToList();
+            if (dk == null) continue;
             for (int j = 0; j < dk.Count; j++)
             {
                 TmsPorts_go.Add(dk[j].gameObject);
@@ -325,15 +326,17 @@ public class GameManager : MonoBehaviour
         {
             //机框下所有设备
             var dk = Racks_go[i].transform.GetComponentsInChildren<PortQuery>().ToList();
+            if (dk == null) continue;
             for (int j = 0; j < dk.Count; j++)
             {
                 TmsPorts_go.Add(dk[j].gameObject);
             }
         }
-        for (int i = 0; i < MachineSlots.Count; i++)//遍历机槽
+        for (int i = 0; i < MachineSlots_go.Count; i++)//遍历机槽
         {
             //机槽下所有设备
             var dk = MachineSlots_go[i].transform.GetComponentsInChildren<PortQuery>().ToList();
+            if (dk==null) continue;
             for (int j = 0; j < dk.Count; j++)
             {
                 TmsPorts_go.Add(dk[j].gameObject);
@@ -647,7 +650,7 @@ public class GameManager : MonoBehaviour
         {
             DestroyImmediate(TmsCards_go[i]);
         }
-        
+
         Cabinets.Clear();
 
         Racks_go.Clear();
@@ -1122,38 +1125,48 @@ public class GameManager : MonoBehaviour
         {
             var D = Cabinets_go[i].GetComponent<DeviceQuery>().deviceList;
             //var H = Cabinets_go[i].GetComponent<HighlightEffect>();
-            try
+            //try
-            {
+            //{
-                go = Cabinets_go[i].transform.Find(Cabinets_go[i].name).gameObject;
+            //    go = Cabinets_go[i].transform.Find(Cabinets_go[i].name).gameObject;
-            }
+            //}
-            catch (Exception)
+            //catch (Exception)
-            {
+            //{
-                go = Cabinets_go[i];
+            //    go = Cabinets_go[i];
-            }
+            //}
             //var M = go.GetComponent<Renderer>().materials[0];
             //var M_old = Cabinets_go[i].GetComponent<TransparentGlow>().empty[0];
             //var M_new = new Material(M_old);
 
+            var hight = Cabinets_go[i].transform.Find("高亮").gameObject;
+
             if (string.IsNullOrEmpty(D.residueNum)) continue;
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.25f))
             {
                 //M_new.SetColor(c1);
-                ChangeMaterialColor(go, 0, c1);
+                //ChangeMaterialColor(go, 0, c1);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/1Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.5f))
             {
                 // M_new.color = c2;
-                ChangeMaterialColor(go, 0, c2);
+                //ChangeMaterialColor(go, 0, c2);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/2Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.75f))
             {
                 //M_new.color = c3;
-                ChangeMaterialColor(go, 0, c3);
+                //ChangeMaterialColor(go, 0, c3);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42))
             {
                 //M_new.color = c4;
-                ChangeMaterialColor(go, 0, c4);
+                //ChangeMaterialColor(go, 0, c4);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/4Tou");
             }
         }
 
@@ -1193,26 +1206,36 @@ public class GameManager : MonoBehaviour
             //var M_old = Cabinets_go[i].GetComponent<TransparentGlow>().empty[0];
             //var M_new = new Material(M_old);
 
+            var hight = Cabinets_go[i].transform.Find("高亮").gameObject;
+
             if (string.IsNullOrEmpty(D.residueNum)) continue;
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.25f))
             {
                 //M_new.SetColor(c1);
-                ChangeMaterialColor(go, 0, c1);
+                //ChangeMaterialColor(go, 0, c1);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/1Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.5f))
             {
                 // M_new.color = c2;
-                ChangeMaterialColor(go, 0, c2);
+                //ChangeMaterialColor(go, 0, c2);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/2Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42 * 0.75f))
             {
                 //M_new.color = c3;
-                ChangeMaterialColor(go, 0, c3);
+                //ChangeMaterialColor(go, 0, c3);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
             }
             else if (Convert.ToSingle(D.residueNum) <= (42))
             {
                 //M_new.color = c4;
-                ChangeMaterialColor(go, 0, c4);
+                //ChangeMaterialColor(go, 0, c4);
+                hight.SetActive(true);
+                hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/4Tou");
             }
         }
 
@@ -1224,19 +1247,22 @@ public class GameManager : MonoBehaviour
     [ContextMenu("关闭高亮")]
     public void CloseHighlight()
     {
-        GameObject go;
+        //GameObject go;
         for (int i = 0; i < Cabinets_go.Count; i++)
         {
-            try
+            //    try
-            {
+            //    {
-                go = Cabinets_go[i].transform.Find(Cabinets_go[i].name).gameObject;
+            //        go = Cabinets_go[i].transform.Find(Cabinets_go[i].name).gameObject;
-            }
+            //    }
-            catch (Exception)
+            //    catch (Exception)
-            {
+            //    {
-                go = Cabinets_go[i];
+            //        go = Cabinets_go[i];
-            }
+            //    }
-            ChangeMaterialColor(go, 0, new Color(1, 1, 1, 1));
+            //    ChangeMaterialColor(go, 0, new Color(1, 1, 1, 1));
+            var hight = Cabinets_go[i].transform.Find("高亮").gameObject;
+            hight.SetActive(false);
         }
+
     }
 
     /// <summary>
@@ -1264,12 +1290,13 @@ public class GameManager : MonoBehaviour
         for (int i = 0; i < Cabinets_go.Count; i++)
         {
             var D = Cabinets_go[i].GetComponent<DeviceQuery>().deviceList;
+            var hight = Cabinets_go[i].transform.Find("高亮").gameObject;
             //var H = Cabinets_go[i].GetComponent<HighlightEffect>();
             if (string.IsNullOrEmpty(D.openFlag)) continue;
             else if (D.openFlag == "0")
             {
                 //关
-
+                hight.SetActive(false);
             }
             else if (D.openFlag == "1")
             {
@@ -1284,7 +1311,11 @@ public class GameManager : MonoBehaviour
                     go = Cabinets_go[i];
                 }
                 if (go)
-                    ChangeMaterialColor(go, 0, c);
+                {
+                    //ChangeMaterialColor(go, 0, c);
+                    hight.SetActive(true);
+                    hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
+                }
                 var door = Array.Find(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item =>
                 {
                     return item.name.Contains("Object");
@@ -1305,12 +1336,13 @@ public class GameManager : MonoBehaviour
         for (int i = 0; i < Cabinets_go.Count; i++)
         {
             var D = Cabinets_go[i].GetComponent<DeviceQuery>().deviceList;
+            var hight = Cabinets_go[i].transform.Find("高亮").gameObject;
             //var H = Cabinets_go[i].GetComponent<HighlightEffect>();
             if (string.IsNullOrEmpty(D.openFlag)) continue;
             else if (D.openFlag == "0")
             {
                 //关
-
+                hight.SetActive(true);
             }
             else if (D.openFlag == "1")
             {
@@ -1325,7 +1357,11 @@ public class GameManager : MonoBehaviour
                     go = Cabinets_go[i];
                 }
                 if (go)
-                    ChangeMaterialColor(go, 0, c);
+                {
+                    //ChangeMaterialColor(go, 0, c);
+                    hight.SetActive(true);
+                    hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/3Tou");
+                }
                 var door = Array.Find(Cabinets_go[i].transform.GetComponentsInChildren<Renderer>(), item =>
                 {
                     return item.name.Contains("Object");
@@ -1372,6 +1408,19 @@ public class GameManager : MonoBehaviour
         CloseHighlight();
     }
 
+    /// <summary>
+    /// 开门（单个）
+    /// </summary>
+    /// <param name="cabinet"></param>
+    public void power_open(GameObject cabinet)
+    {
+        var door = Array.Find(cabinet.GetComponentsInChildren<Renderer>(), item =>
+        {
+            return item.name.Contains("Object");
+        });
+        if (door)
+            door.transform.localRotation = Quaternion.Euler(Vector3.forward * -90);
+    }
 
     /// <summary>
     /// 变色
@@ -1400,6 +1449,40 @@ public class GameManager : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// 变色
+    /// </summary>
+    /// <param name="go"></param>
+    /// <param name="materialIndex"></param>
+    /// <param name="newColor"></param>
+    public void ChangeMaterialColor(GameObject go, int index)
+    {
+
+        var hight = go.transform.Find("高亮").gameObject;
+
+        Material material = null;
+
+        switch (index)
+        {
+            case 1:
+                material = Resources.Load<Material>("Materials/1Tou");
+                break;
+            case 2:
+                material = Resources.Load<Material>("Materials/2Tou");
+                break;
+            case 3:
+                material = Resources.Load<Material>("Materials/3Tou");
+                break;
+            case 4:
+                material = Resources.Load<Material>("Materials/4Tou");
+                break;
+            default:
+                break;
+        }
+        hight.GetComponent<Renderer>().material = material;
+        hight.SetActive(true);
+
+    }
 
     private void OnDisable()
     {
@@ -1490,7 +1573,7 @@ public class GameManager : MonoBehaviour
     /// <returns></returns>
     public GameObject FindParent(GameObject gameObject, System.Predicate<GameObject> condition)
     {
-        if (gameObject == null) 
+        if (gameObject == null)
             return null;
         Transform parent = gameObject.transform.parent;
         while (parent != null)
@@ -1577,7 +1660,7 @@ public class GameManager : MonoBehaviour
         Load_TmsAlarm();
         Load_ENV();
 
-        Application.ExternalCall("OnSceneLoaded","三维加载完成");
+        Application.ExternalCall("OnSceneLoaded", "三维加载完成");
         //三维场景加载时显示地图
         isLoading = true;
     }

GQ_TongXin/Assets/script/TOOL.cs

@@ -1,10 +1,13 @@
 using AutoMapper;
 using System;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class TOOL : MonoBehaviour
 {
+
     public List<GameObject> gameObjects;
     public List<Transform> Uwei;
 
@@ -18,9 +21,14 @@ public class TOOL : MonoBehaviour
 
     public RedactDevice redactDevice;
 
+    public TMP_FontAsset f_old;
+    public TMP_FontAsset f_new;
+    public Font font_old;
+    public Font font_new;
+
     void Start()
     {
-
+        
     }
 
     private void OnDropdownValueChanged_port(int arg0)
@@ -263,4 +271,91 @@ public class TOOL : MonoBehaviour
                 item.gameObject.AddComponent<ENVQuery>();
         });
     }
+
+
+    public GameObject originalObject; // 模型的原始游戏对象
+
+    [ContextMenu("根据mesh生成立方体")]
+    public void GenerateCubeFromMesh()
+    {
+        //获取原始对象的Mesh
+        Mesh originalMesh = originalObject.GetComponent<MeshFilter>().sharedMesh;
+
+        //创建一个新的游戏对象和网格
+        GameObject cubeObject = new GameObject("Cube");
+
+        Mesh cubeMesh = new Mesh();
+
+        //设置立方体的顶点数据
+        Vector3[] vertices = new Vector3[originalMesh.vertices.Length];
+        for (int i = 0; i < vertices.Length; i++)
+        {
+            vertices[i] = originalMesh.vertices[i];
+        }
+
+        //创建立方体的三角形面
+        int[] triangles = new int[originalMesh.triangles.Length];
+        for (int i = 0; i < triangles.Length; i++)
+        {
+            triangles[i] = originalMesh.triangles[i];
+        }
+
+        //将顶点和三角形面设置到网格中
+        cubeMesh.vertices = vertices;
+        cubeMesh.triangles = triangles;
+
+        //设置网格的UV坐标和法线
+        cubeMesh.uv = originalMesh.uv;
+        cubeMesh.normals = originalMesh.normals;
+
+        //将网格赋值给立方体对象的MeshFilter组件
+        MeshFilter cubeMeshFilter = cubeObject.AddComponent<MeshFilter>();
+        cubeMeshFilter.mesh = cubeMesh;
+
+        //添加立方体对象的MeshRenderer组件并共享材质
+        MeshRenderer cubeMeshRenderer = cubeObject.AddComponent<MeshRenderer>();
+        cubeMeshRenderer.sharedMaterial = originalObject.GetComponent<MeshRenderer>().sharedMaterial;
+
+        cubeObject.transform.parent = transform;
+    }
+
+    [ContextMenu("添加高亮立方体")]
+    public void addcube()
+    {
+
+        for (int i = 0; i < gameObjects.Count; i++)
+        {
+            // GameObject cubeObject = GameObject.Instantiate(Resources.Load<GameObject>("高亮"), gameObjects[i].transform);
+
+            //// cubeObject.transform.parent = gameObjects[i].transform;
+
+            // cubeObject.transform.transform.localPosition = Vector3.zero;
+            // cubeObject.transform.transform.localEulerAngles = Vector3.zero;
+            // //cubeObject.transform.transform.localScale = Vector3.one;
+
+
+            var a = gameObjects[i].transform.GetChild(gameObjects[i].transform.childCount - 1);
+            a.name= "高亮";
+        }
+    }
+
+    [ContextMenu("修改tmp字体")]
+    public void srtTMP()
+    {
+        Array.ForEach(GameObject.FindObjectsOfType<TextMeshProUGUI>(true), (item) =>
+         {
+             if (item.font == null)
+                 item.font = f_new;
+         });
+    }
+
+    [ContextMenu("修改字体")]
+    public void setFont() 
+    {
+        Array.ForEach(GameObject.FindObjectsOfType<Text>(true), (item) =>
+        {
+            if (item.font == null)
+                item.font = font_new;
+        });
+    }
 }

GQ_TongXin/Assets/script/UI/AutoScaleUI.cs

@@ -22,6 +22,8 @@ public class AutoScaleUI : MonoBehaviour
 
         Vector3 cameraToCanvasPlane = transform.position - targetCamera.transform.position;
         float distance = Vector3.Dot(cameraToCanvasPlane, targetCamera.transform.forward);
+        if (distance * distanceMultiplier > 1)
+            distance = 1f / distanceMultiplier;
         transform.localScale = initialScale * distance * distanceMultiplier;
     }
 

GQ_TongXin/Assets/script/前端交互/WebInteraction.cs

@@ -229,9 +229,17 @@ public class WebInteraction : MonoBehaviour
             {
                 try
                 {
-                    var c = go.GetComponent<Renderer>().materials[0].color;
+                    //var c = go.GetComponent<Renderer>().materials[0].color;
-                    GameManager.Inst.ChangeMaterialColor(go, 0, new Color(1, 109f / 255, 0, 1));
+                    //GameManager.Inst.ChangeMaterialColor(go, 0, new Color(1, 109f / 255, 0, 1));
-                    DOVirtual.Float(0, 10, 1f, null).OnComplete(() => GameManager.Inst.ChangeMaterialColor(go, 0, c));
+                    //DOVirtual.Float(0, 10, 1f, null).OnComplete(() => GameManager.Inst.ChangeMaterialColor(go, 0, c));
+
+                    var Cabinet= gameManager.FindParent(go, gameManager.IsDesiredParent);
+                    if (Cabinet) 
+                    {
+                        var hight = Cabinet.transform.Find("¸ßÁÁ").gameObject;
+                        hight.SetActive(true);
+                        hight.GetComponent<Renderer>().material = Resources.Load<Material>("Materials/1Tou");
+                    }
                 }
                 catch (Exception e)
                 {

GQ_TongXin/Assets/script/报警/AlarmUI.cs

@@ -22,7 +22,7 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
 
     public Canvas canvas;
     public void OnPointerClick(PointerEventData eventData)
-    {        
+    {
         GameObject go;
         if (canvas.transform.childCount == 0)
         {
@@ -40,7 +40,7 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
         {
             go = canvas.transform.GetChild(0).gameObject;
         }
-        
+
         var worldPosition = expand_image.transform.position;
 
         var list = alarmApparatus.transform.root.GetComponent<CabinetUIManager>().cabinet_ui_base_list;
@@ -126,17 +126,18 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
                     GameObject go = Instantiate(preform);
                     go.transform.SetParent(Content.transform);
                     go.SetActive(true);
-                    
+
-                    GameObject game;
+                    //GameObject game;
-                    try
+                    //try
-                    {
+                    //{
-                        game = alarmApparatus.transform.parent.Find(alarmApparatus.transform.parent.name).gameObject;
+                    //    game = alarmApparatus.transform.parent.Find(alarmApparatus.transform.parent.name).gameObject;
-                    }
+                    //}
-                    catch (Exception)
+                    //catch (Exception)
-                    {
+                    //{
-                        game = alarmApparatus.transform.parent.gameObject;
+                    //    game = alarmApparatus.transform.parent.gameObject;
-                    }
+                    //}
-                    GameManager.Inst.ChangeMaterialColor(game, 0, new Color(1, 109f / 255, 0, 1));
+                    //GameManager.Inst.ChangeMaterialColor(game, 0, new Color(1, 109f / 255, 0, 1));
+                    GameManager.Inst.ChangeMaterialColor(alarmApparatus.transform.parent.gameObject, 1);
                 }
             }
 
@@ -164,6 +165,6 @@ public class AlarmUI : MonoBehaviour, IPointerClickHandler
         //        game = alarmApparatus.transform.parent.gameObject;
         //    }
         //    GameManager.Inst.ChangeMaterialColor(game, 0, new Color(1, 1, 1, 1));
-        }
     }
+}
 

GQ_TongXin/Assets/script/接口/修改/AddDevice.cs

@@ -200,9 +200,9 @@ public class AddDevice : MonoBehaviour
     {
         try
         {
-            mybody.type = type.options[type.value].text;
+            mybody.type = type.value.ToString();
 
-            mybody.deviceType = deviceType.options[deviceType.value].text;
+            mybody.deviceType = deviceType.value.ToString();
 
             mybody.rackId = rackId.options[rackId.value].text;
 
@@ -212,7 +212,7 @@ public class AddDevice : MonoBehaviour
 
             mybody.devicePosition = devicePosition.text;
 
-            mybody.status = status.options[status.value].text;
+            mybody.status = status.value.ToString();
         }
         catch (Exception e)
         {

GQ_TongXin/Assets/script/接口/修改/AddPort.cs

@@ -67,7 +67,7 @@ public class AddPort : MonoBehaviour
                     mybody = mapper.Map<AddPort.Body>(portlist);
                 else
                 {
-                    mybody = mapper.Map<AddPort.Body>(GameManager.Inst.nowDevice.GetComponent<PortQuery.PortList>());
+                    mybody = mapper.Map<AddPort.Body>(GameManager.Inst.nowDevice.GetComponent<PortQuery>().portList);
                 }
             }
         }
@@ -204,7 +204,7 @@ public class AddPort : MonoBehaviour
 
             mybody.conDevice = conDevice.options[conDevice.value].text;
 
-            mybody.conPort = conPort.options[conPort.value].text;
+            mybody.conPort = conPort.options.Count != 0 ? conPort.options[conPort.value].text : null;
 
             mybody.remark = remark.text;
         }

GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs

@@ -149,7 +149,7 @@ public class RedactDevice : MonoBehaviour
             //gameObject.SetActive(false);
             yield break;
         }
-        
+
 
         string json = JsonConvert.SerializeObject(mybody);
         //Debug.Log(json);

GQ_TongXin/Assets/script/接口/修改/RedactPort.cs

@@ -94,6 +94,7 @@ public class RedactPort : MonoBehaviour
         initAsync();
         port.text = mybody.port;
         portCode.text = mybody.portCode;
+        portName.text = mybody.portName;
         remark.text = mybody.remark;
         //deviceId.text = mybody.deviceId;
         portModel.text = mybody.portModel;
@@ -283,35 +284,27 @@ public class RedactPort : MonoBehaviour
             //gameObject.SetActive(false);
             yield break;
         }
-        
 
-        string json = JsonConvert.SerializeObject(mybody);
-        Debug.Log(json);
 
-        using (UnityWebRequest request = new UnityWebRequest(GameManager.Inst.Jk_URL.dk_bj, "POST"))
+        string newData = JsonConvert.SerializeObject(mybody);
-        {
+        //Debug.Log(json);
-            request.SetRequestHeader("X-Token", GameManager.Inst.arguments.token);
-            request.SetRequestHeader("Content-Type", "application/json");
 
-            byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
+        yield return StartCoroutine(
-            request.uploadHandler = new UploadHandlerRaw(jsonBytes);
+            CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_bj, GameManager.Inst.arguments.token, newData, (jsonResult) =>
-            request.downloadHandler = new DownloadHandlerBuffer();
-
-            yield return request.SendWebRequest();
-
-            if (request.isNetworkError || request.isHttpError)
             {
-                Debug.LogError(request.error);
+                try
+                {
+                    URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
+                }
+                catch (Exception e)
+                {
+                    Debug.Log("修改端口接口错误：" + e.Message);
+                }
             }
-            else
+        ));
-            {
-                string body = request.downloadHandler.text;
-                URlreturn = JsonConvert.DeserializeObject<Root>(body);
-                Debug.Log(body);
-            }
-        }
     }
 
+
     #region JSON
     [System.Serializable]
     public class Body

GQ_TongXin/Assets/script/接口/查询/PortQuery.cs

@@ -21,8 +21,10 @@ public class PortQuery : MonoBehaviour
 
     private void OnEnable()
     {
-        if (string.IsNullOrEmpty(portList.id))
+        if (!string.IsNullOrEmpty(portList.id))
+        {
             gameObject.name = portList.id;
+        }
     }
 
     private void Start()

GQ_TongXin/Assets/script/点击/ClickEvent.cs

@@ -86,7 +86,7 @@ public class ClickEvent : MonoBehaviour
     {
         if (!EventSystem.current.IsPointerOverGameObject() && Input.GetMouseButtonDown(0) && TransparentGlowManage.Inst.gameObject.activeSelf)
         {
-            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+             Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
             RaycastHit hit;
 
 
@@ -104,6 +104,7 @@ public class ClickEvent : MonoBehaviour
 
                         GameManager.Inst.search_box.SetActive(false);
                         var d = gameObject.GetComponent<DeviceQuery>();
+                        
                         if (d)
                         {
                             if (string.IsNullOrEmpty(d.deviceList.id))
@@ -120,7 +121,7 @@ public class ClickEvent : MonoBehaviour
 
                                 PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(true);//√
                             }
-                        }
+                        }                       
                     }
                 }
             }
@@ -136,6 +137,7 @@ public class ClickEvent : MonoBehaviour
                         PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false);
                         PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false);
 
+
                         var p = gameObject.GetComponent<PortQuery>();
                         if (p)
                         {

GQ_TongXin/Assets/script/相机/ExtendedFlycam.cs

@@ -152,7 +152,7 @@ public class ExtendedFlycam : MonoBehaviour
         BoolMonitor.Value = ismove();
 
         if (!isvalid)
-        {            
+        {
             init_mainCamera_rot();
             return;
         }
@@ -164,7 +164,7 @@ public class ExtendedFlycam : MonoBehaviour
                 // 累加旋转增量
                 rotationX += Input.GetAxis("Mouse X") * cameraSensitivity;
                 rotationY += Input.GetAxis("Mouse Y") * cameraSensitivity;
-                rotationY = Mathf.Clamp(rotationY, -90, 90);
+                rotationY = Mathf.Clamp(rotationY, -45, 45);
                 //Debug.Log(rotationX + "\n" + rotationX);
                 // 从initialRotationEulerAngles开始旋转，然后添加旋转增量。
 
@@ -229,29 +229,53 @@ public class ExtendedFlycam : MonoBehaviour
         rotationY = 0;
     }
 
-    public void vvvv()
+    /// <summary>
+    /// 镜头全景
+    /// </summary>
+    public void QuanJing()
     {
+        Array.ForEach(GameObject.FindObjectsOfType<ClickEvent>(), itme =>
         {
-            Array.ForEach(GameObject.FindObjectsOfType<ClickEvent>(), itme =>
+            itme.My_magnifyState = false;
-            {
+        });
-                itme.My_magnifyState = false;
+        PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false);
-            });
+        PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false);
-            PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false);
+        PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false);
-            PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false);
+        PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false);
-            PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false);
+        GameManager.Inst.magnifyState = false;
-            PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false);
-            GameManager.Inst.magnifyState = false;
 
-            Inst.init_mainCamera_rot();
+        Inst.init_mainCamera_rot();
-            Inst.transform.DOLocalMove(new Vector3(4.73694f, 20.1847f, -4.738012f), 1);
+        Inst.transform.DOLocalMove(new Vector3(4.73694f, 20.1847f, -4.738012f), 1);
-            Inst.transform.DORotateQuaternion(Quaternion.Euler(Inst.ClampAngle(67.072f, -179.714f, -0.025f, Vector3.zero)), 1f).OnComplete(() =>
+        Inst.transform.DORotateQuaternion(Quaternion.Euler(Inst.ClampAngle(67.072f, -179.714f, -0.025f, Vector3.zero)), 1f).OnComplete(() =>
-            {
+        {
                 //更新相机初始旋转角度
                 Inst.initialRotationEulerAngles = new Vector3(67.072f, -179.714f, -0.025f);
-            });
+        });
-        }
 
     }
+    /// <summary>
+    /// 镜头鸟瞰
+    /// </summary>
+    public void NiaoKan()
+    {
+        Array.ForEach(GameObject.FindObjectsOfType<ClickEvent>(), itme =>
+        {
+            itme.My_magnifyState = false;
+        });
+        PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false);
+        PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false);
+        PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false);
+        PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false);
+        GameManager.Inst.magnifyState = true;
+
+        Inst.init_mainCamera_rot();
+        Inst.transform.DOLocalMove(new Vector3(18.35136f, 2.717596f, -10.86447f), 1);
+        Inst.transform.DORotateQuaternion(Quaternion.Euler(Inst.ClampAngle(22.6f, -91.1f,0, Vector3.zero)), 1f).OnComplete(() =>
+        {
+            //更新相机初始旋转角度
+            Inst.initialRotationEulerAngles = new Vector3(22.6f, -91.1f,0);
+        });
+    }
 
     public void OnDestroy()
     {