Browse Source

增加一步新手教程

liuqilin 7 years ago
parent
commit
8f0f4eb811

+ 352 - 0
Assets/Resource/Prefab/PrefabUI/GroupB.prefab

@@ -906,6 +906,41 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1343002351720320
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224886103940314876}
+  m_Layer: 5
+  m_Name: F_CoinLabArrow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1343165206977022
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224301049649300382}
+  - component: {fileID: 222309329158210130}
+  - component: {fileID: 114008048856996156}
+  - component: {fileID: 225041101429342960}
+  - component: {fileID: 114549458923145970}
+  - component: {fileID: 114251376163375548}
+  m_Layer: 5
+  m_Name: F_TipBK
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1346443878185892
 GameObject:
   m_ObjectHideFlags: 1
@@ -1687,6 +1722,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1578535386689668
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224899381105815460}
+  - component: {fileID: 222460421472628348}
+  - component: {fileID: 114582515736887560}
+  - component: {fileID: 114764067218293322}
+  m_Layer: 5
+  m_Name: F_Tip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1583282252587274
 GameObject:
   m_ObjectHideFlags: 1
@@ -1718,6 +1771,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1595271943448036
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224724741424412646}
+  - component: {fileID: 222175287282088944}
+  - component: {fileID: 114781395289693860}
+  - component: {fileID: 114878716550843326}
+  m_Layer: 5
+  m_Name: F_TipBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1597714874604208
 GameObject:
   m_ObjectHideFlags: 1
@@ -3270,6 +3341,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114008048856996156
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
+  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: 10905, 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 &114038645238199476
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4666,6 +4764,28 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114251376163375548
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 10
+    m_Top: 10
+    m_Bottom: 10
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114251392176235482
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6343,6 +6463,19 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114549458923145970
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!114 &114555878820016172
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6653,6 +6786,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!114 &114582515736887560
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1578535386689668}
+  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: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u63D0\u793A"
 --- !u!114 &114583010482564118
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7796,6 +7962,19 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114764067218293322
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1578535386689668}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114764243902614018
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7918,6 +8097,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114781395289693860
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595271943448036}
+  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: 0}
+  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: 10905, 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 &114782493789392492
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8588,6 +8794,47 @@ MonoBehaviour:
   m_FillAmount: 0
   m_FillClockwise: 0
   m_FillOrigin: 2
+--- !u!114 &114878716550843326
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595271943448036}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, 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: 114781395289693860}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114887953751990228
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -9646,6 +9893,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1807554589449926}
+--- !u!222 &222175287282088944
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595271943448036}
 --- !u!222 &222182171066461268
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -9754,6 +10007,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1444672313179750}
+--- !u!222 &222309329158210130
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
 --- !u!222 &222322499328308458
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -9844,6 +10103,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1757151041689946}
+--- !u!222 &222460421472628348
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1578535386689668}
 --- !u!222 &222460683807456918
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -10755,6 +11020,9 @@ RectTransform:
   - {fileID: 224607867221133714}
   - {fileID: 224508586722394958}
   - {fileID: 224139494950361932}
+  - {fileID: 224886103940314876}
+  - {fileID: 224301049649300382}
+  - {fileID: 224724741424412646}
   m_Father: {fileID: 224637421988288774}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11274,6 +11542,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -8}
   m_SizeDelta: {x: 0, y: -15.8}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224301049649300382
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
+  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:
+  - {fileID: 224899381105815460}
+  m_Father: {fileID: 224137309595678166}
+  m_RootOrder: 10
+  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: -5.6649237, y: 19.71965}
+  m_SizeDelta: {x: 388.1, y: 39.439255}
+  m_Pivot: {x: 0.5, y: 1.0000002}
 --- !u!224 &224303333383915956
 RectTransform:
   m_ObjectHideFlags: 1
@@ -12743,6 +13030,24 @@ RectTransform:
   m_AnchoredPosition: {x: 245, y: 0}
   m_SizeDelta: {x: 171, y: 57}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224724741424412646
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1595271943448036}
+  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: 224137309595678166}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -132.90002, y: -147.04779}
+  m_SizeDelta: {x: 366.67, y: 398.09348}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224726100782027630
 RectTransform:
   m_ObjectHideFlags: 1
