Commit 876aa5d2 authored by Szefo09's avatar Szefo09

small changes and fixes

parent 7aa64722
......@@ -208,6 +208,7 @@ GameObject:
m_Component:
- component: {fileID: 433428}
- component: {fileID: 11448134}
- component: {fileID: 54320387258067812}
m_Layer: 18
m_Name: trans_menu
m_TagString: Untagged
......@@ -878,7 +879,7 @@ MonoBehaviour:
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: code
mSpriteName: wlan
mFillCenter: 1
--- !u!114 &11424548
MonoBehaviour:
......@@ -920,7 +921,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u8054\u673A\u6A21\u5F0F"
mText: MyCard
mFontSize: 30
mFontStyle: 0
mAlignment: 1
......@@ -2080,6 +2081,21 @@ Transform:
m_Father: {fileID: 433428}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &54320387258067812
Rigidbody:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 167656}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &65096595021590956
BoxCollider:
m_ObjectHideFlags: 1
......@@ -2702,7 +2718,7 @@ MonoBehaviour:
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: wlan
mSpriteName: ai
mFillCenter: 1
--- !u!114 &114919610355209304
MonoBehaviour:
......
......@@ -47,6 +47,26 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1169304120092672
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4530632207040608}
- component: {fileID: 114486893369879402}
- component: {fileID: 65003333914937944}
- component: {fileID: 114944922128676282}
- component: {fileID: 111230526307789670}
- component: {fileID: 114313769570919500}
m_Layer: 18
m_Name: join_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1175985843890396
GameObject:
m_ObjectHideFlags: 0
......@@ -190,7 +210,23 @@ GameObject:
m_Component:
- component: {fileID: 4785520049694142}
m_Layer: 18
m_Name: join
m_Name: joinDuel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1359153551477658
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4564215266357604}
- component: {fileID: 114728593760355416}
m_Layer: 18
m_Name: Texture
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -340,6 +376,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1867510133601516
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4212901320407000}
m_Layer: 18
m_Name: joinMatch
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1894411024228806
GameObject:
m_ObjectHideFlags: 1
......@@ -375,7 +426,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1937586607809126
GameObject:
m_ObjectHideFlags: 1
......@@ -408,6 +459,22 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1988175891521010
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4983701293944958}
- component: {fileID: 114874287838716082}
m_Layer: 18
m_Name: '!lable'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4035906615032416
Transform:
m_ObjectHideFlags: 1
......@@ -419,10 +486,11 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4324948048801218}
- {fileID: 4785520049694142}
- {fileID: 4212901320407000}
- {fileID: 4780920591967372}
- {fileID: 4245870101402280}
- {fileID: 4116820096507130}
- {fileID: 4785520049694142}
m_Father: {fileID: 4595469580264670}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -465,6 +533,21 @@ Transform:
m_Father: {fileID: 4035906615032416}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4212901320407000
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1867510133601516}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -54.59999, y: -130, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4564215266357604}
- {fileID: 4530632207040608}
m_Father: {fileID: 4035906615032416}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4245870101402280
Transform:
m_ObjectHideFlags: 1
......@@ -472,7 +555,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1033621642269724}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 277, y: 184, z: 0}
m_LocalPosition: {x: 277, y: 185, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4035906615032416}
......@@ -549,6 +632,20 @@ Transform:
m_Father: {fileID: 4321787859870798}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4530632207040608
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -88.5, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4983701293944958}
m_Father: {fileID: 4212901320407000}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4536322065443608
Transform:
m_ObjectHideFlags: 1
......@@ -564,6 +661,19 @@ Transform:
m_Father: {fileID: 4324948048801218}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4564215266357604
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1359153551477658}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -163.5, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4212901320407000}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4583768040122266
Transform:
m_ObjectHideFlags: 1
......@@ -586,7 +696,7 @@ Transform:
m_GameObject: {fileID: 1983650994634962}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_Children:
- {fileID: 4035906615032416}
m_Father: {fileID: 4680784161146278}
......@@ -639,14 +749,14 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1351917909121188}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 92.25, y: -130, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 211.2, y: -130.00002, z: 0}
m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
m_Children:
- {fileID: 4036179887172554}
- {fileID: 4583768040122266}
m_Father: {fileID: 4035906615032416}
m_RootOrder: 1
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4801259262470012
Transform:
......@@ -707,7 +817,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1896061528923004}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 80.7, y: -67.9, z: 0}
m_LocalPosition: {x: 80.7, y: -81.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4988622945577436}
......@@ -730,6 +840,19 @@ Transform:
m_Father: {fileID: 4536322065443608}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4983701293944958
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1988175891521010}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 49.5, y: -3.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4530632207040608}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4988622945577436
Transform:
m_ObjectHideFlags: 1
......@@ -743,6 +866,18 @@ Transform:
m_Father: {fileID: 4922175906326704}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &65003333914937944
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 198, y: 48, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &65081555179840836
BoxCollider:
m_ObjectHideFlags: 1
......@@ -830,6 +965,21 @@ Animation:
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!111 &111230526307789670
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_Enabled: 0
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_Animations:
- {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!111 &111856982586962198
Animation:
m_ObjectHideFlags: 1
......@@ -912,13 +1062,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 574
mHeight: 384
mWidth: 880
mHeight: 605
mDepth: -50
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.4947916
aspectRatio: 1.4545455
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -981,7 +1131,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u9009\u62E9\u670D\u52A1\u5668\uFF1A"
mText: "\u6E38\u620F\u6A21\u5F0F\uFF1A"
mFontSize: 27
mFontStyle: 0
mAlignment: 3
......@@ -1142,7 +1292,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u8FDE\u63A5\u4E3B\u673A"
mText: "\u5A31\u4E50\u5339\u914D"
mFontSize: 30
mFontStyle: 0
mAlignment: 1
......@@ -1434,6 +1584,29 @@ MonoBehaviour:
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: lineWin
mFillCenter: 1
--- !u!114 &114313769570919500
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f093ad5830afe44aba6efa8b8a5d5b9, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 111230526307789670}
animator: {fileID: 0}
clipName:
trigger: 1
playDirection: 1
resetOnPlay: 0
clearSelection: 0
ifDisabledOnPlay: 0
disableWhenFinished: 0
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114467813740223384
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1482,7 +1655,7 @@ MonoBehaviour:
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: link
mSpriteName: duel
mFillCenter: 1
--- !u!114 &114486848704208216
MonoBehaviour:
......@@ -1534,6 +1707,43 @@ MonoBehaviour:
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: whiteLine
mFillCenter: 1
--- !u!114 &114486893369879402
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 198
mHeight: 48
mDepth: 12
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.125
--- !u!114 &114574272136968452
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1634,7 +1844,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u623F\u95F4\u5BC6\u7801\uFF1A"
mText: "\u5BC6\u7801\uFF1A"
mFontSize: 27
mFontStyle: 0
mAlignment: 3
......@@ -1903,6 +2113,56 @@ MonoBehaviour:
font: {fileID: 0}
textLabel: {fileID: 0}
source: {fileID: 0}
--- !u!114 &114728593760355416
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1359153551477658}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 60
mHeight: 60
mDepth: 13
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: launch
mFillCenter: 1
--- !u!114 &114744683995767614
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -2043,7 +2303,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
mText: "\u73A9\u5BB6\u6635\u79F0\uFF1A"
mText: "\u7528\u6237\u540D\uFF1A"
mFontSize: 27
mFontStyle: 0
mAlignment: 3
......@@ -2069,6 +2329,72 @@ MonoBehaviour:
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &114874287838716082
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1988175891521010}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: -4
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 180
mHeight: 48
mDepth: 3
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.75
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u7ADE\u6280\u5339\u914D"
mFontSize: 30
mFontStyle: 0
mAlignment: 1
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 1
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mOverflowEllipsis: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &114878168892312870
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -2185,3 +2511,30 @@ MonoBehaviour:
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &114944922128676282
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1169304120092672}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 1169304120092672}
hover: {r: 1, g: 1, b: 1, a: 1}
pressed: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 1, g: 1, b: 1, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
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