Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mercury233
ygopro2
Commits
7421f5d8
Commit
7421f5d8
authored
Apr 11, 2019
by
Unicorn369
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
3066cb8b
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
427 additions
and
56 deletions
+427
-56
Assets/SibylSystem/Room/RoomList.cs
Assets/SibylSystem/Room/RoomList.cs
+14
-1
Assets/SibylSystem/selectServer/SelectServer.cs
Assets/SibylSystem/selectServer/SelectServer.cs
+5
-0
Assets/transUI/prefab/RoomList.prefab
Assets/transUI/prefab/RoomList.prefab
+395
-42
Assets/transUI/prefab/selectServerWithRoomlist.prefab
Assets/transUI/prefab/selectServerWithRoomlist.prefab
+13
-13
No files found.
Assets/SibylSystem/Room/RoomList.cs
View file @
7421f5d8
...
...
@@ -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
)
...
...
Assets/SibylSystem/selectServer/SelectServer.cs
View file @
7421f5d8
...
...
@@ -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
;
...
...
Assets/transUI/prefab/RoomList.prefab
View file @
7421f5d8
This diff is collapsed.
Click to expand it.
Assets/transUI/prefab/selectServerWithRoomlist.prefab
View file @
7421f5d8
...
...
@@ -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
:
3
61
,
y
:
233
,
z
:
0
}
m_LocalPosition
:
{
x
:
3
36
,
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
:
-2
0
,
y
:
70
,
z
:
0
}
m_LocalPosition
:
{
x
:
-2
5
,
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
:
9
6
,
y
:
156
,
z
:
0
}
m_LocalPosition
:
{
x
:
9
0
,
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
:
7
8
0
,
y
:
540
,
z
:
0
}
m_Size
:
{
x
:
7
3
0
,
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
:
74
8
mWidth
:
69
8
mHeight
:
5
mDepth
:
2
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
aspectRatio
:
1
4
9.6
aspectRatio
:
1
3
9.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
:
71
0
mWidth
:
66
0
mHeight
:
22
mDepth
:
1
autoResizeBoxCollider
:
0
hideIfOffScreen
:
0
keepAspectRatio
:
0
aspectRatio
:
3
2.272728
aspectRatio
:
3
0
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
:
74
4
mWidth
:
69
4
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
:
7
8
0
mWidth
:
7
3
0
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
:
7
8
0
,
w
:
540
}
mClipRange
:
{
x
:
0
,
y
:
0
,
z
:
7
3
0
,
w
:
540
}
mClipSoftness
:
{
x
:
0
,
y
:
0
}
mDepth
:
10
mSortingOrder
:
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment