Browse Source

增加审核版本

LiuQilin 7 years ago
parent
commit
1f2b974f7e
35 changed files with 1246 additions and 145 deletions
  1. 4 2
      Assets/Resource/Logo.unity
  2. 144 14
      Assets/Resource/Prefab/Object/PlazaRoom.prefab
  3. 471 59
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  4. BIN
      Assets/Resource/Sprite/Editor/Logo/Loading_new.png
  5. 68 0
      Assets/Resource/Sprite/Editor/Logo/Loading_new.png.meta
  6. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/互动1.png
  7. 92 0
      Assets/Resource/Sprite/Editor/PlazaRoom/互动1.png.meta
  8. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/心.png
  9. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/心.png.meta
  10. 1 1
      Assets/Resource/Sprite/Editor/PlazaRoom/景色.png.meta
  11. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/景色1.png
  12. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/景色1.png.meta
  13. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标1.png
  14. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标1.png.meta
  15. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标2.png
  16. 68 0
      Assets/Resource/Sprite/Editor/PlazaRoom/派对图标2.png.meta
  17. 4 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  18. 4 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  19. 4 0
      Assets/Resource/XML/lan/English.xml
  20. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  21. 4 0
      Assets/Script/Label/LanguageLabel.cs
  22. 9 2
      Assets/Script/Label/ObjectLabel.cs
  23. 6 18
      Assets/Script/Manage/Initializer.cs
  24. 8 0
      Assets/Script/Manage/LanguageManager.cs
  25. 13 0
      Assets/Script/Manage/SocialManager.cs
  26. 25 0
      Assets/Script/Manage/TutorialManager.cs
  27. 28 1
      Assets/Script/Manage/UIManager.cs
  28. 3 0
      Assets/Script/Manage/VisitManager.cs
  29. 20 0
      Assets/Script/Object/PlazaRoom.cs
  30. 13 0
      Assets/Script/Social/FriendPanel.cs
  31. 2 1
      Assets/Script/Social/MessagePanel.cs
  32. 43 43
      Assets/Script/Tool/Auxiliary.cs
  33. 4 0
      Assets/Script/Tool/DashGame/Language.cs
  34. 1 1
      Assets/Script/Tool/LabelUtility/SerializeObject.prefab
  35. 3 3
      ProjectSettings/ProjectSettings.asset

+ 4 - 2
Assets/Resource/Logo.unity

@@ -612,9 +612,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
+  AuditEdition: 1
+  DebugMode: 1
   CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 144 - 14
Assets/Resource/Prefab/Object/PlazaRoom.prefab

@@ -27,6 +27,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1017925263876080
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4721632901486498}
+  - component: {fileID: 212076321982951526}
+  m_Layer: 0
+  m_Name: HeartSprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1027038479094960
 GameObject:
   m_ObjectHideFlags: 0
@@ -196,6 +212,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1669742286274570
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4222605511076138}
+  - component: {fileID: 212088169643526310}
+  m_Layer: 0
+  m_Name: WelcomeSprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1761662476474740
 GameObject:
   m_ObjectHideFlags: 0
@@ -301,7 +333,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 13
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4053414627786464
 Transform:
@@ -314,7 +346,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 12
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4079838987492840
 Transform:
@@ -340,7 +372,20 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 7
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4222605511076138
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1669742286274570}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.7149998, y: 1.0463158, z: -1.5001001}
+  m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4518027564363394}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4281131997099946
 Transform:
@@ -353,7 +398,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 14
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4354325187465410
 Transform:
@@ -366,7 +411,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 15
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4421693630246596
 Transform:
@@ -379,7 +424,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1.0291699, z: 1.0291699}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 23.03, y: 0, z: 0}
 --- !u!4 &4462477909408554
 Transform:
@@ -392,7 +437,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1.0291653, z: 1.0291654}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 23.03, y: 0, z: 0}
 --- !u!4 &4493473737233732
 Transform:
@@ -405,7 +450,7 @@ Transform:
   m_LocalScale: {x: 1.0671971, y: 1.0671971, z: 1.0671971}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4518027564363394
 Transform:
@@ -422,6 +467,8 @@ Transform:
   - {fileID: 4580777751436770}
   - {fileID: 4954093523543500}
   - {fileID: 4079838987492840}
