liuqilin 7 anni fa
parent
commit
f673e4c8a6

+ 1 - 106
Assets/Resource/Logo.unity

@@ -409,110 +409,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1322895614
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0
@@ -718,8 +614,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   DebugMode: 0
   CatchException: 1
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 2 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -132,6 +132,8 @@ MonoBehaviour:
   - {fileID: 1729611064873092, guid: 2419a390c1816dd4298ae3170193f310, type: 2}
   - {fileID: 1626347861987158, guid: 7b82777cdb999ce468b189ea45f9d28d, type: 2}
   - {fileID: 1413586954378082, guid: aee5f0274f4a5ce4c9ac82c88b9dc4cc, type: 2}
+  - {fileID: 21300000, guid: bc420c207023c1c4f9c9070d17426ddf, type: 3}
+  - {fileID: 21300000, guid: 9c2446bf071c1fe449284cf2e2bdd17b, type: 3}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

+ 124 - 13
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -707,7 +707,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -1244,6 +1244,25 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1086083831040074
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224355700308877554}
+  - component: {fileID: 222286535161241496}
+  - component: {fileID: 114198214522294086}
+  - component: {fileID: 114871013624860144}
+  - component: {fileID: 114703043216014294}
+  m_Layer: 5
+  m_Name: C_Achieve
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1087748547841394
 GameObject:
   m_ObjectHideFlags: 1
@@ -8743,9 +8762,8 @@ GameObject:
   - component: {fileID: 222854679245229654}
   - component: {fileID: 114984741759554756}
   - component: {fileID: 114035620553769990}
-  - component: {fileID: 114703043216014294}
   m_Layer: 5
-  m_Name: C_Achieve
+  m_Name: C_WifiButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -21023,6 +21041,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
+--- !u!114 &114198214522294086
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1086083831040074}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 21300000, guid: bfab2c37ce8348c4da36157d43ac8526, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114198943539624040
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -37162,7 +37207,7 @@ MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1555391658121646}
+  m_GameObject: {fileID: 1086083831040074}
   m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -42275,6 +42320,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114871013624860144
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1086083831040074}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 1, g: 1, b: 1, a: 1}
+    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: 114198214522294086}
+  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 &114871305224049294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -45835,7 +45921,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: bfab2c37ce8348c4da36157d43ac8526, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9c2446bf071c1fe449284cf2e2bdd17b, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -50170,6 +50256,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1573711137570058}
+--- !u!222 &222286535161241496
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1086083831040074}
 --- !u!222 &222288162152729320
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -57395,6 +57487,7 @@ RectTransform:
   - {fileID: 224557266129361242}
   - {fileID: 224664068708483776}
   - {fileID: 224789236873299198}
+  - {fileID: 224511404771622422}
   - {fileID: 224510655550494344}
   m_Father: {fileID: 224902232319357440}
   m_RootOrder: 0
@@ -59163,6 +59256,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224355700308877554
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1086083831040074}
+  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: 224640269830096362}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 40, y: -185}
+  m_SizeDelta: {x: 80, y: 74}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224359208135822458
 RectTransform:
   m_ObjectHideFlags: 1
@@ -61613,7 +61724,7 @@ RectTransform:
   m_Children:
   - {fileID: 224152974835455020}
   m_Father: {fileID: 224246329819966360}
-  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}
@@ -61630,13 +61741,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224640269830096362}
-  m_RootOrder: 1
+  m_Father: {fileID: 224246329819966360}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 40, y: -185}
-  m_SizeDelta: {x: 80, y: 74}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 18.6, y: 15.5}
+  m_SizeDelta: {x: 31.2, y: 31.200012}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224513441037128402
 RectTransform:
@@ -63844,7 +63955,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224520529770746330}
-  - {fileID: 224511404771622422}
+  - {fileID: 224355700308877554}
   - {fileID: 224236738206977114}
   - {fileID: 224095384852473960}
   m_Father: {fileID: 224246329819966360}

BIN
Assets/Resource/Sprite/Editor/SpriteUI/wifi_lost.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/wifi_lost.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 9c2446bf071c1fe449284cf2e2bdd17b
+timeCreated: 1511772865
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/SpriteUI/wifi_ok.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/wifi_ok.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: bc420c207023c1c4f9c9070d17426ddf
+timeCreated: 1511772866
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 33 - 1
Assets/Resource/Sprite/Editor/SpriteUI/切换按钮.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b6177b7d778e787409ab9a25cac2ca43
-timeCreated: 1511423692
+timeCreated: 1511778242
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,38 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

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

