From 879d4ea2d4090f71ebe42f273d48c7c027a106dc Mon Sep 17 00:00:00 2001 From: gaoguozheng Date: Wed, 30 Aug 2023 19:03:55 +0800 Subject: [PATCH] tb --- .../古泉站机房模型90个型号/11.prefab | 14 ++ GQ_TongXin/Assets/Scenes/SampleSceneG.unity | 162 ++++++++++++++++-- GQ_TongXin/Assets/Scripts/WJ/SpUI.cs | 54 ++++-- GQ_TongXin/Packages/packages-lock.json | 6 +- 4 files changed, 207 insertions(+), 29 deletions(-) diff --git a/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/11.prefab b/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/11.prefab index f73b4468e..87f67e985 100644 --- a/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/11.prefab +++ b/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/11.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 6975863905056445117} - component: {fileID: -4389448672258510715} - component: {fileID: -3178575408153643539} + - component: {fileID: -7333340079949191140} m_Layer: 8 m_Name: 11 m_TagString: Untagged @@ -220,6 +221,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: volume: 2 +--- !u!65 &-7333340079949191140 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3967357185053214017} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.627, y: 0.5623015, z: 0.09000005} + m_Center: {x: 0, y: 0.27315086, z: 0.045000024} --- !u!1 &4567107680399547925 GameObject: m_ObjectHideFlags: 0 diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index 2d0f48eca..751b92667 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -3112,7 +3112,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &26427125 RectTransform: m_ObjectHideFlags: 0 @@ -36489,7 +36489,7 @@ 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: -328, y: 92} + m_AnchoredPosition: {x: -9, y: -164} m_SizeDelta: {x: 248, y: 209} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &372301367 @@ -44182,11 +44182,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 175.8962 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 153.7597 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_LocalPosition.x @@ -44218,11 +44218,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_AnchoredPosition.x - value: 700 + value: 706.3247 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_AnchoredPosition.y - value: 28.3 + value: -112.022766 objectReference: {fileID: 0} - target: {fileID: 7739985174831531095, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -44242,7 +44242,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7739985174831531096, guid: 070de2f9549561342b884fdf110beaea, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 070de2f9549561342b884fdf110beaea, type: 3} @@ -110679,7 +110679,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -179936,7 +179935,7 @@ GameObject: - component: {fileID: 1782824203} - component: {fileID: 1782824202} m_Layer: 5 - m_Name: "Panel\u641C\u7D22\u6846 (\u6309\u7167\u8BBE\u8BA1\u56FE)" + m_Name: "Panel\u641C\u7D22\u6846-\u65B0\u589E" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -180098,7 +180097,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1782824200} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9b1f0fc03d6066c41a8060ef6c420a29, type: 3} m_Name: @@ -180107,7 +180106,100 @@ MonoBehaviour: scrollViewContent: {fileID: 527098297} inputField: {fileID: 2106330669} prefabsText: {fileID: 5570102123366740405, guid: 7be71052400278e458c72cbd93468c13, type: 3} - objs: [] + objs: + - {fileID: 4059761921876195781, guid: e3558d5dc6bfe7141b72a6c5c4b54b7c, type: 3} + - {fileID: 6102974951590175336, guid: 19dd483a6323c2c4fa7000a021694ea7, type: 3} + - {fileID: 2892006211255311759, guid: 77acb08534a99114f93afef53b3528de, type: 3} + - {fileID: 8577018436338747392, guid: 6dc387043680e204a81079caddcd58f9, type: 3} + - {fileID: 1250885818565312203, guid: 5266d76c68eab6341bad2a8c32b33d78, type: 3} + - {fileID: 1321364116395625223, guid: 7a65d806902d609438141f610dc8cb66, type: 3} + - {fileID: 2180868710361099519, guid: 8c00f9c577459394da11edebe976f2c0, type: 3} + - {fileID: 7223660192962080294, guid: b4cc64a5cdc81fe45b019b14c8246e2b, type: 3} + - {fileID: 941343486954693531, guid: 469a3e5c0fd12bb4d903612dd780f469, type: 3} + - {fileID: 7694578086809673205, guid: e87d1add9efa21f45b73911a07e36061, type: 3} + - {fileID: 3967357185053214017, guid: c3da89baadf15f9449faa43cb6cedb0d, type: 3} + - {fileID: 6628617139794794855, guid: 98253eb598e3e6b41af909c9941f8cf9, type: 3} + - {fileID: 7872749257089040179, guid: 195be3e842b204243bff4fa5cdb72399, type: 3} + - {fileID: 7874306234995394123, guid: 08d2a5d4e4734e94882395775ff4dd9b, type: 3} + - {fileID: 909856105623436695, guid: 8193bcb09f6aedb42a59a189e3ff4442, type: 3} + - {fileID: 3770632710822008918, guid: 71c4c7b9b4541fd4da21d42897191489, type: 3} + - {fileID: 7856574062610814273, guid: 51828f9d8bc1943479828ebe41a47199, type: 3} + - {fileID: 2408390610755368414, guid: afbcc18b45b69d648ac88c9b0d6e4965, type: 3} + - {fileID: 5632557604094334333, guid: 13efebd6f94936a40a76fc46174f733b, type: 3} + - {fileID: 7070863897194205689, guid: f64af1d2140953d48b4f50cce7b0b30c, type: 3} + - {fileID: 402133200430078363, guid: 8f2410996c3c3324e842dfcd42c4770d, type: 3} + - {fileID: 4591391161348815839, guid: c4d0cf29bd966c44a813ccb00b7e49ba, type: 3} + - {fileID: 578650955572369014, guid: c9724d2383dfc274e88fdbd13741c9a5, type: 3} + - {fileID: 7388987579058085285, guid: a0536b300e93f8643be3bc93ab3a158a, type: 3} + - {fileID: 4393250664786463348, guid: cbdf80c547b4ffe4193df4386dad1062, type: 3} + - {fileID: 1625249289781156137, guid: ce8bfda974dea0e42a0a98475b514310, type: 3} + - {fileID: 3663712133530769376, guid: 8e53a2f71422f2241848efc18cddc11d, type: 3} + - {fileID: 3939244649668137515, guid: 63057bc07f32b32438e82ddc890835fe, type: 3} + - {fileID: 1820658553193245103, guid: a93cbfb3e9aa75749becb167bc4ec9dd, type: 3} + - {fileID: 1330641865707779388, guid: 4072e873e72d75041b366ffb69dbe5ea, type: 3} + - {fileID: 5235284436079866956, guid: 35309446896b3944690dbcebf4dcb7b2, type: 3} + - {fileID: 7606768378581163536, guid: 0ab83192838757d4c93284c9c964fa5f, type: 3} + - {fileID: 9118719498926925913, guid: b250bca70f62932498fb8d21dabe81e4, type: 3} + - {fileID: 6284799631461560316, guid: 8dd44e7a6e390fd409f64fd06892c1a8, type: 3} + - {fileID: 2148736994004088585, guid: d65a03004490748449cb243b0a9ff537, type: 3} + - {fileID: 3369258829036236656, guid: f84c460876383074a9291de4151c0c9f, type: 3} + - {fileID: 1933366395292963088, guid: eef2ff2987d47874f849b3de140b1abf, type: 3} + - {fileID: 660517159284233709, guid: 908214c6d1a1ea94bb4bc5bbe6d9b8ea, type: 3} + - {fileID: 4590562664251338145, guid: 696e516c38a405f43af96e18b9dd53ed, type: 3} + - {fileID: 3487639110657496897, guid: 4fc5591fe1f39aa498726e4508e97d1e, type: 3} + - {fileID: 1529313758122120567, guid: 88e83886724e9614aa8ea9fec662becf, type: 3} + - {fileID: 4478180074304330929, guid: d2685571024f2154fa5fbfe0cdbfa303, type: 3} + - {fileID: 3848164608372929390, guid: 5c1a1ce4f96a0d14d9b5865a7cc67fcf, type: 3} + - {fileID: 3099942670460650802, guid: 3068f0676ea59b940a7a7406df88f1c8, type: 3} + - {fileID: 2464247824804782294, guid: a305c6bc81fa514488fc08c39c3ed474, type: 3} + - {fileID: 6354829148813107697, guid: ef8b4ed3fd5e8d04d941b8f31acf34a8, type: 3} + - {fileID: 3885746562939763059, guid: 9e9ad07d8674ea04db01ef43444aa8a1, type: 3} + - {fileID: 7907693267883938442, guid: e547ce72167d75a4896f727f000d72e4, type: 3} + - {fileID: 7686079580831428272, guid: 932b1563c2bcce04b8121f048ec5149e, type: 3} + - {fileID: 6560694270354853103, guid: 6b30f0d7133ddb640bbb40b536a80d31, type: 3} + - {fileID: 6232510788708699883, guid: ef826c4463cefb045a51c35dafb73353, type: 3} + - {fileID: 1474355017654512263, guid: bf216b812b036e646826bcac600e4a42, type: 3} + - {fileID: 9211443778362782336, guid: 916194bb86159114abcbbeafbbc18e88, type: 3} + - {fileID: 6691574979045692628, guid: a7f1eee6620725546b2611966f714b80, type: 3} + - {fileID: 5502364745052029015, guid: 4b424322f19661c4ebe9d8e983ded28c, type: 3} + - {fileID: 6614683394912215499, guid: 72c8e6d873abc5d4a98dd6f80eb85073, type: 3} + - {fileID: 1976234728634951723, guid: bedfa82e54349d7478170dc21ad1c580, type: 3} + - {fileID: 5735732634308293244, guid: 79936dcfa6a1e0d40ad309d925c6e518, type: 3} + - {fileID: 4148633525445634421, guid: 0b5a0dd563ca5b940ae94c63ecc26a4a, type: 3} + - {fileID: 8932010581518694239, guid: 2a67f144a3eb92a49ad4876a6d69dd06, type: 3} + - {fileID: 94861329722716806, guid: cf6dfde81b4139b4eb5b2c914f163166, type: 3} + - {fileID: 2775310235894559589, guid: f1bc041a1e935364da39d24e2e5f23ec, type: 3} + - {fileID: 1098814798212155645, guid: 9d82fd596685f8d41835787407e9d118, type: 3} + - {fileID: 4673885126947698244, guid: 0819b5f94b5a44849893577d8d087260, type: 3} + - {fileID: 6815993037964198343, guid: c07ad457771b7974aa744069a2a3d836, type: 3} + - {fileID: 8350092015147741388, guid: bee16d313e5f4e2428f8617737510a03, type: 3} + - {fileID: 7074515185198102912, guid: f32e9d34794c7464b8a54b9a65c88a9a, type: 3} + - {fileID: 6680140356608389581, guid: 60f4b95fa09a8e440b5ed17893afbef5, type: 3} + - {fileID: 2247794825648072980, guid: 78ed1544d7cca9648b746c980812e2a6, type: 3} + - {fileID: 4400537522529556354, guid: 17f7a2d03d02a684d9d534267b093eba, type: 3} + - {fileID: 8798404012875184499, guid: 00f0d9ac74673a142bc5003bd8373b13, type: 3} + - {fileID: 8418723111274233749, guid: c2360e0cd7462264ab2529cb7526add7, type: 3} + - {fileID: 5731639329267367182, guid: 19e7815ab9fb83144b1d166bc438f74b, type: 3} + - {fileID: 4207419663295540387, guid: f4b0c44cda461994d848cc442ca146db, type: 3} + - {fileID: 1559506897748902295, guid: 769df7c46b4acd74a868cb85363e5b6e, type: 3} + - {fileID: 5590711745979308449, guid: 170ef4e978a4c3e4ca6a6b8ffe23ef08, type: 3} + - {fileID: 7009658515745654526, guid: 8c4a8588f34156348a469632f7ee42c6, type: 3} + - {fileID: 6641289253901982456, guid: c099a1ee0147758449e00e2fd65fd15a, type: 3} + - {fileID: 6630181602211747731, guid: d440caae3a4ff9e4eb3d5506c847c37a, type: 3} + - {fileID: 4623531606721697638, guid: 24371a29a43928f418309ee9188a2434, type: 3} + - {fileID: 726182151723311846, guid: 203a395f9970d304da06465522ef7805, type: 3} + - {fileID: 3433428425312451142, guid: bfd2fe6277d37dc43b39aaec81afac3b, type: 3} + - {fileID: 2146391745410632136, guid: 52f2dd931c00b2d4690f01e634da16ea, type: 3} + - {fileID: 3558448245886594408, guid: 7212aca337f3dff47be9d77ad8295b4b, type: 3} + - {fileID: 3367096735388808318, guid: 819d8083578bb6644a12c3049a5bf531, type: 3} + - {fileID: 6416833204318675796, guid: 56e2d530ac9a98446b722d5ff8943eb9, type: 3} + - {fileID: 7465882032571925768, guid: 75a7934208da1e0408ed4425ba760720, type: 3} + - {fileID: 5665456780768683729, guid: e7e717b2c3a1a3448ab4180589a39587, type: 3} + - {fileID: 7406231149520730702, guid: 0a2213e8f1639c84fb42d721ff52f208, type: 3} + - {fileID: 1401269434718757993, guid: a74e9b5393cb1b746a8963b14718a2fc, type: 3} + - {fileID: 7166813105519184363, guid: 69e71e953347abd48839600c950e936c, type: 3} + - {fileID: 2891109239873126169, guid: 6fcb1f48a023a66488420ca874ea0133, type: 3} + - {fileID: 7320801623191217093, guid: b875a0cafa68f8f45915852bc55fb527, type: 3} objs_str: [] button_objects: [] searchType: 0 @@ -310290,6 +310382,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4362348816139420719} m_Modifications: + - target: {fileID: 1320083962038788126, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083962038788126, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083962079719020, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083962079719020, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1320083962101217944, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -310378,6 +310486,38 @@ PrefabInstance: propertyPath: m_Name value: "Panel\u641C\u7D22\u6846" objectReference: {fileID: 0} + - target: {fileID: 1320083962101217951, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083962332642308, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083962332642308, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083963247866209, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083963538104764, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083963538104764, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083963538104764, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1320083963538104764, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} --- !u!1 &5769346755244574362 diff --git a/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs b/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs index 84211dac7..d6db80a7e 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/SpUI.cs @@ -96,6 +96,7 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler _max = GameManager.Inst.arguments.heatThresholdValueMax; _min = GameManager.Inst.arguments.heatThresholdValueMin; my_image.sprite = wendu_normal; + if (string.IsNullOrEmpty(_a)) transform.parent.parent.gameObject.SetActive(false); } break; case "ʪ": @@ -104,27 +105,50 @@ public class SpUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler _max = GameManager.Inst.arguments.humidityThresholdValueMax; _min = GameManager.Inst.arguments.humidityThresholdValueMin; my_image.sprite = shidu_normal; + if (string.IsNullOrEmpty(_a)) transform.parent.parent.gameObject.SetActive(false); + } + break; + case "̸": + { + _a = temperatureAndHumidity.parent.GetComponent().eNVList_Y.collectResult; + my_image.sprite = yangan_normal; + if (string.IsNullOrEmpty(_a)) transform.parent.parent.gameObject.SetActive(false); } break; - //case "̸": - // { - // _a = temperatureAndHumidity.parent.GetComponent().eNVList_Y.collectResult; - // _max = GameManager.Inst.arguments.humidityThresholdValueMax; - // my_image.sprite = yangan_normal; - // } - //break; default: break; } - var a = string.IsNullOrEmpty(_a) ? "0" : _a; - var max = string.IsNullOrEmpty(_max) ? "0" : _max; - var min = string.IsNullOrEmpty(_min) ? "0" : _min; - if (float.Parse(a) > float.Parse(max)) - my_image.color = hightC; - if (float.Parse(a) < float.Parse(min)) - my_image.color = hightM; + if (string.IsNullOrEmpty(_a)) { + + if (transform.parent.parent.name == "ʪ") + { + transform.parent.parent.gameObject.SetActive(false); + } + return; + } + if (TemperatureAndHumidity.current_state != "̸") + { + var a = string.IsNullOrEmpty(_a) ? "0" : _a; + var max = string.IsNullOrEmpty(_max) ? "0" : _max; + var min = string.IsNullOrEmpty(_min) ? "0" : _min; + if (float.Parse(a) > float.Parse(max)) + my_image.color = hightC; + if (float.Parse(a) < float.Parse(min)) + my_image.color = hightM; + else + my_image.color = new Color(1, 1, 1, 1); + } else - my_image.color = new Color(1, 1, 1, 1); + { + if (_a == "") + { + my_image.color = hightC; + } + else + { + my_image.color = new Color(1, 1, 1, 1); + } + } } void Update() diff --git a/GQ_TongXin/Packages/packages-lock.json b/GQ_TongXin/Packages/packages-lock.json index 0858bf9be..0b07a465d 100644 --- a/GQ_TongXin/Packages/packages-lock.json +++ b/GQ_TongXin/Packages/packages-lock.json @@ -28,8 +28,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.15", + "com.unity.ide.visualstudio": "2.0.14", + "com.unity.ide.rider": "3.0.13", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", @@ -77,7 +77,7 @@ "url": "https://packages.unity.cn" }, "com.unity.services.core": { - "version": "1.4.2", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": {