+  - {fileID: 4721632901486498}
+  - {fileID: 4222605511076138}
   - {fileID: 4493473737233732}
   - {fileID: 4462477909408554}
   - {fileID: 4085176534001040}
@@ -461,7 +508,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 16
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4653417872032544
 Transform:
@@ -474,7 +521,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 9
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4693788232285786
 Transform:
@@ -487,7 +534,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 11
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4694254291975466
 Transform:
@@ -502,6 +549,19 @@ Transform:
   m_Father: {fileID: 4518027564363394}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -8.803, y: -90.00001, z: 180.00002}
+--- !u!4 &4721632901486498
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1017925263876080}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.715, y: 0.72, z: -1.5001}
+  m_LocalScale: {x: 1.0526316, y: 1.0526316, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4518027564363394}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4800422243721380
 Transform:
   m_ObjectHideFlags: 1
@@ -513,7 +573,7 @@ Transform:
   m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
-  m_RootOrder: 10
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4939484549403038
 Transform:
@@ -620,7 +680,7 @@ ParticleSystem:
   moveWithTransform: 1
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 2
-  randomSeed: 1635810750
+  randomSeed: -417915898
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -3067,7 +3127,77 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 28ce300e5704b0241bf46625f341c01a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0490cde3ffc2ce742af26ece01b74459, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &212076321982951526
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1017925263876080}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 49645f4f5e3e2bd4288d5e0dd8caf488, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!212 &212088169643526310
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1669742286274570}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: e860ee60864a9df43b6b67c43ee25d6b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

File diff suppressed because it is too large
+ 471 - 59
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


BIN
Assets/Resource/Sprite/Editor/Logo/Loading_new.png


+ 68 - 0
Assets/Resource/Sprite/Editor/Logo/Loading_new.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 290516813847c3f4488ac406c25c940b
+timeCreated: 1511943993
+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/PlazaRoom/互动1.png


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/互动1.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 0490cde3ffc2ce742af26ece01b74459
+timeCreated: 1511918779
+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
+  - 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: PlazaRoom
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/心.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/心.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 49645f4f5e3e2bd4288d5e0dd8caf488
+timeCreated: 1511918669
+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: 

+ 1 - 1
Assets/Resource/Sprite/Editor/PlazaRoom/景色.png.meta

@@ -86,7 +86,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: PlazaRoom
+  spritePackingTag: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/景色1.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/景色1.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: e860ee60864a9df43b6b67c43ee25d6b
+timeCreated: 1511918779
+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/PlazaRoom/派对图标1.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/派对图标1.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 4107553466602e340bae99b3b3e1e4e8
+timeCreated: 1511918669
+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/PlazaRoom/派对图标2.png


+ 68 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/派对图标2.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 0dc17a7bcc492264da3b1e9918469617
+timeCreated: 1511918669
+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: 

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

@@ -142,6 +142,7 @@
     <Q_CommentFail desc=""><![CDATA[留言失败]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[公告]]></R_Tit>
     <N_Lab desc=""><![CDATA[去试衣间看看吧!]]></N_Lab>
+    <N_FormerPlayerButtonText desc=""><![CDATA[我是老玩家]]></N_FormerPlayerButtonText>
     <I_Lab desc=""><![CDATA[加载中]]></I_Lab>
     <S_Tit desc=""><![CDATA[点赞榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[请输入你的昵称]]></T_Tit>
@@ -149,6 +150,9 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>
+    <U_Lab desc=""><![CDATA[加载中…]]></U_Lab>
+    <U_WarningTitle desc=""><![CDATA[健康游戏忠告]]></U_WarningTitle>
+    <U_WarningText desc=""><![CDATA[健康游戏忠告  抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中宝箱总价值的个位数即可领奖,3次机会]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花的颜色即可领奖,答案不带“色”字,3次机会]]></Y_GuessColorDesc>

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

@@ -142,6 +142,7 @@
     <Q_CommentFail desc=""><![CDATA[留言失敗]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[公告]]></R_Tit>
     <N_Lab desc=""><![CDATA[去試衣間看看吧!]]></N_Lab>