@@ -13399,6 +13704,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0.0015106201, y: 0.0000038146973}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: -0.0000002521514, y: -0.00000013411045}
+--- !u!224 &224886103940314876
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343002351720320}
+  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: 224137309595678166}
+  m_RootOrder: 9
+  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: -283.1, y: 13.652252}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224889786902652726
 RectTransform:
   m_ObjectHideFlags: 1
@@ -13453,6 +13776,24 @@ RectTransform:
   m_AnchoredPosition: {x: -69.8, y: -34}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224899381105815460
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1578535386689668}
+  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: 224301049649300382}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 194.05, y: -19.719627}
+  m_SizeDelta: {x: 368.1, y: 19.439253}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224900738634093604
 RectTransform:
   m_ObjectHideFlags: 1
@@ -13773,6 +14114,17 @@ RectTransform:
   m_AnchoredPosition: {x: 300, y: -380}
   m_SizeDelta: {x: 375, y: 375}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225041101429342960
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1343165206977022}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!225 &225099609868306486
 CanvasGroup:
   m_ObjectHideFlags: 1

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -13,6 +13,7 @@
     <F_PersonBtn1 desc=""><![CDATA[每分钟有这么多人来参观花园]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费]]></F_CoinPersonBtn1>
+    <F_Tip desc=""><![CDATA[这是一款健康游戏,不在线也可以持续获得金币。如果觉得暂时没什么可做的,可以过一段时间再来玩]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[解锁]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[升级]]></Fe_BtnLab2>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -13,6 +13,7 @@
     <F_PersonBtn1 desc=""><![CDATA[每分鐘有這麼多人來參觀花園]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[門票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費]]></F_CoinPersonBtn1>
+    <F_Tip desc=""><![CDATA[這是一款健康遊戲,不在線上也可以持續獲得金幣。如果覺得暫時沒什麼可做的,可以過一段時間再來玩。]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[提前解鎖]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[解鎖]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[升級]]></Fe_BtnLab2>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -13,6 +13,7 @@
     <F_PersonBtn1 desc=""><![CDATA[Visitors per minute]]></F_PersonBtn1>
     <F_CoinPersonBtn0 desc=""><![CDATA[Ticket]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor]]></F_CoinPersonBtn1>
+    <F_Tip desc=""><![CDATA[This is a healthy game, that means you can get coins when you are offline. If you feel tired, come to play after a rest.]]></F_Tip>
     <Fe_BtnLab0 desc=""><![CDATA[Unlock Now]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[Unlock]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[Upgrade]]></Fe_BtnLab2>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 2
Assets/Script/Manage/ManaNickName.cs

@@ -112,13 +112,13 @@ public class ManaNickName : Regist
         }
 	}
 
-    public static void ResetFailed()
+    public static void ResetFailed(string str)
     {
         ManaReso.SetText("T_Tit", Language.GetStr("UI", "T_Tit"));
 
         ManaReso.Get<CanvasGroup>("T_NickNameBK").interactable = true;
 
-        Bubble.Show(null, Language.GetStr("UI", "T_RepeatName"));
+        Bubble.Show(null, str);
     }
 
     public static void ResetSucceed()

+ 6 - 2
Assets/Script/Manage/ManaServer.cs

@@ -181,7 +181,7 @@ public class ManaServer : Regist
     }
 
 
-    public static void SetNickName(string nickname, Action succeedCallback, Action failCallback)
+    public static void SetNickName(string nickname, Action succeedCallback, Action<string> failCallback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -199,9 +199,13 @@ public class ManaServer : Regist
                 {
                     succeedCallback.Invoke();
                 }
+                else if (data.Contains("Could not resolve host"))
+                {
+                    failCallback.Invoke(Language.GetStr("UI", "Fg_Lab3"));
+                }
                 else
                 {
-                    failCallback.Invoke();
+                    failCallback.Invoke(Language.GetStr("UI", "T_RepeatName"));
                 }
             },
             URLRequest.Method.POST

+ 31 - 1
Assets/Script/Manage/ManaTutorial.cs

@@ -256,15 +256,24 @@ public class ManaTutorial : Regist
         EnterA9();
     }
 
