From 9b90252c37bd195cf9372e665fb19bd422d0a09d Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Tue, 12 Mar 2024 16:38:42 +0800
Subject: [PATCH] 1
---
.../{Zion/Scripts/cxx => }/MyNetMQClient.cs | 0
.../Scripts/cxx => }/MyNetMQClient.cs.meta | 0
Assets/Resources/UIPanel/View_Panel2.prefab | 10 +-
Assets/Temp/Scripts/View_Panel2.cs | 76 +-
Assets/Zion/Scenes/InitConnect.unity | 798 ++++++++++++++++++
.../Adam/Components/RawImageMoveAttach.cs | 27 +
.../Components/RawImageMoveAttach.cs.meta | 11 +
.../Zion/Scripts/Adam/Components/SceneLoad.cs | 49 ++
.../Scripts/Adam/Components/SceneLoad.cs.meta | 11 +
Assets/Zion/Scripts/Adam/UIBootstrap.cs | 16 +-
10 files changed, 976 insertions(+), 22 deletions(-)
rename Assets/{Zion/Scripts/cxx => }/MyNetMQClient.cs (100%)
rename Assets/{Zion/Scripts/cxx => }/MyNetMQClient.cs.meta (100%)
create mode 100644 Assets/Zion/Scripts/Adam/Components/RawImageMoveAttach.cs
create mode 100644 Assets/Zion/Scripts/Adam/Components/RawImageMoveAttach.cs.meta
create mode 100644 Assets/Zion/Scripts/Adam/Components/SceneLoad.cs
create mode 100644 Assets/Zion/Scripts/Adam/Components/SceneLoad.cs.meta
diff --git a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs b/Assets/MyNetMQClient.cs
similarity index 100%
rename from Assets/Zion/Scripts/cxx/MyNetMQClient.cs
rename to Assets/MyNetMQClient.cs
diff --git a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs.meta b/Assets/MyNetMQClient.cs.meta
similarity index 100%
rename from Assets/Zion/Scripts/cxx/MyNetMQClient.cs.meta
rename to Assets/MyNetMQClient.cs.meta
diff --git a/Assets/Resources/UIPanel/View_Panel2.prefab b/Assets/Resources/UIPanel/View_Panel2.prefab
index e11b8be3..d38700d1 100644
--- a/Assets/Resources/UIPanel/View_Panel2.prefab
+++ b/Assets/Resources/UIPanel/View_Panel2.prefab
@@ -8532,7 +8532,7 @@ GameObject:
- component: {fileID: 4190038652081818080}
- component: {fileID: 4190038652081818081}
m_Layer: 5
- m_Name: Text
+ m_Name: Title
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -8554,8 +8554,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 70, y: -20}
- m_SizeDelta: {x: 360, y: 120}
+ m_AnchoredPosition: {x: 290.0002, y: -20}
+ m_SizeDelta: {x: 1826.6891, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4190038652081818080
CanvasRenderer:
@@ -8591,7 +8591,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 90
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -11192,7 +11192,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4190038652633744906
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs
index 1b8458fa..eb882e75 100644
--- a/Assets/Temp/Scripts/View_Panel2.cs
+++ b/Assets/Temp/Scripts/View_Panel2.cs
@@ -90,7 +90,12 @@ public class View_Panel2 : XUIPanel
public Button entering_key_btn;//进入导调按钮
public Button scenario_btn;//想定编辑
public Button refresh_btn;//刷新房间按钮
-
+
+ ///
+ /// 房间科目标题
+ ///
+ public Text roomSubjectTitle;
+
public View_Panel2() : base(UIType.Normal, UIMode.HideOther, UICollider.Normal)
{
uiPath = "UIPanel/View_Panel2";
@@ -100,7 +105,6 @@ public class View_Panel2 : XUIPanel
roomModelDropdown = this.transform.Find("append_room_panl/roomModelDropdown").GetComponent();
thinkingDropdown = this.transform.Find("append_room_panl/thinkingDropdown").GetComponent();
refresh_btn = this.transform.Find("UPBG/Refresh_btn").GetComponent