+    <N_FormerPlayerButtonText desc=""><![CDATA[]]></N_FormerPlayerButtonText>
     <I_Lab desc=""><![CDATA[加載中]]></I_Lab>
     <S_Tit desc=""><![CDATA[點贊榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[請輸入你的昵稱]]></T_Tit>
@@ -149,6 +150,9 @@
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>
+    <U_Lab desc=""><![CDATA[加載中…]]></U_Lab>
+    <U_WarningTitle desc=""><![CDATA[我的甜蜜花園]]></U_WarningTitle>
+    <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
     <X_Self desc=""><![CDATA[[我]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[猜中寶箱總價值的個位數即可領獎,3次機會]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎,答案不帶“色”字,3次機會]]></Y_GuessColorDesc>

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

@@ -142,6 +142,7 @@ Program 水怪
     <Q_CommentFail desc=""><![CDATA[Failed]]></Q_CommentFail>
     <R_Tit desc=""><![CDATA[Announce]]></R_Tit>
     <N_Lab desc=""><![CDATA[Go to your dress room!]]></N_Lab>
+    <N_FormerPlayerButtonText desc=""><![CDATA[]]></N_FormerPlayerButtonText>
     <I_Lab desc=""><![CDATA[Loading]]></I_Lab>
     <S_Tit desc=""><![CDATA[Like Ranking]]></S_Tit>
     <T_Tit desc=""><![CDATA[Enter your nickname]]></T_Tit>
@@ -149,6 +150,9 @@ Program 水怪
     <T_AllWhiteSpace desc=""><![CDATA[Nickname can not be null]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[Checking]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>
+    <U_Lab desc=""><![CDATA[Loading…]]></U_Lab>
+    <U_WarningTitle desc=""><![CDATA[My Lovely Garden]]></U_WarningTitle>
+    <U_WarningText desc=""><![CDATA[[%value%]]]></U_WarningText>
     <X_Self desc=""><![CDATA[[ME]]]></X_Self>
     <Y_GuessNumberDesc desc=""><![CDATA[Hit the last digit of total value of the chest. 3 chances]]></Y_GuessNumberDesc>
     <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case. 3 chances]]></Y_GuessColorDesc>

BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -140,6 +140,7 @@ public class LanguageLabel
 	public static string UI__Q_CommentFail = "UI__Q_CommentFail";
 	public static string UI__R_Tit = "UI__R_Tit";
 	public static string UI__N_Lab = "UI__N_Lab";
+	public static string UI__N_FormerPlayerButtonText = "UI__N_FormerPlayerButtonText";
 	public static string UI__I_Lab = "UI__I_Lab";
 	public static string UI__S_Tit = "UI__S_Tit";
 	public static string UI__T_Tit = "UI__T_Tit";
@@ -147,6 +148,9 @@ public class LanguageLabel
 	public static string UI__T_AllWhiteSpace = "UI__T_AllWhiteSpace";
 	public static string UI__T_Checking = "UI__T_Checking";
 	public static string UI__T_RepeatName = "UI__T_RepeatName";
+	public static string UI__U_Lab = "UI__U_Lab";
+	public static string UI__U_WarningTitle = "UI__U_WarningTitle";
+	public static string UI__U_WarningText = "UI__U_WarningText";
 	public static string UI__X_Self = "UI__X_Self";
 	public static string UI__Y_GuessNumberDesc = "UI__Y_GuessNumberDesc";
 	public static string UI__Y_GuessColorDesc = "UI__Y_GuessColorDesc";

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

@@ -62,7 +62,9 @@ public class ObjectLabel
 	public static string C_Comment = "C_Comment";
 	public static string C_Praise = "C_Praise";
 	public static string C_PraiseText = "C_PraiseText";
+	public static string C_NotifyParent = "C_NotifyParent";
 	public static string C_Notify = "C_Notify";
+	public static string C_FriendButtonParent = "C_FriendButtonParent";
 	public static string C_FriendButton = "C_FriendButton";
 	public static string C_RankRarent = "C_RankRarent";
 	public static string C_Rank = "C_Rank";
@@ -71,6 +73,8 @@ public class ObjectLabel
 	public static string C_EnterPlazaRoom0 = "C_EnterPlazaRoom0";
 	public static string C_EnterPlazaRoom = "C_EnterPlazaRoom";
 	public static string C_PlazaRoomArrow0 = "C_PlazaRoomArrow0";
+	public static string C_HeartIcon = "C_HeartIcon";
+	public static string C_WelcomeIcon = "C_WelcomeIcon";
 	public static string C_Return = "C_Return";
 	public static string C_ReturnArrow0 = "C_ReturnArrow0";
 	public static string C_Visit = "C_Visit";
