Commit 7421f5d8 authored by Unicorn369's avatar Unicorn369

fix

parent 3066cb8b
......@@ -14,6 +14,8 @@ public class RoomList : WindowServantSP
createWindow(Program.I().new_ui_RoomList);
UIHelper.registEvent(gameObject, "exit_", onClickExit);
UIHelper.registEvent(gameObject, "refresh_", onRefresh);
//UIHelper.getByName(gameObject, "join").SetActive(false);
UIHelper.registEvent(gameObject, "join_", onJoin);
roomPSWLabel = UIHelper.getByName<UILabel>(gameObject, "roomNameLabel");
hideAI =UIHelper.getByName<UIToggle>(gameObject, "hideAIrooms_").value = UIHelper.fromStringToBool(Config.Get("hideAIrooms_", "1"));
hideStarted=UIHelper.getByName<UIToggle>(gameObject, "hideStarted_").value = UIHelper.fromStringToBool(Config.Get("hideStarted_", "1"));
......@@ -44,10 +46,12 @@ public class RoomList : WindowServantSP
listOfRooms.Clear();
listOfRooms.AddRange(roomList);
printFile();
Program.I().selectServer.onHide(true);
}
public void onClickExit()
{
hide();
Program.I().selectServer.onHide(false);
}
public override void hide()
{
......@@ -77,6 +81,15 @@ public class RoomList : WindowServantSP
}
string selectedString = string.Empty;
void onJoin()
{
if (roomPSWLabel.text != "")
{
onSelected();
}
}
void onSelected()
{
if (!isShowed)
......@@ -99,7 +112,7 @@ public class RoomList : WindowServantSP
else
{
roomPSWLabel.text = "";
}
}
}
void JoinRoom(string selectedString,string roomPsw)
......
......@@ -288,6 +288,11 @@ public class SelectServer : WindowServantSP
KF_onlineGame(Name, ipString, portString, versionString, pswString);
}
public void onHide(bool Bool)
{
gameObject.SetActive(!Bool);
}
public void KF_onlineGame(string Name, string ipString, string portString, string versionString, string pswString = "")
{
name = Name;
......
This diff is collapsed.
......@@ -763,7 +763,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 137516}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 361, y: 233, z: 0}
m_LocalPosition: {x: 336, y: 233, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 410166}
......@@ -901,7 +901,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152882}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -20, y: 70, z: 0}
m_LocalPosition: {x: -25, y: 70, z: 0}
m_LocalScale: {x: 1.4325861, y: 1.4325869, z: 1.4325869}
m_Children:
- {fileID: 483958}
......@@ -943,7 +943,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 161550}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 96, y: 156, z: 0}
m_LocalPosition: {x: 90, y: 156, z: 0}
m_LocalScale: {x: 1.4325861, y: 1.4325869, z: 1.4325869}
m_Children:
- {fileID: 413236}
......@@ -1188,7 +1188,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 780, y: 540, z: 0}
m_Size: {x: 730, y: 540, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6540492
BoxCollider:
......@@ -1485,13 +1485,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 748
mWidth: 698
mHeight: 5
mDepth: 2
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 149.6
aspectRatio: 139.6
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -2297,13 +2297,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 710
mWidth: 660
mHeight: 22
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 32.272728
aspectRatio: 30
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
......@@ -2866,13 +2866,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 744
mWidth: 694
mHeight: 490
mDepth: -100
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.5183673
aspectRatio: 1.4163265
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -3100,13 +3100,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 780
mWidth: 730
mHeight: 540
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.4444444
aspectRatio: 1.3518518
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -3160,7 +3160,7 @@ MonoBehaviour:
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
mClipRange: {x: 0, y: 0, z: 780, w: 540}
mClipRange: {x: 0, y: 0, z: 730, w: 540}
mClipSoftness: {x: 0, y: 0}
mDepth: 10
mSortingOrder: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment