Commit 98bfbfb2 authored by Unicorn369's avatar Unicorn369

Update

parent 20e675cc
......@@ -24,8 +24,8 @@ public class SelectServer : WindowServantSP
UIHelper.registEvent(gameObject, "face_", onClickFace);
UIHelper.registEvent(gameObject, "join_", onClickJoin);
serversList = UIHelper.getByName<UIPopupList>(gameObject, "server");
serversList.fontSize = 20;
serversList.value = Config.Get("serversPicker", "[OCG]Koishi");
serversList.fontSize = 30;
serversList.value = Config.Get("serversPicker", "[Custom]");
UIHelper.registEvent(gameObject, "server", pickServer);
UIHelper.getByName<UIInput>(gameObject, "name_").value = Config.Get("name", "YGOPro2 User");
//UIHelper.getByName<UIInput>(gameObject, "name_").defaultText = "昵称不能为空";
......@@ -42,6 +42,15 @@ public class SelectServer : WindowServantSP
//inputPsw.defaultText = "房间密码";
//inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_");
set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
//方便免修改 [selectServerWithRoomlist.prefab]
serversList.items.Add("[OCG]Mercury233");
serversList.items.Add("[OCG]Koishi");
serversList.items.Add("[TCG]Koishi");
serversList.items.Add("[222DIY]Koishi");
serversList.items.Add("[轮抽服]2Pick");
serversList.items.Add("[OCG&TCG]한국서버");
serversList.items.Add("[Custom]");
SetActiveFalse();
}
......
......@@ -623,7 +623,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 173134}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 241, y: 0, z: 0}
m_LocalPosition: {x: 280, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 489362}
......@@ -637,7 +637,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 183240}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -113, y: 11, z: 0}
m_LocalPosition: {x: -137, y: 10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 483428}
......@@ -663,7 +663,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 152254}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 241, y: 0, z: 0}
m_LocalPosition: {x: 288, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 432674}
......@@ -677,7 +677,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 105326}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10, y: 3, z: 0}
m_LocalPosition: {x: -10, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 416418}
......@@ -737,7 +737,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 183770}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -117, y: -1, z: 0}
m_LocalPosition: {x: -136.7, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 447572}
......@@ -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: 246, y: 188, z: 0}
m_LocalPosition: {x: 296, y: 188, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 410166}
......@@ -819,7 +819,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 123646}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 100, y: 0, z: 0}
m_LocalPosition: {x: 125, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 447572}
......@@ -832,7 +832,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 176992}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 266, y: 0, z: 0}
m_LocalPosition: {x: 308, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 402964}
......@@ -846,7 +846,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 159768}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 121, y: 0, z: 0}
m_LocalPosition: {x: 145, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 442160}
......@@ -860,7 +860,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 155260}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 163, y: 0, z: 0}
m_LocalPosition: {x: 183, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 442912}
......@@ -874,7 +874,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 134864}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -35, y: 12, z: 0}
m_LocalPosition: {x: -30, y: 12, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 407960}
......@@ -887,7 +887,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145222}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 266, y: 0, z: 0}
m_LocalPosition: {x: 308, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 416672}
......@@ -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: 10, y: 60, z: 0}
m_LocalPosition: {x: -20, y: 60.8, z: 0}
m_LocalScale: {x: 1.4325861, y: 1.4325869, z: 1.4325869}
m_Children:
- {fileID: 483958}
......@@ -917,7 +917,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 184660}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -71, y: 12, z: 0}
m_LocalPosition: {x: -97, y: 12, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 431316}
......@@ -930,7 +930,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 162226}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -113, y: 11, z: 0}
m_LocalPosition: {x: -135.5, y: 11, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 431974}
......@@ -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: 83, y: 130, z: 0}
m_LocalPosition: {x: 80, y: 130, z: 0}
m_LocalScale: {x: 1.4325861, y: 1.4325869, z: 1.4325869}
m_Children:
- {fileID: 413236}
......@@ -987,7 +987,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 159702}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10, y: 3, z: 0}
m_LocalPosition: {x: -10, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 472854}
......@@ -1016,7 +1016,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 168414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10, y: 3, z: 0}
m_LocalPosition: {x: -10, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 483958}
......@@ -1029,7 +1029,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 127754}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -176, y: -2.2, z: 0}
m_LocalPosition: {x: -200, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 447572}
......@@ -1055,7 +1055,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 113214}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 163, y: 0, z: 0}
m_LocalPosition: {x: 183, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 406588}
......@@ -1069,7 +1069,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 130460}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -113.8, y: 0, z: 0}
m_LocalPosition: {x: -115, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 479130}
......@@ -1116,7 +1116,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 152, y: 34, z: 0}
m_Size: {x: 205, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6512340
BoxCollider:
......@@ -1128,7 +1128,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 80, y: 34, z: 0}
m_Size: {x: 70, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6515454
BoxCollider:
......@@ -1140,8 +1140,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 206.0071, y: 32, z: 0}
m_Center: {x: -14.210312, y: 0, z: 0}
m_Size: {x: 280, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6517900
BoxCollider:
m_ObjectHideFlags: 1
......@@ -1176,7 +1176,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 231, y: 34, z: 0}
m_Size: {x: 280, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6532048
BoxCollider:
......@@ -1188,7 +1188,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 550, y: 450, z: 0}
m_Size: {x: 650, y: 450, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6540492
BoxCollider:
......@@ -1200,7 +1200,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 20, y: 20, z: 0}
m_Size: {x: 30, y: 30, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6551826
BoxCollider:
......@@ -1236,8 +1236,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 206.00713, y: 32, z: 0}
m_Center: {x: -14.996368, y: -0.0000038146973, z: 0}
m_Size: {x: 280, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11106082
Animation:
m_ObjectHideFlags: 1
......@@ -1355,13 +1355,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0
mWidth: 202
mWidth: 245
mHeight: 22
mDepth: 21
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 9.181818
aspectRatio: 11.136364
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -1485,13 +1485,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 518
mWidth: 618
mHeight: 5
mDepth: 2
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 103.6
aspectRatio: 123.6
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -1619,13 +1619,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 80
mWidth: 70
mHeight: 34
mDepth: 20
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.3529413
aspectRatio: 2.0588236
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -1735,13 +1735,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 152
mWidth: 205
mHeight: 34
mDepth: 20
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.470588
aspectRatio: 6.029412
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -1785,17 +1785,17 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 210
mWidth: 250
mHeight: 18
mDepth: 11
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 11.666667
aspectRatio: 13.888889
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: '[OCG]Koishi'
mText: '[Custom]'
mFontSize: 18
mFontStyle: 0
mAlignment: 0
......@@ -1851,13 +1851,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 236
mWidth: 280
mHeight: 34
mDepth: 20
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 6.9411764
aspectRatio: 8.235294
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -1901,13 +1901,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 236
mWidth: 280
mHeight: 34
mDepth: 20
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 6.9411764
aspectRatio: 8.235294
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -2045,13 +2045,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0
mWidth: 202
mWidth: 245
mHeight: 22
mDepth: 21
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 9.181818
aspectRatio: 11.136364
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -2297,13 +2297,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 480
mWidth: 580
mHeight: 22
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 21.818182
aspectRatio: 26.363636
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
......@@ -2347,24 +2347,24 @@ MonoBehaviour:
leftAnchor:
target: {fileID: 410166}
relative: 1
absolute: -39
absolute: -44
rightAnchor:
target: {fileID: 410166}
relative: 1
absolute: -19
absolute: -14
bottomAnchor:
target: {fileID: 410166}
relative: 1
absolute: -47
absolute: -52
topAnchor:
target: {fileID: 410166}
relative: 1
absolute: -27
absolute: -22
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 20
mHeight: 20
mWidth: 30
mHeight: 30
mDepth: 1
autoResizeBoxCollider: 1
hideIfOffScreen: 0
......@@ -2636,14 +2636,7 @@ MonoBehaviour:
highlightSprite: Button
position: 0
alignment: 1
items:
- '[OCG]Mercury233'
- '[OCG]Koishi'
- '[TCG]Koishi'
- '[222DIY]Koishi'
- "[\u8F6E\u62BD\u670D]2Pick"
- "[OCG&TCG]\uD55C\uAD6D\uC11C\uBC84"
- '[Custom]'
items: []
padding: {x: 4, y: 4}
textColor: {r: 1, g: 1, b: 1, a: 1}
backgroundColor: {r: 0, g: 0, b: 0, a: 1}
......@@ -2661,7 +2654,7 @@ MonoBehaviour:
mMethodName: function
mParameters: []
oneShot: 0
mSelectedItem: '[OCG]Mercury233'
mSelectedItem:
mPanel: {fileID: 0}
mBackground: {fileID: 0}
mHighlight: {fileID: 0}
......@@ -2777,13 +2770,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0
mWidth: 142
mWidth: 195
mHeight: 24
mDepth: 21
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 5.9166665
aspectRatio: 8.125
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
......@@ -2873,13 +2866,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 514
mWidth: 614
mHeight: 400
mDepth: -100
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.285
aspectRatio: 1.535
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -2932,20 +2925,20 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0
mWidth: 70
mWidth: 60
mHeight: 24
mDepth: 21
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.9166667
aspectRatio: 2.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u7AEF\u53E3"
mFontSize: 18
mFontStyle: 0
mAlignment: 1
mAlignment: 2
mEncoding: 0
mMaxLineCount: 1
mEffectStyle: 0
......@@ -3107,13 +3100,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 550
mWidth: 650
mHeight: 450
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.2222222
aspectRatio: 1.4444444
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -3167,7 +3160,7 @@ MonoBehaviour:
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
mClipRange: {x: 2, y: -1, z: 600, w: 600}
mClipRange: {x: 0, y: 0, z: 650, w: 450}
mClipSoftness: {x: 0, y: 0}
mDepth: 10
mSortingOrder: 0
......@@ -3384,13 +3377,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 231
mWidth: 280
mHeight: 34
mDepth: 7
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 6.7941175
aspectRatio: 8.235294
mType: 1
mFillDirection: 4
mFillAmount: 1
......
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