@@ -122,12 +126,13 @@ public class ObjectLabel
 	public static string L_Confirm = "L_Confirm";
 	public static string L_ConfirmLab = "L_ConfirmLab";
 	public static string L_Language = "L_Language";
-	public static string L_TraChi = "L_TraChi";
-	public static string L_TraChiLab = "L_TraChiLab";
+	public static string L_LanguageButtonLayout = "L_LanguageButtonLayout";
 	public static string L_English = "L_English";
 	public static string L_EnglishLab = "L_EnglishLab";
 	public static string L_SimChi = "L_SimChi";
 	public static string L_SimChiLab = "L_SimChiLab";
+	public static string L_TraChi = "L_TraChi";
+	public static string L_TraChiLab = "L_TraChiLab";
 	public static string L_LanguageTit = "L_LanguageTit";
 	public static string L_Support = "L_Support";
 	public static string L_SupportTit = "L_SupportTit";
@@ -838,6 +843,8 @@ public class ObjectLabel
 	public static string N_Button = "N_Button";
 	public static string N_Confirm = "N_Confirm";
 	public static string N_ConfirmLab = "N_ConfirmLab";
+	public static string N_FormerPlayerButton = "N_FormerPlayerButton";
+	public static string N_FormerPlayerButtonText = "N_FormerPlayerButtonText";
 	public static string K_Bubble = "K_Bubble";
 	public static string K_Bubble0 = "K_Bubble0";
 	public static string K_VGroup = "K_VGroup";

+ 6 - 18
Assets/Script/Manage/Initializer.cs

@@ -20,6 +20,7 @@ public class Initializer : MonoBehaviour
 {
     #region Config
 
+    public bool AuditEdition;
     public bool DebugMode;
     public bool CatchException;
     public GameObject DebugModeGo;
@@ -385,37 +386,24 @@ public class Initializer : MonoBehaviour
         ResourceManager.Get(ObjectLabel.U_Group).TweenForCG();
         ResourceManager.Get<CanvasGroup>(ObjectLabel.C_Main).alpha = 0;
 
-        if (Application.systemLanguage == SystemLanguage.ChineseSimplified)
-        {
-            ResourceManager.SetText(ObjectLabel.U_Lab, "加载中...");
-        }
-        else if (Application.systemLanguage == SystemLanguage.ChineseTraditional)
-        {
-            ResourceManager.SetText(ObjectLabel.U_Lab, "加載中...");
-        }
-        else
-        {
-            ResourceManager.SetText(ObjectLabel.U_Lab, "Loading...");
-        }
+        ResourceManager.SetText(ObjectLabel.U_Lab, Language.GetStr(LanguageLabel.UI__U_Lab));
 
         Auxiliary.Instance.DelayCall(ActivateGame, LoadingDelayTime);
     }
 
     public static void SetWarningTitleAndText()
     {
-        if (Application.systemLanguage == SystemLanguage.ChineseSimplified)
+        ResourceManager.SetText(ObjectLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle));
+        if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
         {
-            ResourceManager.SetText(ObjectLabel.U_WarningTitle, "健康游戏忠告");
-            ResourceManager.SetText(ObjectLabel.U_WarningText, "健康游戏忠告  抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。");
+            ResourceManager.SetText(ObjectLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText));
         }
-        else if (Application.systemLanguage == SystemLanguage.ChineseTraditional)
+        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
         {
-            ResourceManager.SetText(ObjectLabel.U_WarningTitle, "我的甜蜜花園");
             ResourceManager.SetActive(ObjectLabel.U_WarningText, false);
         }
         else
         {
-            ResourceManager.SetText(ObjectLabel.U_WarningTitle, "My Lovely Garden");
             ResourceManager.SetActive(ObjectLabel.U_WarningText, false);
         }
     }

+ 8 - 0
Assets/Script/Manage/LanguageManager.cs

