8.24
This commit is contained in:
parent
153b54d7b2
commit
a9c629d045
|
|
@ -70,7 +70,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: HARD-8AD
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -8092961139225985143, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -134,7 +134,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &7596031506882065901
|
||||
|
|
@ -299,7 +299,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5BF9\u8C61\uFF1A110KV\u5B8B\u7126\u53D8ZXMPS385-1\u684667\u69FD1\u677F"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -363,7 +363,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &2051890429797106856
|
||||
|
|
@ -534,7 +534,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u544A\u8B66"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -598,7 +598,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &3170989633102458883
|
||||
|
|
@ -823,7 +823,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u65F6\u95F4\uFF1A2022-07-28 01 : 40 : 41"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -887,7 +887,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &5852380310537560375
|
||||
|
|
@ -1034,7 +1034,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "26\xB0C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -1098,7 +1098,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6020242228637615639
|
||||
|
|
@ -1646,7 +1646,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: HARD-8AD
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -8092961139225985143, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -1710,7 +1710,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!114 &2714189522183764141
|
||||
|
|
@ -1795,7 +1795,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u544A\u8B66\u4FE1\u606F"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -8092961139225985143, guid: 49d215feaf9737b4b99940428ab34824, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -1859,7 +1859,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6112714209819491448
|
||||
|
|
@ -2131,7 +2131,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u65F6\u95F4\uFF1A2022-07-28 01 : 40 : 41"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -2195,7 +2195,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &7681370149819859206
|
||||
|
|
@ -2390,7 +2390,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5BF9\u8C61\uFF1A110KV\u5B8B\u7126\u53D8ZXMPS385-1\u684667\u69FD1\u677F"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -9131975756498823584, guid: 0cc1dcff8121b7a43bb34de37b73ff0a, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -2454,7 +2454,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &8612442674409928247
|
||||
|
|
@ -3161,7 +3161,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: 999
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -3225,7 +3225,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &8800034580008906834
|
||||
|
|
@ -68,7 +68,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5269\u4F5915\u4E2AU\u4F4D\u7F6E"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -132,7 +132,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799886426827
|
||||
|
|
@ -148,7 +148,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: Button
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -212,7 +212,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &2012348084017257726
|
||||
|
|
@ -406,7 +406,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6444\u50CF01"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2319942340616284282, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -470,7 +470,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799658441977
|
||||
|
|
@ -541,7 +541,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "26\xB0C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -605,7 +605,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799779127825
|
||||
|
|
@ -148,7 +148,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "26\xB0C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -212,7 +212,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799779127825
|
||||
|
|
@ -361,6 +361,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
sp_ui: {fileID: 6206996800221561049}
|
||||
hightC: {r: 0.99215686, g: 0.34117648, b: 0.34117648, a: 1}
|
||||
--- !u!114 &-677389066425627936
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -148,7 +148,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6444\u50CF01"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2319942340616284282, guid: b6aaf136d28747544b874374280f478b, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -212,7 +212,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799658441977
|
||||
|
|
@ -283,7 +283,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "26\xB0C"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
|
|
@ -347,7 +347,7 @@ MonoBehaviour:
|
|||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_hasFontAssetChanged: 1
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &6206996799779127825
|
||||
|
|
@ -136,8 +136,8 @@ Transform:
|
|||
m_GameObject: {fileID: 2247794825648072980}
|
||||
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
|
||||
m_LocalPosition: {x: -0.23129, y: 0.045775, z: -0.022095}
|
||||
m_LocalScale: {x: 0.054245, y: 0.054245, z: 0.054245}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 3089716772474916891}
|
||||
- {fileID: 2299743059298392100}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
宣摄像红外
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9c590c9eb54263441b69d5f0e758e0d9
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -3446,9 +3446,10 @@ MonoBehaviour:
|
|||
gzp_cx:
|
||||
jxp_cx:
|
||||
arguments:
|
||||
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI4OTIwMDEsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.rWtyYf1iiDE7oxwXnN5-oiWrRegL9OG86CRy4i2T_cU
|
||||
token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI5MTQzNzAsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.w30WlzIF-n9_iGJHdlBva65iKwrx8jONLe-XTxQpJWI
|
||||
heatThresholdValue:
|
||||
humidityThresholdValue:
|
||||
isLoading: 0
|
||||
Cabinet_quYu:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
|
|
@ -6141,7 +6142,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1332666220982349661
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7955,8 +7956,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u9A6C\u978D\u5C71\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -12088,8 +12089,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u961C\u9633\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -12378,8 +12379,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5B89\u5E86\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -13251,8 +13252,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6C60\u5DDE\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -13806,8 +13807,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5BBF\u5DDE\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -20023,8 +20024,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u961C\u9633\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -25308,10 +25309,10 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5BA3\u57CE\u5E02"
|
||||
m_text: "\u53E4\u6CC9\u7AD9"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -26067,8 +26068,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6DEE\u5357\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -26328,8 +26329,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u9EC4\u5C71\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -27549,8 +27550,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u829C\u6E56\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -29580,8 +29581,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u5408\u80A5\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -30068,8 +30069,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6EC1\u5DDE\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -34336,8 +34337,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u516D\u5B89\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -34491,8 +34492,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u868C\u57E0\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -34779,8 +34780,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u6DEE\u5317\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -40274,8 +40275,8 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_text: "\u94DC\u9675\u5E02"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_sharedMaterial: {fileID: -6611583588376483961, guid: 8be3c2656e18be24a933f5cb5ef5243e, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_sharedMaterial: {fileID: 5035289879998008610, guid: bc33625c39f9eef41a0dc90cc0dee2f2, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
|
@ -56593,7 +56594,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 80, y: -321.94}
|
||||
m_AnchoredPosition: {x: 80, y: -281.95}
|
||||
m_SizeDelta: {x: 50, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4362348815592809675
|
||||
|
|
@ -59361,10 +59362,10 @@ MonoBehaviour:
|
|||
onValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
|
||||
m_MethodName: CloseHighlight
|
||||
m_Mode: 1
|
||||
- m_Target: {fileID: 4172065503821179884}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
|
|
@ -69577,10 +69578,10 @@ MonoBehaviour:
|
|||
onValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
|
||||
m_MethodName: CloseHighlight
|
||||
m_Mode: 1
|
||||
- m_Target: {fileID: 4172065503821179884}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
|
|
@ -72576,7 +72577,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!114 &4362348816315598348
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -74740,7 +74741,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6712461312143127082}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e7d68e8c998f0d74ba5b2359ff84efc5, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -87486,7 +87487,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 80, y: -281.95}
|
||||
m_AnchoredPosition: {x: 80, y: -241.95999}
|
||||
m_SizeDelta: {x: 50, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4362348816946628891
|
||||
|
|
@ -88302,7 +88303,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 80, y: -361.93}
|
||||
m_AnchoredPosition: {x: 80, y: -321.94}
|
||||
m_SizeDelta: {x: 50, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4362348816973083208
|
||||
|
|
@ -89179,7 +89180,6 @@ MonoBehaviour:
|
|||
portCode: {fileID: 4362348815422604207}
|
||||
portName: {fileID: 4362348816457196483}
|
||||
portType: {fileID: 4362348816347626033}
|
||||
deviceId: {fileID: 4362348816789183031}
|
||||
status: {fileID: 4362348816695109376}
|
||||
conDevice: {fileID: 4362348816978590803}
|
||||
conPort: {fileID: 4362348817342457686}
|
||||
|
|
@ -89626,7 +89626,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 80, y: -401.91998}
|
||||
m_AnchoredPosition: {x: 80, y: -361.93}
|
||||
m_SizeDelta: {x: 50, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4362348817019551833
|
||||
|
|
@ -90239,17 +90239,17 @@ MonoBehaviour:
|
|||
onValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 0}
|
||||
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
|
||||
m_MethodName: CloseHighlight
|
||||
m_Mode: 1
|
||||
- m_Target: {fileID: 4172065503821179884}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_MethodName: SetActive
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 4362348815729331935}
|
||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
|
|
@ -100125,7 +100125,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6712461312143127082}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9b1f0fc03d6066c41a8060ef6c420a29, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -101490,7 +101490,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!1 &9066623092981341437
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ public class SearchName : MonoBehaviour
|
|||
for (int i = 0; i < GameManager.Inst.Cabinets_go.Count; i++)
|
||||
{
|
||||
objs.Add(GameManager.Inst.Cabinets_go[i]);
|
||||
string s = GameManager.Inst.Cabinets_go[i].GetComponent<DeviceQuery>().deviceList.deviceCode;
|
||||
string s = GameManager.Inst.Cabinets_go[i].GetComponent<DeviceQuery>().deviceList.deviceName;
|
||||
objs_str.Add(s);
|
||||
SearchObjects.Add(s);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
|
@ -30,7 +31,7 @@ public class CabinetUIManager : MonoBehaviour
|
|||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
Instance.current_menu = menu;
|
||||
Instance.cabinet_ui_base_list.ForEach(x => x.OnMenuChanged(menu));
|
||||
|
||||
|
|
@ -38,6 +39,23 @@ public class CabinetUIManager : MonoBehaviour
|
|||
|
||||
}
|
||||
|
||||
public bool SomeMethod()
|
||||
{
|
||||
var l = Array.FindAll(cabinet_ui_base_list.ToArray(), (item) =>
|
||||
{
|
||||
return (item.name.Contains("±¨¾¯")|| item.name.Contains("ÎÂʪ¶È"));
|
||||
});
|
||||
|
||||
for (int i = 0; i < l.Length; i++)
|
||||
{
|
||||
if (l[i].gameObject.activeSelf)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#region Editor Test
|
||||
|
||||
[ContextMenu("Editor Change Menu")]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
|
|||
|
||||
public TextMeshProUGUI textMeshPro;
|
||||
public Text text;
|
||||
|
||||
public void OnPointerEnter(PointerEventData eventData)
|
||||
{
|
||||
expand_image.gameObject.SetActive(true);
|
||||
|
|
@ -76,4 +75,9 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TemperatureAndHumidity : CabinetUIBase
|
||||
{
|
||||
|
|
@ -13,7 +14,7 @@ public class TemperatureAndHumidity : CabinetUIBase
|
|||
public static string current_state = "温度";
|
||||
|
||||
public SpUI sp_ui;
|
||||
|
||||
public Color hightC;
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
|
@ -50,11 +51,27 @@ 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("湿度");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
http://rc92r3.natappfree.cc/
|
||||
http://szu644.natappfree.cc/
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -26,7 +26,10 @@ public class GameManager : MonoBehaviour
|
|||
/// 全局变量
|
||||
/// </summary>
|
||||
public GlobalParameter arguments = new GlobalParameter();
|
||||
|
||||
/// <summary>
|
||||
/// 是否加载完成
|
||||
/// </summary>
|
||||
public bool isLoading = false;
|
||||
string ct = null;
|
||||
|
||||
//[Header("机柜点位集合")]
|
||||
|
|
@ -122,6 +125,11 @@ public class GameManager : MonoBehaviour
|
|||
//StartCoroutine(LoadAddress());
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
//StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/设备查询.json"));
|
||||
|
|
@ -153,7 +161,7 @@ public class GameManager : MonoBehaviour
|
|||
/// <summary>
|
||||
/// 加载环境
|
||||
/// </summary>
|
||||
private void Load_ENV()
|
||||
public void Load_ENV()
|
||||
{
|
||||
if (root_AllENV == null) return;
|
||||
/***********************************************************/
|
||||
|
|
@ -227,7 +235,7 @@ public class GameManager : MonoBehaviour
|
|||
/// <summary>
|
||||
/// 加载告警
|
||||
/// </summary>
|
||||
private void Load_TmsAlarm()
|
||||
public void Load_TmsAlarm()
|
||||
{
|
||||
if (root_AllAlarm == null) return;
|
||||
/***********************************************************/
|
||||
|
|
@ -502,6 +510,8 @@ public class GameManager : MonoBehaviour
|
|||
go.transform.position = new Vector3(anchorPos.transform.position.x, anchorPos.transform.position.y + collider.bounds.size.y / 2, anchorPos.transform.position.z);
|
||||
//go.transform.rotation = item.transform.Find("U位/" + U).rotation;
|
||||
go.name = Racks[i].deviceName;
|
||||
if (!go.GetComponent<ClickEvent>())
|
||||
go.AddComponent<ClickEvent>();
|
||||
go.transform.SetParent(item.transform.Find("U位/" + U));
|
||||
break;
|
||||
}
|
||||
|
|
@ -662,7 +672,7 @@ public class GameManager : MonoBehaviour
|
|||
try
|
||||
{
|
||||
root_AllDevice = JsonConvert.DeserializeObject<DeviceQuery.Root>(jsonResult);
|
||||
Debug.Log("设备查询完成" + "URL:" + Jk_URL.sb_cx + "Token:" + arguments.token + "返回内容" + jsonResult);
|
||||
Debug.Log("设备查询完成" /*+ "URL:" + Jk_URL.sb_cx + "Token:" + arguments.token + "返回内容" + jsonResult*/);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -707,7 +717,7 @@ public class GameManager : MonoBehaviour
|
|||
try
|
||||
{
|
||||
root_AllPort = JsonConvert.DeserializeObject<PortQuery.Root>(jsonResult1);
|
||||
Debug.Log("端口查询完成" + "URL:" + Jk_URL.dk_cx + "Token:" + arguments.token + "返回内容" + jsonResult1);
|
||||
Debug.Log("端口查询完成" /*+ "URL:" + Jk_URL.dk_cx + "Token:" + arguments.token + "返回内容" + jsonResult1*/);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -747,7 +757,10 @@ public class GameManager : MonoBehaviour
|
|||
try
|
||||
{
|
||||
root_AllENV = JsonConvert.DeserializeObject<ENVQuery.Root>(jsonResult2);
|
||||
Debug.Log("环境查询完成" + "URL:" + Jk_URL.hj_cx + "Token:" + arguments.token + "返回内容" + jsonResult2);
|
||||
|
||||
ENVs.Clear();
|
||||
|
||||
Debug.Log("环境查询完成" /*+ "URL:" + Jk_URL.hj_cx + "Token:" + arguments.token + "返回内容" + jsonResult2*/);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -755,7 +768,7 @@ public class GameManager : MonoBehaviour
|
|||
}
|
||||
|
||||
})
|
||||
); ;
|
||||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -791,7 +804,15 @@ public class GameManager : MonoBehaviour
|
|||
try
|
||||
{
|
||||
root_AllAlarm = JsonConvert.DeserializeObject<TmsAlarmQuery.Root>(jsonResult3);
|
||||
Debug.Log("告警查询完成" + "URL:" + Jk_URL.gj_cx + "Token:" + arguments.token + "返回内容" + jsonResult3);
|
||||
|
||||
Array.ForEach(GameObject.FindObjectsOfType<TmsAlarmQuery>(), itme =>
|
||||
{
|
||||
itme.tmsAlarmLists.Clear();
|
||||
});
|
||||
|
||||
tmsAlarms.Clear();
|
||||
|
||||
Debug.Log("告警查询完成" /*+ "URL:" + Jk_URL.gj_cx + "Token:" + arguments.token + "返回内容" + jsonResult3*/);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -799,7 +820,7 @@ public class GameManager : MonoBehaviour
|
|||
}
|
||||
|
||||
})
|
||||
); ;
|
||||
);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -1381,6 +1402,10 @@ public class GameManager : MonoBehaviour
|
|||
{
|
||||
if (Input.GetKeyDown(KeyCode.End))
|
||||
{
|
||||
//string s = ("{\"data\":{\"token\":\"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTI5MTQzNzAsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.w30WlzIF-n9_iGJHdlBva65iKwrx8jONLe-XTxQpJWI\",\"heatThresholdValue\":\"36\",\"humidityThresholdValue\":\"85\"}}");
|
||||
|
||||
//StartCoroutine(WebInteraction.Inst.unity_token_value(s));
|
||||
|
||||
Array.ForEach(pop_ups.ToArray(), (itme) =>
|
||||
{
|
||||
itme.gameObject.SetActive(false);
|
||||
|
|
@ -1487,6 +1512,8 @@ public class GameManager : MonoBehaviour
|
|||
// 读取地址
|
||||
public IEnumerator LoadAddress(Action<string> callback)
|
||||
{
|
||||
isLoading = false;
|
||||
|
||||
string filePath = Application.streamingAssetsPath + "/dz.txt";
|
||||
|
||||
UnityWebRequest www = UnityWebRequest.Get(filePath);
|
||||
|
|
@ -1495,7 +1522,7 @@ public class GameManager : MonoBehaviour
|
|||
if (www.result == UnityWebRequest.Result.Success)
|
||||
{
|
||||
string fileContent = www.downloadHandler.text;
|
||||
Debug.Log("获取穿透成功：" + fileContent + "Token：" + Inst.arguments.token);
|
||||
Debug.Log("获取穿透成功" /*+ fileContent + "Token：" + Inst.arguments.token*/);
|
||||
|
||||
if (string.IsNullOrEmpty(fileContent))
|
||||
{
|
||||
|
|
@ -1540,8 +1567,9 @@ public class GameManager : MonoBehaviour
|
|||
Load_TmsAlarm();
|
||||
Load_ENV();
|
||||
|
||||
Application.ExternalCall("OnSceneLoaded");
|
||||
Application.ExternalCall("OnSceneLoaded","三维加载完成");
|
||||
//三维场景加载时显示地图
|
||||
isLoading = true;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -245,5 +245,47 @@ public static class CombineJSON
|
|||
}
|
||||
}
|
||||
|
||||
public static IEnumerator GetJson_POST(string apiUrl, string token, int looptime, Action<string> callback)
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
if (CabinetUIManager.Instance.SomeMethod() && GameManager.Inst.isLoading)
|
||||
{
|
||||
yield return new WaitForSeconds(looptime);
|
||||
}
|
||||
else
|
||||
{
|
||||
yield return null;
|
||||
}
|
||||
|
||||
using (UnityWebRequest request = UnityWebRequest.Post(apiUrl, ""))
|
||||
{
|
||||
request.SetRequestHeader("X-Token", token);
|
||||
|
||||
yield return request.SendWebRequest();
|
||||
|
||||
if (!request.isNetworkError && !request.isHttpError)
|
||||
{
|
||||
if (request.downloadHandler != null)
|
||||
{
|
||||
string responseText = request.downloadHandler.text;
|
||||
//Debug.Log(responseText);
|
||||
callback(responseText);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("request.downloadHandler为null");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("请求POST接口失败: " + request.error);
|
||||
callback?.Invoke(null);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using UnityEngine.Networking;
|
|||
using UnityEngine.UI;
|
||||
using SimpleJSON;
|
||||
using static GameManager;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
public class WebInteraction : MonoBehaviour
|
||||
{
|
||||
|
|
@ -50,7 +51,7 @@ public class WebInteraction : MonoBehaviour
|
|||
/// 前端调用此方法传递Token
|
||||
/// </summary>
|
||||
/// <param name="token"></param>
|
||||
public void unity_token_value(string jsonData)
|
||||
public IEnumerator unity_token_value(string jsonData)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -63,8 +64,9 @@ public class WebInteraction : MonoBehaviour
|
|||
{
|
||||
Debug.Log("解析Token错误");
|
||||
}
|
||||
|
||||
StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||
|
||||
|
||||
yield return (StartCoroutine(GameManager.Inst.LoadAddress((ct) =>
|
||||
{
|
||||
if (ct != null)
|
||||
{
|
||||
|
|
@ -75,7 +77,59 @@ public class WebInteraction : MonoBehaviour
|
|||
{
|
||||
Debug.Log("获取穿透错误!");
|
||||
}
|
||||
})));
|
||||
|
||||
StartCoroutine(
|
||||
CombineJSON.GetJson_POST(GameManager.Inst.Jk_URL.gj_cx, GameManager.Inst.arguments.token, 10, (jsonResult3) =>
|
||||
{
|
||||
if (string.IsNullOrEmpty(jsonResult3))
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
gameManager.root_AllAlarm = JsonConvert.DeserializeObject<TmsAlarmQuery.Root>(jsonResult3);
|
||||
|
||||
Array.ForEach(GameObject.FindObjectsOfType<TmsAlarmQuery>(), itme =>
|
||||
{
|
||||
itme.tmsAlarmLists.Clear();
|
||||
});
|
||||
|
||||
gameManager.tmsAlarms.Clear();
|
||||
|
||||
gameManager.Load_TmsAlarm();
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("序列化-告警查询错误：" + e.Message);
|
||||
}
|
||||
|
||||
}));
|
||||
|
||||
StartCoroutine(
|
||||
CombineJSON.GetJson_POST(GameManager.Inst.Jk_URL.hj_cx, GameManager.Inst.arguments.token, 10, (jsonResult2) =>
|
||||
{
|
||||
if (string.IsNullOrEmpty(jsonResult2))
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
gameManager.root_AllENV = JsonConvert.DeserializeObject<ENVQuery.Root>(jsonResult2);
|
||||
|
||||
gameManager.ENVs.Clear();
|
||||
|
||||
gameManager.Load_ENV();
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("序列化-环境查询错误：" + e.Message);
|
||||
}
|
||||
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
public Button bt;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using AutoMapper;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
|
@ -46,9 +47,37 @@ public class AddDevice : MonoBehaviour
|
|||
/// </summary>
|
||||
public Dropdown status;
|
||||
|
||||
MapperConfiguration config;
|
||||
IMapper mapper;
|
||||
DeviceQuery.DeviceList deviceList;
|
||||
private void OnEnable()
|
||||
{
|
||||
init();
|
||||
config = new MapperConfiguration(cfg =>
|
||||
{
|
||||
cfg.CreateMap<AddDevice.Body, DeviceQuery.DeviceList>();
|
||||
cfg.CreateMap<DeviceQuery.DeviceList, AddDevice.Body>();
|
||||
});
|
||||
mapper = config.CreateMapper();
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(GameManager.Inst.nowDeviceID))
|
||||
{
|
||||
for (int i = 0; i < GameManager.Inst.root_AllDevice.data.Count; i++)
|
||||
{
|
||||
if (GameManager.Inst.TmsPorts[i].id == GameManager.Inst.nowDeviceID)
|
||||
{
|
||||
deviceList = GameManager.Inst.root_AllDevice.data[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
mybody = mapper.Map<AddDevice.Body>(deviceList);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log(e.StackTrace + "**********" + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public void init()
|
||||
|
|
@ -112,7 +141,10 @@ public class AddDevice : MonoBehaviour
|
|||
Debug.Log("获取穿透错误!");
|
||||
}
|
||||
}));
|
||||
|
||||
Array.ForEach(GameManager.Inst.pop_ups.ToArray(), (itme) =>
|
||||
{
|
||||
itme.gameObject.SetActive(false);
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -161,23 +193,35 @@ public class AddDevice : MonoBehaviour
|
|||
private void Update()
|
||||
{
|
||||
|
||||
mybody.type = type.options[type.value].text;
|
||||
|
||||
mybody.deviceType = deviceType.options[deviceType.value].text;
|
||||
|
||||
mybody.rackId = rackId.options[rackId.value].text;
|
||||
|
||||
mybody.shelfId = shelfId.options[shelfId.value].text;
|
||||
|
||||
mybody.slotId = slotId.options[slotId.value].text;
|
||||
|
||||
mybody.devicePosition = devicePosition.text;
|
||||
|
||||
mybody.status = status.options[status.value].text;
|
||||
|
||||
}
|
||||
|
||||
public IEnumerator saveJson()
|
||||
{
|
||||
try
|
||||
{
|
||||
mybody.type = type.options[type.value].text;
|
||||
|
||||
mybody.deviceType = deviceType.options[deviceType.value].text;
|
||||
|
||||
mybody.rackId = rackId.options[rackId.value].text;
|
||||
|
||||
mybody.shelfId = shelfId.options[shelfId.value].text;
|
||||
|
||||
mybody.slotId = slotId.options[slotId.value].text;
|
||||
|
||||
mybody.devicePosition = devicePosition.text;
|
||||
|
||||
mybody.status = status.options[status.value].text;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("新增设备错误：" + e.Message);
|
||||
gameObject.SetActive(false);
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
var newData = JsonConvert.SerializeObject(mybody);
|
||||
|
||||
//var jsonResult = await CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.sb_xz, GameManager.Inst.token, newData);
|
||||
|
|
@ -194,7 +238,7 @@ public class AddDevice : MonoBehaviour
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
Debug.Log("新增设备接口错误：" + e.Message);
|
||||
}
|
||||
})
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using AutoMapper;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections;
|
||||
|
|
@ -25,7 +26,7 @@ public class AddPort : MonoBehaviour
|
|||
|
||||
public InputField portType;
|
||||
|
||||
public Dropdown deviceId;
|
||||
//public Dropdown deviceId;
|
||||
|
||||
//public InputField portModel;
|
||||
|
||||
|
|
@ -37,14 +38,42 @@ public class AddPort : MonoBehaviour
|
|||
|
||||
public InputField remark;
|
||||
|
||||
MapperConfiguration config;
|
||||
IMapper mapper;
|
||||
PortQuery.PortList portlist;
|
||||
private void OnEnable()
|
||||
{
|
||||
init();
|
||||
config = new MapperConfiguration(cfg =>
|
||||
{
|
||||
cfg.CreateMap<AddPort.Body, PortQuery.PortList>();
|
||||
cfg.CreateMap<PortQuery.PortList, AddPort.Body>();
|
||||
});
|
||||
mapper = config.CreateMapper();
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(GameManager.Inst.nowDeviceID))
|
||||
{
|
||||
for (int i = 0; i < GameManager.Inst.TmsPorts.Count; i++)
|
||||
{
|
||||
if (GameManager.Inst.TmsPorts[i].id == GameManager.Inst.nowDeviceID)
|
||||
{
|
||||
portlist = GameManager.Inst.TmsPorts[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
mybody = mapper.Map<AddPort.Body>(portlist);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log(e.StackTrace + "**********" + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private void init()
|
||||
{
|
||||
deviceId.options.Clear();
|
||||
//deviceId.options.Clear();
|
||||
List<string> deviceId_ops = new List<string>();
|
||||
//for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++)
|
||||
//{
|
||||
|
|
@ -72,7 +101,7 @@ public class AddPort : MonoBehaviour
|
|||
{
|
||||
deviceId_ops.Add(list[i].transform.parent.GetComponent<DeviceQuery>().deviceList.id);
|
||||
}
|
||||
deviceId.AddOptions(deviceId_ops);
|
||||
//deviceId.AddOptions(deviceId_ops);
|
||||
|
||||
conDevice.options.Clear();
|
||||
conDevice.AddOptions(deviceId_ops);
|
||||
|
|
@ -146,29 +175,40 @@ public class AddPort : MonoBehaviour
|
|||
private void Update()
|
||||
{
|
||||
|
||||
mybody.port = port.text;
|
||||
|
||||
mybody.portCode = portCode.text;
|
||||
|
||||
mybody.portName = portName.text;
|
||||
|
||||
mybody.portType = portType.text;
|
||||
|
||||
mybody.deviceId = deviceId.options[deviceId.value].text;
|
||||
|
||||
//mybody.portModel = portModel;
|
||||
|
||||
mybody.status = status.value;
|
||||
|
||||
mybody.conDevice = conDevice.options[conDevice.value].text;
|
||||
|
||||
mybody.conPort = conPort.options[conPort.value].text;
|
||||
|
||||
mybody.remark = remark.text;
|
||||
}
|
||||
|
||||
public IEnumerator saveJson()
|
||||
{
|
||||
try
|
||||
{
|
||||
mybody.port = port.text;
|
||||
|
||||
mybody.portCode = portCode.text;
|
||||
|
||||
mybody.portName = portName.text;
|
||||
|
||||
mybody.portType = portType.text;
|
||||
|
||||
//mybody.deviceId = deviceId.options[deviceId.value].text;
|
||||
|
||||
//mybody.portModel = portModel;
|
||||
|
||||
mybody.status = status.value;
|
||||
|
||||
mybody.conDevice = conDevice.options[conDevice.value].text;
|
||||
|
||||
mybody.conPort = conPort.options[conPort.value].text;
|
||||
|
||||
mybody.remark = remark.text;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("新增端口错误：" + e.Message);
|
||||
gameObject.SetActive(false);
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
var newData = JsonConvert.SerializeObject(mybody);
|
||||
|
||||
//var jsonResult = await CombineJSON.UpdateJson_POST(GameManager.Inst.Jk_URL.dk_xz, GameManager.Inst.token, newData);
|
||||
|
|
@ -182,9 +222,9 @@ public class AddPort : MonoBehaviour
|
|||
{
|
||||
URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||
}
|
||||
catch (Exception)
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
Debug.Log("新增端口接口错误：" + e.Message);
|
||||
}
|
||||
})
|
||||
);
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ public class DeleteDevice : MonoBehaviour
|
|||
{
|
||||
URlreturn = JsonConvert.DeserializeObject<Root>(jsonResult);
|
||||
}
|
||||
catch (System.Exception)
|
||||
catch (System.Exception e)
|
||||
{
|
||||
|
||||
Debug.Log("删除设备错误：" + e.Message);
|
||||
}
|
||||
})
|
||||
);
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ public class RedactDevice : MonoBehaviour
|
|||
mybody = mapper.Map<RedactDevice.Body>(device);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
Debug.Log(e.StackTrace + "**********" + e.Message);
|
||||
}
|
||||
|
||||
if (type) type.value = int.Parse(String.IsNullOrEmpty(mybody.type) ? "0" : mybody.type);
|
||||
|
|
@ -130,16 +130,26 @@ public class RedactDevice : MonoBehaviour
|
|||
{
|
||||
if (string.IsNullOrEmpty(mybody.id)) yield break;
|
||||
|
||||
if (type) mybody.type = type.value.ToString();
|
||||
if (deviceType) mybody.deviceType = deviceType.value == 0 ? null : deviceType.value.ToString();
|
||||
if (deviceName) mybody.deviceName = deviceName.text;
|
||||
if (deviceCode) mybody.deviceCode = deviceCode.text;
|
||||
if (devicePosition) mybody.devicePosition = devicePosition.text;
|
||||
if (machineModel) mybody.machineModel = machineModel.text;
|
||||
if (status) mybody.status = status.value.ToString();
|
||||
if (rackType) mybody.rackType = rackType.value == 0 ? null : rackType.value.ToString();
|
||||
if (openFlag) mybody.openFlag = openFlag.value == 2 ? null : openFlag.value.ToString();
|
||||
if (manufacturer) mybody.manufacturer = manufacturer.text;
|
||||
try
|
||||
{
|
||||
if (type) mybody.type = type.value.ToString();
|
||||
if (deviceType) mybody.deviceType = deviceType.value == 0 ? null : deviceType.value.ToString();
|
||||
if (deviceName) mybody.deviceName = deviceName.text;
|
||||
if (deviceCode) mybody.deviceCode = deviceCode.text;
|
||||
if (devicePosition) mybody.devicePosition = devicePosition.text;
|
||||
if (machineModel) mybody.machineModel = machineModel.text;
|
||||
if (status) mybody.status = status.value.ToString();
|
||||
if (rackType) mybody.rackType = rackType.value == 0 ? null : rackType.value.ToString();
|
||||
if (openFlag) mybody.openFlag = openFlag.value == 2 ? null : openFlag.value.ToString();
|
||||
if (manufacturer) mybody.manufacturer = manufacturer.text;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("修改设备错误：" + e.Message);
|
||||
gameObject.SetActive(false);
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
string json = JsonConvert.SerializeObject(mybody);
|
||||
//Debug.Log(json);
|
||||
|
|
|
|||
|
|
@ -265,15 +265,25 @@ public class RedactPort : MonoBehaviour
|
|||
if (string.IsNullOrEmpty(mybody.id))
|
||||
yield break;
|
||||
|
||||
mybody.port = port.text;
|
||||
mybody.portCode = portCode.text;
|
||||
mybody.portName = portName.text;
|
||||
if (conDevice.value != 0 && conPort.value != 0) mybody.remark = remark.text;
|
||||
//mybody.deviceId = deviceId.text;
|
||||
mybody.portModel = portModel.text;
|
||||
mybody.status = status.value;
|
||||
mybody.conDevice = conDevice.options[conDevice.value].text;
|
||||
mybody.conPort = conPort.options[conPort.value].text;
|
||||
try
|
||||
{
|
||||
mybody.port = port.text;
|
||||
mybody.portCode = portCode.text;
|
||||
mybody.portName = portName.text;
|
||||
if (conDevice.value != 0 && conPort.value != 0) mybody.remark = remark.text;
|
||||
//mybody.deviceId = deviceId.text;
|
||||
mybody.portModel = portModel.text;
|
||||
mybody.status = status.value;
|
||||
mybody.conDevice = conDevice.options[conDevice.value].text;
|
||||
mybody.conPort = conPort.options[conPort.value].text;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("修改端口错误：" + e.Message);
|
||||
gameObject.SetActive(false);
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
string json = JsonConvert.SerializeObject(mybody);
|
||||
Debug.Log(json);
|
||||
|
|
|
|||
|
|
@ -12,9 +12,35 @@ using UnityEngine;
|
|||
public class DeviceQuery : MonoBehaviour
|
||||
{
|
||||
|
||||
public DeviceList deviceList ;
|
||||
public DeviceList deviceList;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "1" &&
|
||||
string.IsNullOrEmpty(deviceList.rackId))
|
||||
{
|
||||
var ParentGo = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent);
|
||||
if (!ParentGo)
|
||||
return;
|
||||
deviceList.rackId = ParentGo.GetComponent<DeviceQuery>().deviceList.id;
|
||||
}
|
||||
|
||||
else if (deviceList.type == "2" &&
|
||||
deviceList.deviceType == "3" &&
|
||||
string.IsNullOrEmpty(deviceList.shelfId))
|
||||
{
|
||||
if (transform.parent.GetComponent<DeviceQuery>())
|
||||
{
|
||||
var d = transform.parent.GetComponent<DeviceQuery>();
|
||||
if (d.deviceList.deviceType == "1" && !string.IsNullOrEmpty(d.deviceList.id))
|
||||
{
|
||||
deviceList.shelfId = transform.parent.GetComponent<DeviceQuery>().deviceList.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class ExtendedFlycam : MonoBehaviour
|
|||
//检测bool是否变化
|
||||
private static void BoolMonitor_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
Debug.Log("当前是否不动" + BoolMonitor.Value);
|
||||
//Debug.Log("当前是否不动" + BoolMonitor.Value);
|
||||
if (!BoolMonitor.Value)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(WebInteraction.Inst.current_videoNumber) && WebInteraction.Inst.isVideoPlay)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@ EditorBuildSettings:
|
|||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/SampleScene.unity
|
||||
guid: 9fc0d4010bbf28b4594072e72b8655ab
|
||||
path: Assets/Scenes/SampleScene1.unity
|
||||
guid: 09a8e21b385b3d14ca7b6a7e26c2e63a
|
||||
m_configObjects: {}
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
http://wpis4k.natappfree.cc/
|
||||
http://szu644.natappfree.cc/
|
||||
|
|
@ -817,4 +817,19 @@
|
|||
"slotSort": null,
|
||||
"installMethod": null,
|
||||
"affiliationFrame": null,
|
||||
"parentS<message truncated>
|
||||
"parentSlotName": null,
|
||||
"slotType": null,
|
||||
"occupyStatus": null,
|
||||
"affiliationSlot": null,
|
||||
"portNum": null,
|
||||
"cardFunction": null,
|
||||
"cardType": null,
|
||||
"runStatus": null,
|
||||
"tmsId": null,
|
||||
"remark": null,
|
||||
"createTime": "2023-08-08 10:31:08",
|
||||
"createName": "admin"
|
||||
}
|
||||
],
|
||||
"serverTime": "1692179401268"
|
||||
}
|
||||
Loading…
Reference in New Issue