From 60bd251af0ff07f91a213602bf5ee9cbcd503a20 Mon Sep 17 00:00:00 2001 From: cyt2268162076 <2268162076@qq.com> Date: Wed, 23 Mar 2022 10:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9esc=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E5=BD=93=E5=89=8D=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=88=87=E6=A5=BC=E5=B1=82=EF=BC=8C=E7=89=A9=E4=BD=93=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/DongYouLiQing.unity | 10 ++- .../Common/GameObjectSelect/ObjSelectCtrl.cs | 85 ++++++++++--------- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/Assets/Scenes/DongYouLiQing.unity b/Assets/Scenes/DongYouLiQing.unity index 2e23b9e..db7dc61 100644 --- a/Assets/Scenes/DongYouLiQing.unity +++ b/Assets/Scenes/DongYouLiQing.unity @@ -224883,7 +224883,7 @@ PrefabInstance: - target: {fileID: 224001330236392204, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000018335479 + value: 0.0000049613104 objectReference: {fileID: 0} - target: {fileID: 224123732978855200, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} @@ -224948,7 +224948,7 @@ PrefabInstance: - target: {fileID: 224181501778157638, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000025032346 + value: 0.000007912276 objectReference: {fileID: 0} - target: {fileID: 224373752534357086, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} @@ -225028,7 +225028,7 @@ PrefabInstance: - target: {fileID: 224756375583235730, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000021518692 + value: 0.000004973162 objectReference: {fileID: 0} - target: {fileID: 224796681591186844, guid: 863dfe406d9716349adc35fb55cd722c, type: 3} @@ -360336,6 +360336,10 @@ PrefabInstance: propertyPath: interlayerNum value: 1 objectReference: {fileID: 0} + - target: {fileID: 493175234, guid: 0eae1400396ce7543ada43bfc5909274, type: 3} + propertyPath: floorNum + value: 1 + objectReference: {fileID: 0} - target: {fileID: 647154048, guid: 0eae1400396ce7543ada43bfc5909274, type: 3} propertyPath: buildNum value: 2HANCC diff --git a/Assets/Scripts/Common/GameObjectSelect/ObjSelectCtrl.cs b/Assets/Scripts/Common/GameObjectSelect/ObjSelectCtrl.cs index 0d679b2..0e4d11a 100644 --- a/Assets/Scripts/Common/GameObjectSelect/ObjSelectCtrl.cs +++ b/Assets/Scripts/Common/GameObjectSelect/ObjSelectCtrl.cs @@ -220,43 +220,46 @@ public class ObjSelectCtrl : MonoBehaviour { if (info.buildNum == data.CurrentFloor.buildNum) { - if (info.floorNum > data.CurrentFloor.floorNum || - (info.floorNum == data.CurrentFloor.floorNum && info.interlayerNum > data.CurrentFloor.interlayerNum)) + if (data.CurrentFloor.floorNum!=0) { - Renderer[] renderers = SelectedObjs.selectedObj.GetComponentsInChildren(); - for (int i = 0; i < renderers.Length; i++) - { - renderers[i].enabled = false; - } - if (SelectedObjs.selectedObj.GetComponent()) //如果是被困人员/伤员，绑定了UI + if (info.floorNum > data.CurrentFloor.floorNum || + (info.floorNum == data.CurrentFloor.floorNum && info.interlayerNum > data.CurrentFloor.interlayerNum)) { - Transform ui = SelectedObjs.selectedObj.GetComponent().haemal.transform; - Image[] images = ui.GetComponentsInChildren(true); - for (int j = 0; j < images.Length; j++) + Renderer[] renderers = SelectedObjs.selectedObj.GetComponentsInChildren(); + for (int i = 0; i < renderers.Length; i++) { - images[j].enabled = false; + renderers[i].enabled = false; } - Text[] texts = ui.GetComponentsInChildren(true); - for (int j = 0; j < texts.Length; j++) + if (SelectedObjs.selectedObj.GetComponent()) //如果是被困人员/伤员，绑定了UI { - texts[j].enabled = false; + Transform ui = SelectedObjs.selectedObj.GetComponent().haemal.transform; + Image[] images = ui.GetComponentsInChildren(true); + for (int j = 0; j < images.Length; j++) + { + images[j].enabled = false; + } + Text[] texts = ui.GetComponentsInChildren(true); + for (int j = 0; j < texts.Length; j++) + { + texts[j].enabled = false; + } } - } - if (SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.fireman || - SelectedObjs.selectedObj.GetComponent()|| - - SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.Trailer || - SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.OilSupplyTruck || - SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.LiquipSupplyTruck || - SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.RescueCarrierCar || - SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.LifeGuaranteeCar) - { - UINameItem[] names = GameObject.Find("Canvas").transform.Find("TheHeadName").GetComponentsInChildren(true); - for (int j = 0; j < names.Length; j++) + if (SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.fireman || + SelectedObjs.selectedObj.GetComponent() || + + SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.Trailer || + SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.OilSupplyTruck || + SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.LiquipSupplyTruck || + SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.RescueCarrierCar || + SelectedObjs.selectedObj.GetComponent().gameObjType == CloneObjType.LifeGuaranteeCar) { - if (names[j].Target == SelectedObjs.selectedObj.gameObject) + UINameItem[] names = GameObject.Find("Canvas").transform.Find("TheHeadName").GetComponentsInChildren(true); + for (int j = 0; j < names.Length; j++) { - names[j].gameObject.SetActive(false); + if (names[j].Target == SelectedObjs.selectedObj.gameObject) + { + names[j].gameObject.SetActive(false); + } } } } @@ -276,22 +279,26 @@ public class ObjSelectCtrl : MonoBehaviour { if (info.buildNum == data.CurrentFloor.buildNum) { - if (info.floorNum > data.CurrentFloor.floorNum || - (info.floorNum == data.CurrentFloor.floorNum && info.interlayerNum > data.CurrentFloor.interlayerNum)) + if (data.CurrentFloor.floorNum!=0) { - Renderer[] renderers = SelectedObjs.selectedCharacters[i].GetComponentsInChildren(); - for (int j = 0; j < renderers.Length; j++) + if (info.floorNum > data.CurrentFloor.floorNum || + (info.floorNum == data.CurrentFloor.floorNum && info.interlayerNum > data.CurrentFloor.interlayerNum)) { - renderers[j].enabled = false; - } - for (int j = 0; j < names.Length; j++) - { - if (names[j].Target == SelectedObjs.selectedCharacters[i]) + Renderer[] renderers = SelectedObjs.selectedCharacters[i].GetComponentsInChildren(); + for (int j = 0; j < renderers.Length; j++) + { + renderers[j].enabled = false; + } + for (int j = 0; j < names.Length; j++) { - names[j].gameObject.SetActive(false); + if (names[j].Target == SelectedObjs.selectedCharacters[i]) + { + names[j].gameObject.SetActive(false); + } } } } + } } }