@@ -37,6 +37,8 @@ public class LanguageManager : Regist
 {
     #region Config
 
+    public static Action<CurrentLanguage, CurrentLanguage> OnLanguageChange;
+
     public static CurrentLanguage CurrentLanguage;
 
     public static Dictionary<Text, object[]> TextDictionary = new Dictionary<Text, object[]>();
@@ -80,6 +82,7 @@ public class LanguageManager : Regist
 
     public static void SwitchLanguage(CurrentLanguage currentLanguage)
     {
+        CurrentLanguage fromLanguage = CurrentLanguage;
         CurrentLanguage = currentLanguage;
 
         Language.SwitchLanguage(currentLanguage);
@@ -113,6 +116,11 @@ public class LanguageManager : Regist
         {
             Manager.SkillList[i].SwitchLanguage();
         }
+
+        if (OnLanguageChange != null)
+        {
+            OnLanguageChange.Invoke(fromLanguage, currentLanguage);
+        }
     }
 
 

+ 13 - 0
Assets/Script/Manage/SocialManager.cs

@@ -100,6 +100,8 @@ public class SocialManager : Regist
         CommentScrollRect.onValueChanged.AddListener(OnScroll);
 
         FriendPanel.OnFriendListRefresh += OnFriendListRefresh;
+        VisitManager.OnEnterVisteeGarden += OnEnterVisiteeGarden;
+        VisitManager.OnExitVisteeGarden += OnExitVisiteeGarden;
     }
 
 
@@ -684,4 +686,15 @@ public class SocialManager : Regist
             EnableCommentFriendFilter();
         }
     }
+
+
+    public static void OnEnterVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_NotifyParent, false);
+    }
+
+    public static void OnExitVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
+    }
 }

+ 25 - 0
Assets/Script/Manage/TutorialManager.cs

@@ -304,6 +304,31 @@ public class TutorialManager : Regist
 
         ResourceManager.SetActive(ObjectLabel.N_Tutorial, true);
         ResourceManager.SetActive(ObjectLabel.N_Confirm, true);
+        ResourceManager.SetActive(ObjectLabel.N_FormerPlayerButton, true);
+
+        ResourceManager.AddButtonEvent
+        (
+            ObjectLabel.N_FormerPlayerButton,
+            () =>
+            {
+                AudioManager.PlayClip(AudioLabel.ClickButton);
+                //ResourceManager.Get(ObjectLabel.L_Setting).TweenForCG();
+                ResourceManager.Get(ObjectLabel.La_Info).TweenForCG();
+
+                ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenBacCG();
+
+                ResourceManager.AddButtonEventOnetime
+                (
+                    ObjectLabel.La_Cancel,
+                    () =>
+                    {
+                        ResourceManager.Get(ObjectLabel.N_Confirm).TweenForCG();
+                        ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenForCG();
+                    }
+                );
+            }
+        );
 
         ResourceManager.AddButtonEventOnetime
         (

+ 28 - 1
Assets/Script/Manage/UIManager.cs

@@ -548,6 +548,9 @@ public class UIManager : Regist
 
         #region C_EnterPlazaRoom
 
+        LanguageManager.OnLanguageChange += OnLanguageChange;
+        OnLanguageChange(CurrentLanguage.Default, LanguageManager.CurrentLanguage);
+
         ResourceManager.SetButtonEvent
         (
             ObjectLabel.C_EnterPlazaRoom,
@@ -2136,6 +2139,12 @@ public class UIManager : Regist
 
         #endregion
 
+        if (Initializer.Instance.AuditEdition)
+        {
+            ResourceManager.SetActive(ObjectLabel.L_TraChi, false);
+            ResourceManager.SetActive(ObjectLabel.L_English, false);
+        }
+
 
         #region La_Info
 
@@ -2295,12 +2304,15 @@ public class UIManager : Regist
         #region N
 
         LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.N_Lab), new MulLanStr(LanguageLabel.UI__N_Lab));
-
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.N_ConfirmLab), new MulLanStr(LanguageLabel.Common__Confirm));
+        LanguageManager.Add(ResourceManager.Get<Text>(ObjectLabel.N_FormerPlayerButtonText), new MulLanStr(LanguageLabel.UI__N_FormerPlayerButtonText));
+        
         ResourceManager.Get(ObjectLabel.N_Mask).CreateTweenGra(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(ObjectLabel.N_LabBK).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(ObjectLabel.N_Arrow).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(ObjectLabel.N_Tutorial).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ResourceManager.Get(ObjectLabel.N_Confirm).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -3571,4 +3583,19 @@ public class UIManager : Regist
         ResourceManager.Get(ObjectLabel.T_NickName).TweenForCG();
         ResourceManager.Get(ObjectLabel.R_Notify0).TweenForCG();
     }
+
+
+    private static void OnLanguageChange(CurrentLanguage fromLanguage, CurrentLanguage toLanguage)
+    {
+        if (toLanguage == CurrentLanguage.ChineseSimplified)
+        {
+            ResourceManager.SetActive(ObjectLabel.C_WelcomeIcon, false);
+            ResourceManager.SetActive(ObjectLabel.C_HeartIcon, true);
+        }
+        else
+        {
+            ResourceManager.SetActive(ObjectLabel.C_WelcomeIcon, true);
+            ResourceManager.SetActive(ObjectLabel.C_HeartIcon, false);
+        }
+    }
 }

+ 3 - 0
Assets/Script/Manage/VisitManager.cs

@@ -62,6 +62,7 @@ public class VisitManager : Regist
 
     public static int MaxTipAmt = 10;
     public static Action OnExitVisteeGarden;
+    public static Action OnEnterVisteeGarden;
 
     public static int MaxStachConfigAmt = 8;
     public static float PullArchiveTime = 0.5f;
@@ -211,6 +212,8 @@ public class VisitManager : Regist
         SetVisiteeCommentPanel();
 
         EnterVisiteeGarden();
+
+        OnEnterVisteeGarden.SafeInvoke();
     }
 
     public static void ExitVisiteeGarden()

+ 20 - 0
Assets/Script/Object/PlazaRoom.cs

@@ -18,6 +18,8 @@ public class PlazaRoomLabel
     public static string PlazaRoomCameraRightBorder = "PlazaRoomCameraRightBorder";
     public static string PlazaRoomChestPos = "PlazaRoomChestPos";
     public static string PlazaRoom = "PlazaRoom";
+    public static string HeartSprite = "HeartSprite";
+    public static string WelcomeSprite = "WelcomeSprite";
     public static string PhonoGraph = "PhonoGraph";
     public static string PlazaRoomCloud1 = "PlazaRoomCloud1";
     public static string PlazaRoomCloud2 = "PlazaRoomCloud2";
@@ -145,6 +147,9 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
         uac.transform.parent = ResourceManager.Get(PlazaRoomLabel.PhonoGraph);
         uac.anim.Play(PhonoGraphAnimName);
         uac.transform.localPosition = new Vector3();
+
+        LanguageManager.OnLanguageChange += OnLanguageChange;
+        OnLanguageChange(CurrentLanguage.Default, LanguageManager.CurrentLanguage);
     }
 
 
@@ -201,6 +206,21 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
     }
 
 
+    private static void OnLanguageChange(CurrentLanguage fromLanguage, CurrentLanguage toLanguage)
+    {
+        if (toLanguage == CurrentLanguage.ChineseSimplified)
+        {
+            ResourceManager.SetActive(PlazaRoomLabel.WelcomeSprite, false);
+            ResourceManager.SetActive(PlazaRoomLabel.HeartSprite, true);
+        }
+        else
+        {
+            ResourceManager.SetActive(PlazaRoomLabel.WelcomeSprite, true);
+            ResourceManager.SetActive(PlazaRoomLabel.HeartSprite, false);
+        }
+    }
+
+
     public void OnPointerClick(PointerEventData eventData)
     {
         SFSManager.GardenSmartFox.PlazaRoomController.MoveTo(HitPositionToDestination(eventData.pointerCurrentRaycast.worldPosition));

+ 13 - 0
Assets/Script/Social/FriendPanel.cs

@@ -134,6 +134,8 @@ public class FriendPanel : Regist
         };
 
         MessagePanel.OnHaveNewMessage += SortFriendItems;
+        VisitManager.OnEnterVisteeGarden += OnEnterVisiteeGarden;
+        VisitManager.OnExitVisteeGarden += OnExitVisiteeGarden;
     }
 
 
@@ -530,4 +532,15 @@ public class FriendPanel : Regist
             }
         }
     }
+
+
+    public static void OnEnterVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_FriendButtonParent, false);
+    }
+
+    public static void OnExitVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_FriendButtonParent, true);
+    }
 }

+ 2 - 1
Assets/Script/Social/MessagePanel.cs