+    public static void EndA9()
+    {
+        Tutorial.HightDisable(0, false);
+    }
+
     public static void EndA()
     {
         StaticsManager.GetInstance().TutoComplete("A");
 
         TutorialA = false;
 
+        ManaAudio.PlayClip(Clip.CloseClip);
+
         ManaAchieve.UpdateHint();
 
         Tutorial.HightDisable();
+        ManaReso.Get("F_TipBK").TweenBacCG();
+        ManaReso.SetActive("F_TipBtn", false);
 
         ManaReso.SetActive("Tutorial", false);
         ManaReso.SetActive("N_Tutorial", false);
@@ -767,11 +776,32 @@ public class ManaTutorial : Regist
             "F_SkillBk11",
             () =>
             {
-                EndA();
+                EndA9();
+                EnterA10();
             }
         );
     }
 
+    public static void EnterA10()
+    {
+        ManaReso.Get("N_Mask").TweenForGra();
+
+        ManaReso.Get("F_TipBK").TweenForCG();
+        ManaReso.SetText("F_Tip", Language.GetStr("UI", "F_Tip"));
+
+        ManaReso.SetActive("F_TipBtn", true);
+        ManaReso.AddButtonEventOnetime("F_TipBtn", () => EndA());
+
+        ManaReso.Get<ContentSizeFitter>("F_TipBK").SetLayoutVertical();
+        ManaReso.Get<ContentSizeFitter>("F_TipBK").SetLayoutHorizontal();
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_TipBtn"), 3);
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_TipBK"), 1);
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_Tip"), 2);
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_DataB"), 1);
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_CoinLab"), 2);
+        Tutorial.HightScreen(ManaReso.Get("F_CoinLabArrow"), ManaReso.Get("F_DiamondLab"), 2);
+    }
+
 
     public static void EndC()
     {

+ 2 - 0
Assets/Script/Manage/ManaUI.cs

@@ -1300,6 +1300,8 @@ public class ManaUI : Regist
         ManaLan.Add(ManaReso.Get<Text>("Fg_Lab"), new LanStr("UI", "Fg_Lab0"));
         ManaLan.Add(ManaReso.Get<Text>("Fg_BtnLab"), new LanStr("UI", "Fg_BtnLab"));
 
+        ManaReso.Get("F_TipBK").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
         #region F_Close
 
         ManaReso.AddButtonEvent

+ 2 - 2
Assets/Script/Object/Tutorial.cs

@@ -37,14 +37,14 @@ public class Tutorial : Regist, IPointerClickHandler
         PointScene(arrowPos.position, targetPos);
     }
 
-    public static void HightScreen(Transform arrowPos, Transform target)
+    public static void HightScreen(Transform arrowPos, Transform target, int order = 1)
     {
         target.AddComponent<GraphicRaycaster>();
 
         Canvas canvas = target.GetComponent<Canvas>();
 
         canvas.overrideSorting = true;
-        canvas.sortingOrder = 1;
+        canvas.sortingOrder = order;
 
         MaskLock = true;
 

+ 8 - 35
Assets/Script/Tool/Auxiliary.cs

@@ -140,21 +140,10 @@ public class Auxiliary : Regist
 
         //}
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
-        //    foreach (var VARIABLE in ChestMge.PlazaRoomChests)
-        //    {
-        //        VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
-        //        VARIABLE.ChestSR.material = UnityFactory.Materials[0];
-        //    }
-
-        //    ManaSocial.CloseCommentPanel();
-        //    Debug.LogWarning(ManaServer.SerialNumber);
-        //    SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
-        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
-        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            ManaTutorial.EnterA10();
+        }
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{
@@ -192,26 +181,10 @@ public class Auxiliary : Regist
         //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
         //}
 
-        //if (Input.GetKeyDown(KeyCode.X))
-        //{
-        //    GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
-
-        //    ManaPlayer.Player.PlayAnim("newAnimation");
-
-        //    StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
-
-        //    ManaMiniGame.GameTimer = 45;
-
-        //    Lottery.TempTypeList = new List<int>();
-        //    Lottery.TempValueList = new List<int>();
-        //    Lottery.TempLotteryList = new List<Lottery>();
-
-        //    Lottery.EnterAnimation();
-
-        //    ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-        //    ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-        //    ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
-        //}
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            ManaMiniGame.GameTimer = 45;
+        }
 
         //if (Input.GetKeyDown(KeyCode.C))
         //{