From f97ee1d39356b5883d5349d2c08a27a4e63d61c7 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 01 九月 2018 11:05:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client
---
Assets/Resources/UI/Prefabs/UIRootDebug.prefab | 304 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 294 insertions(+), 10 deletions(-)
diff --git a/Assets/Resources/UI/Prefabs/UIRootDebug.prefab b/Assets/Resources/UI/Prefabs/UIRootDebug.prefab
index 1577de9..cc8b594 100644
--- a/Assets/Resources/UI/Prefabs/UIRootDebug.prefab
+++ b/Assets/Resources/UI/Prefabs/UIRootDebug.prefab
@@ -266,6 +266,24 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1108334319050056
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 224141995372483590}
+ - component: {fileID: 222785485472813682}
+ - component: {fileID: 114879854850241988}
+ - component: {fileID: 114354786900507634}
+ m_Layer: 13
+ m_Name: InputField_AppId
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &1110518139832206
GameObject:
m_ObjectHideFlags: 1
@@ -506,6 +524,23 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1 &1218609726668130
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 224210612776918650}
+ - component: {fileID: 222250607883697174}
+ - component: {fileID: 114307207494411122}
+ m_Layer: 13
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
--- !u!1 &1222232992169336
GameObject:
m_ObjectHideFlags: 1
@@ -600,7 +635,7 @@
- component: {fileID: 114161902443471364}
- component: {fileID: 114699662176706370}
m_Layer: 13
- m_Name: InputField_AppId
+ m_Name: InputField_ServerId
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1110,6 +1145,23 @@
- component: {fileID: 114621707343749962}
m_Layer: 13
m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1510587738280390
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 224176543551706216}
+ - component: {fileID: 222214863196276190}
+ - component: {fileID: 114456310170880382}
+ m_Layer: 13
+ m_Name: Placeholder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3126,7 +3178,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: AppId...
+ m_Text: ServerId...
--- !u!114 &114204540691252070
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -3138,7 +3190,8 @@
m_Script: {fileID: 11500000, guid: 17a676a416cbca045a12353e0543b257, type: 3}
m_Name:
m_EditorClassIdentifier:
- appid: {fileID: 114699662176706370}
+ appid: {fileID: 114354786900507634}
+ serverId: {fileID: 114699662176706370}
account: {fileID: 114097966074523554}
password: {fileID: 114237167593929204}
isToken: {fileID: 114054659460772568}
@@ -3640,6 +3693,39 @@
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!114 &114307207494411122
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1218609726668130}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 0
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
--- !u!114 &114319447987658974
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -3784,6 +3870,69 @@
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
+--- !u!114 &114354786900507634
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1108334319050056}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 114879854850241988}
+ m_TextComponent: {fileID: 114307207494411122}
+ m_Placeholder: {fileID: 114456310170880382}
+ m_ContentType: 0
+ m_InputType: 0
+ m_AsteriskChar: 42
+ m_KeyboardType: 0
+ m_LineType: 0
+ m_HideMobileInput: 0
+ m_CharacterValidation: 0
+ m_CharacterLimit: 0
+ m_OnEndEdit:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+ m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_CustomCaretColor: 0
+ m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+ m_Text:
+ m_CaretBlinkRate: 0.85
+ m_CaretWidth: 1
+ m_ReadOnly: 0
--- !u!114 &114358935779773110
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -4157,6 +4306,39 @@
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Asset
+--- !u!114 &114456310170880382
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1510587738280390}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 24
+ m_FontStyle: 2
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: AppId...
--- !u!114 &114464327496547354
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -6117,6 +6299,33 @@
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
+--- !u!114 &114879854850241988
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1108334319050056}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
--- !u!114 &114883653995131594
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -6724,6 +6933,12 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1739647754641454}
+--- !u!222 &222214863196276190
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1510587738280390}
--- !u!222 &222226204655236032
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -6742,6 +6957,12 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1466017289806884}
+--- !u!222 &222250607883697174
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1218609726668130}
--- !u!222 &222263101551538140
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -7042,6 +7263,12 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1484940049078746}
+--- !u!222 &222785485472813682
+CanvasRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1108334319050056}
--- !u!222 &222797253542333696
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -7541,6 +7768,26 @@
m_AnchoredPosition: {x: 27, y: -0.5}
m_SizeDelta: {x: -65, y: -3}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224141995372483590
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1108334319050056}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.0005, y: 1.0005, z: 1.0005}
+ m_Children:
+ - {fileID: 224176543551706216}
+ - {fileID: 224210612776918650}
+ m_Father: {fileID: 224293392524944410}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -41.050014, y: 317.50006}
+ m_SizeDelta: {x: 417, y: 65}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224143641262224238
RectTransform:
m_ObjectHideFlags: 1
@@ -7692,6 +7939,24 @@
m_AnchoredPosition: {x: 532, y: 82}
m_SizeDelta: {x: 227, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224176543551706216
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1510587738280390}
+ 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_Children: []
+ m_Father: {fileID: 224141995372483590}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -0.5}
+ m_SizeDelta: {x: -20, y: -13}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224181133953311412
RectTransform:
m_ObjectHideFlags: 1
@@ -7710,6 +7975,24 @@
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 23.400002, y: 0}
m_SizeDelta: {x: 50, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224210612776918650
+RectTransform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1218609726668130}
+ 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_Children: []
+ m_Father: {fileID: 224141995372483590}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -0.5}
+ m_SizeDelta: {x: -20, y: -13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224227326815766522
RectTransform:
@@ -7827,6 +8110,7 @@
- {fileID: 224904450576587214}
- {fileID: 224410779905662192}
- {fileID: 224424186955041444}
+ - {fileID: 224141995372483590}
- {fileID: 224929588891009684}
m_Father: {fileID: 224016040741713446}
m_RootOrder: 4
@@ -8167,7 +8451,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -79.49996, y: -235.00002}
+ m_AnchoredPosition: {x: -42, y: 20}
m_SizeDelta: {x: 281, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224424186955041444
@@ -8187,7 +8471,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -353.3, y: -126.25}
+ m_AnchoredPosition: {x: -343, y: 113}
m_SizeDelta: {x: 168.5, y: 49.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224425462282839644
@@ -8843,7 +9127,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -60.49996, y: -69.000015}
+ m_AnchoredPosition: {x: -42, y: 178}
m_SizeDelta: {x: 417, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224860801944739792
@@ -8938,7 +9222,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -60.49996, y: -134}
+ m_AnchoredPosition: {x: -41.999996, y: 113.00005}
m_SizeDelta: {x: 417, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224908232511945006
@@ -9024,16 +9308,16 @@
m_GameObject: {fileID: 1283542631321198}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.0005, y: 1.0005, z: 1.0005}
+ m_LocalScale: {x: 1.0009501, y: 1.0009501, z: 1.0009501}
m_Children:
- {fileID: 224908232511945006}
- {fileID: 224166983807244918}
m_Father: {fileID: 224293392524944410}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -60.54998, y: 32.5}
+ m_AnchoredPosition: {x: -41.050037, y: 248.00002}
m_SizeDelta: {x: 417, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224932239922216382
--
Gitblit v1.8.0