From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index 4e767eb..9c457be 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -14,7 +14,7 @@
/// <summary>
/// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
/// </summary>
- private Entity.Room selectedRoom = new Entity.Room { sid = Language.StringByID(StringId.allAreas) };
+ private Entity.Room selectedRoom = new Entity.Room { uid = Language.StringByID(StringId.allAreas) };
/// <summary>
/// 琛ㄧず鏄�(鏉′欢/鐩爣)
/// </summary>
@@ -111,12 +111,12 @@
areaView.frameLayout.Y = Application.GetRealHeight(i * 44);
areaBgh.AddChidren(areaView.FLayoutView());
}
- areaView.btnRoomName.Text = room.name;
+ areaView.btnRoomName.Text = room.roomName;
areaView.btnClick.Tag = room;
areaView.btnClick.MouseUpEventHandler += (sender2, e2) =>
{
fLayout.RemoveFromParent();
- funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).name;
+ funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).roomName;
///鍒囨崲鎴块棿榛樿鍔熻兘绫诲瀷鍏ㄩ儴;
funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
selectedRoom = (areaView.btnClick.Tag as Entity.Room);
--
Gitblit v1.8.0