@@ -210,10 +210,11 @@ public class MessagePanel : Regist
         {
             RefreshScrollRect();
             FriendPanel.SaveLastPrivateMessageDate(targetSerialNumber, datas[0].Date);
-            OnHaveNewMessage.Invoke(targetSerialNumber);
+            OnDontHaveNewMessage.Invoke(targetSerialNumber);
         }
         else if (FriendPanel.IsPrivateMessageNew(targetSerialNumber, datas[0].Date))
         {
+            //Debug.Log(targetSerialNumber);
             OnHaveNewMessage.Invoke(targetSerialNumber);
         }
     }

+ 43 - 43
Assets/Script/Tool/Auxiliary.cs

@@ -136,58 +136,58 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        if (Input.GetKeyDown(KeyCode.Escape))
-        {
-            SFSManager.GardenSmartFox.SmartFox.Disconnect();
-            RobotManager.DeactivateAllRobots(false);
-        }
+        //if (Input.GetKeyDown(KeyCode.Escape))
+        //{
+        //    SFSManager.GardenSmartFox.SmartFox.Disconnect();
+        //    RobotManager.DeactivateAllRobots(false);
+        //}
 
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-            //DebugManager.ResetGardenLevel(7);
-            //DebugManager.ResetVisitTutorial();
-            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+        //    //DebugManager.ResetGardenLevel(7);
+        //    //DebugManager.ResetVisitTutorial();
+        //    //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        //}
 
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            DebugManager.ResetGardenLevel(30);
-        }
+        //if (Input.GetKeyDown(KeyCode.A))
+        //{
+        //    DebugManager.ResetGardenLevel(30);
+        //}
 
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            Manager.Coin = 0;
-            Manager.Diamond = 0;
-        }
+        //if (Input.GetKeyDown(KeyCode.S))
+        //{
+        //    Manager.Coin = 0;
+        //    Manager.Diamond = 0;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.D))
-        {
-            Manager.Coin = 100000;
-            Manager.Diamond = 1000;
-        }
+        //if (Input.GetKeyDown(KeyCode.D))
+        //{
+        //    Manager.Coin = 100000;
+        //    Manager.Diamond = 1000;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.Z))
-        {
-            Manager.MinigameCDTimer = 0;
-        }
+        //if (Input.GetKeyDown(KeyCode.Z))
+        //{
+        //    Manager.MinigameCDTimer = 0;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            MiniGameManager.GameTimer = 45;
-        }
+        //if (Input.GetKeyDown(KeyCode.X))
+        //{
+        //    MiniGameManager.GameTimer = 45;
+        //}
 
-        if (Input.GetKeyDown(KeyCode.C))
-        {
-            DebugManager.ResetAbilityAnim();
-        }
+        //if (Input.GetKeyDown(KeyCode.C))
+        //{
+        //    DebugManager.ResetAbilityAnim();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.V))
-        {
-            AccountData accountData = new AccountData("测试名字", "1710065808151506837", DateTime.Now.ToString());
-            MessagePanel.OpenPanel(accountData);
-        }
+        //if (Input.GetKeyDown(KeyCode.V))
+        //{
+        //    AccountData accountData = new AccountData("测试名字", "1710065808151506837", DateTime.Now.ToString());
+        //    MessagePanel.OpenPanel(accountData);
+        //}
 
         //if (Input.GetKeyDown(KeyCode.B))
         //{

+ 4 - 0
Assets/Script/Tool/DashGame/Language.cs

@@ -32,6 +32,10 @@ public class Language
     public static void Initialize()
     {
         LanguageManager.CurrentLanguage = ConfigManager.GetStringFormConfig("Language").ToEnum<CurrentLanguage>();
+        if (Initializer.Instance.AuditEdition)
+        {
+            LanguageManager.CurrentLanguage = CurrentLanguage.ChineseSimplified;
+        }
 
         LanguageDic.Add(CurrentLanguage.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
         LanguageDic.Add(CurrentLanguage.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));

+ 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: 3420c8d0e7f483a46942a0adcfbee477, type: 3}
+  Script: {fileID: 11500000, guid: 1615e3353e063d443bf237fb8aade024, type: 3}
   Languages:
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   Prefabs:

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.2.1
+  bundleVersion: 1.2.2
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 13
+  AndroidBundleVersionCode: 14
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 7
+  iPhoneBuildNumber: 8
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

Some files were not shown because too many files changed in this diff