@@ -5,6 +5,9 @@
     <C_DressRoom desc=""><![CDATA[提升花园等级,开放试衣间]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[无法访问花园]]></C_VisitFail>
     <C_CannotComment desc=""><![CDATA[不能留言,这家主人离开太久了]]></C_CannotComment>
+    <C_Wifi desc=""><![CDATA[如果无法正常连接服务器,你的当前存档则无法在服务器保存。如果卸载游戏或清理缓存,可能造成回档甚至存档丢失。目前联网状态[&value&]]]></C_Wifi>
+    <C_WifiOn desc=""><![CDATA[正常]]></C_WifiOn>
+    <C_WifiOff desc=""><![CDATA[异常]]></C_WifiOff>
     <C_Level desc=""><![CDATA[等级]]></C_Level>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>

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

@@ -5,6 +5,9 @@
     <C_DressRoom desc=""><![CDATA[提升花園等級,開放試衣間]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[無法訪問花園]]></C_VisitFail>
     <C_CannotComment desc=""><![CDATA[不能留言,這家主人離開太久了]]></C_CannotComment>
+    <C_Wifi desc=""><![CDATA[如果無法正常連接伺服器,你的當前存檔則無法在伺服器保存。如果卸載遊戲或清理緩存,可能造成回檔甚至存檔丟失。目前聯網狀態[&value&]]]></C_Wifi>
+    <C_WifiOn desc=""><![CDATA[正常]]></C_WifiOn>
+    <C_WifiOff desc=""><![CDATA[異常]]></C_WifiOff>
     <C_Level desc=""><![CDATA[等級]]></C_Level>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>

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

@@ -5,6 +5,9 @@
     <C_DressRoom desc=""><![CDATA[Upgrade garden to enter dressroom]]></C_DressRoom>
     <C_VisitFail desc=""><![CDATA[Visit failed]]></C_VisitFail>
     <C_CannotComment desc=""><![CDATA[Not available, host left away too long]]></C_CannotComment>
+    <C_Wifi desc=""><![CDATA[Your archive may be lost if you uninstall the game or clear the cache when you can not connect the server. Now [&value&]]]></C_Wifi>
+    <C_WifiOn desc=""><![CDATA[online]]></C_WifiOn>
+    <C_WifiOff desc=""><![CDATA[offline]]></C_WifiOff>
     <C_Level desc=""><![CDATA[Lv]]></C_Level>
     <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 3 - 0
Assets/Script/Label/LanguageLabel.cs

@@ -12,6 +12,9 @@ public class LanguageLabel
 	public static string UI__C_DressRoom = "UI__C_DressRoom";
 	public static string UI__C_VisitFail = "UI__C_VisitFail";
 	public static string UI__C_CannotComment = "UI__C_CannotComment";
+	public static string UI__C_Wifi = "UI__C_Wifi";
+	public static string UI__C_WifiOn = "UI__C_WifiOn";
+	public static string UI__C_WifiOff = "UI__C_WifiOff";
 	public static string UI__C_Level = "UI__C_Level";
 	public static string UI__F_StoreLab = "UI__F_StoreLab";
 	public static string UI__F_MagicLab = "UI__F_MagicLab";

+ 4 - 2
Assets/Script/Label/ObjectLabel.cs

@@ -85,6 +85,7 @@ public class ObjectLabel
 	public static string C_IncomeLab = "C_IncomeLab";
 	public static string C_Garden = "C_Garden";
 	public static string C_GardenLab = "C_GardenLab";
+	public static string C_WifiButton = "C_WifiButton";
 	public static string C_Tip = "C_Tip";
 	public static string C_TipLab = "C_TipLab";
 	public static string C_Group2 = "C_Group2";
@@ -853,10 +854,11 @@ public class ObjectLabel
 	public static string A_HudParent = "A_HudParent";
 	public static string U_LoadingPanel = "U_LoadingPanel";
 	public static string U_DebugLab = "U_DebugLab";
+	public static string U_VGroup = "U_VGroup";
+	public static string U_WarningTitle = "U_WarningTitle";
+	public static string U_WarningText = "U_WarningText";
 	public static string U_Group = "U_Group";
 	public static string U_Icon = "U_Icon";
 	public static string U_Lab = "U_Lab";
-	public static string U_WarningTitle = "U_WarningTitle";
-	public static string U_WarningText = "U_WarningText";
 	//Mark
 }

+ 2 - 0
Assets/Script/Label/ResourceLabel.cs

@@ -51,6 +51,8 @@ public class ResourceLabel
     public static string Tutorial = "Tutorial";
     public static string DressRoom = "DressRoom";
 
+    public static string WifiOn = "wifi_ok";
+    public static string WifiOff = "wifi_lost";
     public static string Expression = "Expression";
     public static string Slot = "未开垦图标";
     public static string SystemChest = "系统宝箱";

