gaoguozheng
/
GQ_Communicate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

场景管理配置弹出修改

This commit is contained in:
高国正 2023-09-06 10:03:43 +08:00
parent 87dbf2d933
commit 6fe9c124ae
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GQ_TongXin/Assets/Scenes/SampleSceneG.unity
View File

@ -18424,7 +18424,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &184706490 --- !u!224 &184706490
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -112376,7 +112376,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical m_VerticalAxis: Vertical
m_SubmitButton: Submit m_SubmitButton: Submit
@ -186979,6 +186978,7 @@ MonoBehaviour:
nowDevice: {fileID: 0} nowDevice: {fileID: 0}
lastDeviceID: lastDeviceID:
lastDevice: {fileID: 0} lastDevice: {fileID: 0}
nowCabine: {fileID: 0}
root_AllDevice: root_AllDevice:
code: code:
message: message:

4
GQ_TongXin/Assets/script/GameManager.cs
View File

@ -41,6 +41,8 @@ public class GameManager : MonoBehaviour
[Header("上一个设备ID")] public string lastDeviceID; [Header("上一个设备ID")] public string lastDeviceID;
[Header("上一个点击设备")] public GameObject lastDevice; [Header("上一个点击设备")] public GameObject lastDevice;
[Header("当前聚焦机柜")] public GameObject nowCabine;
[Header("设备------------------------查询接口")] public DeviceQuery.Root root_AllDevice; [Header("设备------------------------查询接口")] public DeviceQuery.Root root_AllDevice;
///// <summary> ///// <summary>
@ -157,6 +159,7 @@ public class GameManager : MonoBehaviour
//objectToShow_add.gameObject.SetActive(false); //objectToShow_add.gameObject.SetActive(false);
var SN1 = objectToShow_add.GetComponent<SearchName1>(); var SN1 = objectToShow_add.GetComponent<SearchName1>();
SN1.hide_menu(); SN1.hide_menu();
objectToShow_add.SetActive(false);
} }
else else
{ {
@ -164,6 +167,7 @@ public class GameManager : MonoBehaviour
//objectToShow_add.gameObject.SetActive(false); //objectToShow_add.gameObject.SetActive(false);
var SN1 = objectToShow_add.GetComponent<SearchName1>(); var SN1 = objectToShow_add.GetComponent<SearchName1>();
SN1.hide_menu(); SN1.hide_menu();
objectToShow_add.SetActive(false);
} }
} }
editorMenu.gameObject.SetActive(false); editorMenu.gameObject.SetActive(false);

2
GQ_TongXin/Assets/script/接口/修改/AddDevice.cs
View File

@ -169,7 +169,7 @@ public class AddDevice : MonoBehaviour
{ {
itme.gameObject.SetActive(false); itme.gameObject.SetActive(false);
}); });
//GameManager.Inst.objectToShow_add.gameObject.SetActive(true); GameManager.Inst.objectToShow_add.gameObject.SetActive(true);
var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>(); var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>();
SN1.hide_menu(); SN1.hide_menu();
} }

2
GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs
View File

@ -160,7 +160,7 @@ public class RedactDevice : MonoBehaviour
{ {
itme.gameObject.SetActive(false); itme.gameObject.SetActive(false);
}); });
//GameManager.Inst.objectToShow_add.gameObject.SetActive(true); GameManager.Inst.objectToShow_add.gameObject.SetActive(true);
var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>(); var SN1 = GameManager.Inst.objectToShow_add.GetComponent<SearchName1>();
SN1.hide_menu(); SN1.hide_menu();
} }

8
GQ_TongXin/Assets/script/点击/ClickEvent.cs
View File

@ -108,7 +108,7 @@ public class ClickEvent : MonoBehaviour
GameManager.Inst.search_box.SetActive(false); GameManager.Inst.search_box.SetActive(false);
var d = gameObject.GetComponent<DeviceQuery>(); var d = gameObject.GetComponent<DeviceQuery>();
var cabinet = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent);
DragController drag = GameManager.Inst.gameObject.GetComponent<DeviceManager>().dragController.GetComponent<DragController>(); DragController drag = GameManager.Inst.gameObject.GetComponent<DeviceManager>().dragController.GetComponent<DragController>();
if (d) if (d)
@ -140,13 +140,15 @@ public class ClickEvent : MonoBehaviour
//PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);//¡Ì //PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);//¡Ì
} }
if (drag) if (drag && GameManager.Inst.nowCabine == cabinet)
{ {
drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent<UPosManger>(); drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent<UPosManger>();
GameManager.Inst.gameObject.GetComponent<DeviceManager>().uposManger = drag.uPosManger; GameManager.Inst.gameObject.GetComponent<DeviceManager>().uposManger = drag.uPosManger;
//drag.oriObjectPrefab = gameObject.GetComponent<DragTest1>(); //drag.oriObjectPrefab = gameObject.GetComponent<DragTest1>();
gameObject.GetComponent<DeviceItem>().OnselfClick(); gameObject.GetComponent<DeviceItem>().OnselfClick();
} }
else
GameManager.Inst.editorMenu.gameObject.SetActive(false);
} }
} }
} }
@ -586,6 +588,7 @@ public class ClickEvent : MonoBehaviour
/// <param name="isZoomin">ÊÇ·ñÀ­½ü¾µÍ·</param> /// <param name="isZoomin">ÊÇ·ñÀ­½ü¾µÍ·</param>
public void Change_hide(GameObject cabine, bool isHide, bool isZoomin) public void Change_hide(GameObject cabine, bool isHide, bool isZoomin)
{ {
GameManager.Inst.nowCabine = cabine;
if (isZoomin) if (isZoomin)
{ {
if (CabinetUIManager.Instance.cabine_hights_now.Count == 0) if (CabinetUIManager.Instance.cabine_hights_now.Count == 0)
@ -828,5 +831,4 @@ public class ClickEvent : MonoBehaviour
}); });
} }
} }