+ 51 - 2
Assets/Script/Manage/HttpManager.cs

@@ -72,6 +72,9 @@ public class HttpManager : Regist
 
     #region Config
 
+    public static Action OnConnect;
+    public static Action OnConnectionLost;
+
     public static bool IsConnect
     {
         get
@@ -87,7 +90,6 @@ public class HttpManager : Regist
         }
         set { isConnect = value; }
     }
-
     public static bool isConnect;
 
     public static bool BuyPackLimitFlag
@@ -106,7 +108,6 @@ public class HttpManager : Regist
             }
         }
     }
-
     public static bool buyPackLimitFlag;
 
 
@@ -125,6 +126,8 @@ public class HttpManager : Regist
     public static string AnnounceContent;
     public static Sprite AnnounceSpite;
 
+    public static Button WifiButton;
+
     public static int ReplayVersion;
     public static bool Inited;
     public static bool FirstTimeConnectFlag = true;
@@ -244,6 +247,40 @@ public class HttpManager : Regist
         ReplayVersion = ConfigManager.GetIntFormConfig(PlayerConfigLabel.ReplayVersion);
     }
 
+    public override void RegistReference()
+    {
+        WifiButton = ResourceManager.Get<Button>(ObjectLabel.C_WifiButton);
+
+        WifiButton.onClick.AddListener(OnWifiButtonClick);
+
+        OnConnect += onConnect;
+        OnConnectionLost += onConnectionLost;
+
+        if (IsConnect)
+        {
+            OnConnect.SafeInvoke();
+        }
+        else
+        {
+            OnConnectionLost.SafeInvoke();
+        }
+    }
+
+
+    private static void OnWifiButtonClick()
+    {
+        string content = Language.GetStr(LanguageLabel.UI__C_Wifi);
+        if (IsConnect)
+        {
+            content = content.Replace(TransferLabel.Value, Language.GetStr(LanguageLabel.UI__C_WifiOn));
+        }
+        else
+        {
+            content = content.Replace(TransferLabel.Value, Language.GetStr(LanguageLabel.UI__C_WifiOff));
+        }
+        Bubble.Show(null, content);
+    }
+
 
     public static void SetNickName(string nickname, Action succeedCallback, Action<string> failCallback)
     {
@@ -939,13 +976,25 @@ public class HttpManager : Regist
 
                 StaticsManager.GetInstance().ActOrReg(ID, DataEyeGA.AccountType.Official);
             }
+            OnConnect.SafeInvoke();
         }
         else
         {
             IsConnect = false;
+            OnConnectionLost.SafeInvoke();
         }
     }
 
+    private static void onConnect()
+    {
+        WifiButton.image.sprite = Lib.WifiOn;
+    }
+
+    private static void onConnectionLost()
+    {
+        WifiButton.image.sprite = Lib.WifiOff;
+    }
+
 
     public static void UploadConfig()
     {

+ 2 - 2
Assets/Script/SFS/Manager/BaseConnector.cs

@@ -9,8 +9,8 @@ public abstract class BaseConnector
     public GardenSmartFox GardenSmartFox;
 
     public static int TcpPort = 9933;
-    //public static string Host = "121.199.20.79";
-    public static string Host = "127.0.0.1";
+    public static string Host = "121.199.20.79";
+    //public static string Host = "127.0.0.1";
     public static string Zone = "Garden";
     //public static string Zone = "GardenTest";
 

+ 1 - 1
Assets/Script/Tool/LabelUtility/SerializeObject.prefab

@@ -51,7 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4a9dafa00b004e4e94c57cd88b01101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
+  Script: {fileID: 11500000, guid: 3420c8d0e7f483a46942a0adcfbee477, type: 3}
   Languages:
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   Prefabs:

+ 10 - 0
Assets/Script/Tool/Lib.cs

@@ -30,6 +30,16 @@ public class Lib
     public static Color PrivateMessageSelfGreen = new Color(122/255f, 188/255f, 89/255f, 1);
     public static Color PrivateMessageOtherBlack = new Color(0/255f, 0/255f, 0/255f, 180/255f);
 
+
+    public static Sprite WifiOn
+    {
+        get { return ResourceManager.LoadSprite(ResourceLabel.WifiOn, Folder.UI); }
+    }
+    public static Sprite WifiOff
+    {
+        get { return ResourceManager.LoadSprite(ResourceLabel.WifiOff, Folder.UI); }
+    }
+
     public static Sprite PackSprite
     {
         get { return ResourceManager.LoadSprite(ResourceLabel.Pack, Folder.UI); }

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []