Browse Source

Drawcall优化

LiuQilin 7 years ago
parent
commit
76a6839089

+ 212 - 2
Assets/Resource/Logo.unity

@@ -155,6 +155,115 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &1012376070
+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: 3
+      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_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &1012376071 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 1012376070}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,8 +554,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0
@@ -460,3 +570,103 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2064559711
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1012376071}
+    m_Modifications:
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224814127152008004, guid: 718ebdaed223e93409d6dc7e53a23167,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
+  m_IsPrefabParent: 0

+ 6 - 6
Assets/Resource/Prefab/Object/PlazaRoom.prefab

@@ -358,8 +358,8 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1007757289043942}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.000000678, y: 0, z: -1}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: 0.000000678, y: 0.37, z: -1}
+  m_LocalScale: {x: 1.0671971, y: 1.0671971, z: 1.0671971}
   m_Children: []
   m_Father: {fileID: 4518027564363394}
   m_RootOrder: 5
@@ -562,7 +562,7 @@ ParticleSystem:
   moveWithTransform: 1
   moveWithCustomTransform: {fileID: 0}
   scalingMode: 2
-  randomSeed: -1196264515
+  randomSeed: 706810313
   InitialModule:
     serializedVersion: 3
     enabled: 1
@@ -3044,7 +3044,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 3cd70d2a4fafd2f47a35f83ce625f056, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -3114,7 +3114,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 3cd70d2a4fafd2f47a35f83ce625f056, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -3149,7 +3149,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 3cd70d2a4fafd2f47a35f83ce625f056, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 37 - 3
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -665,6 +665,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1280494566740514
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224231607117232022}
+  m_Layer: 5
+  m_Name: P_ShareParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1282211617929058
 GameObject:
   m_ObjectHideFlags: 1
@@ -8574,7 +8589,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224523201006200968}
+  - {fileID: 224231607117232022}
   - {fileID: 224316464020746548}
   - {fileID: 224549163792536180}
   m_Father: {fileID: 224814127152008004}
@@ -9112,6 +9127,25 @@ RectTransform:
   m_AnchoredPosition: {x: 269.93332, y: -450.00006}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.49999997, y: 0.00000020489097}
+--- !u!224 &224231607117232022
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1280494566740514}
+  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: 224523201006200968}
+  m_Father: {fileID: 224042092064329274}
+  m_RootOrder: 0
+  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: 125.000046, y: -140}
+  m_SizeDelta: {x: 206, y: 170}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224236864913912718
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10127,12 +10161,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224042092064329274}
+  m_Father: {fileID: 224231607117232022}
   m_RootOrder: 0
   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: 125, y: -140}
+  m_AnchoredPosition: {x: -0.000045776367, y: 0.000015258789}
   m_SizeDelta: {x: 205, y: 170}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224525130383599340

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/云朵.PNG


+ 92 - 0
Assets/Resource/Sprite/Editor/PlazaRoom/云朵.PNG.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3cd70d2a4fafd2f47a35f83ce625f056
+timeCreated: 1508739264
+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: 

+ 25 - 1
Assets/Resource/Sprite/Editor/PlazaRoom/天.png.meta

@@ -58,11 +58,35 @@ 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
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: PlazaRoom
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 25 - 1
Assets/Resource/Sprite/Editor/PlazaRoom/星星闪烁.png.meta

@@ -58,11 +58,35 @@ 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
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: PlazaRoom
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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

@@ -58,11 +58,35 @@ 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
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: PlazaRoom
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 3 - 3
Assets/Script/Manage/ManaCenter.cs

@@ -569,7 +569,7 @@ public class ManaCenter : Regist
             ManaReso.Get("C_IncomeLab").TweenReForVec();
             ManaReso.SetText("C_IncomeLab", "+" + Auxiliary.ShrinkNumberStr(temp, 0));
 
-            ManaDebug.Log(string.Format("参观收益<color=red>{0:0.0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
+            //ManaDebug.Log(string.Format("参观收益<color=red>{0:0.0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
         }
     }
 
@@ -733,7 +733,7 @@ public class ManaCenter : Regist
 
             MiniTimer -= Elapse;
 
-            ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
+            //ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", Elapse));
 
             if (Elapse <= 120)
             {
@@ -766,7 +766,7 @@ public class ManaCenter : Regist
                 TempUseList.Add(new List<Skill>());
             }
 
-            ManaDebug.Log(string.Format("离线周期<color=red>{0}</color>", circle));
+            //ManaDebug.Log(string.Format("离线周期<color=red>{0}</color>", circle));
         }
 
 

+ 4 - 4
Assets/Script/Manage/ManaData.cs

@@ -60,7 +60,7 @@ public class ManaData : Regist
                     catch (Exception)
                     {
                         Debug.LogWarning("Download Archive : MD5 doesn't match");
-                        ManaDebug.Log("Download Archive");
+                        //ManaDebug.Log("Download Archive");
 
                         DamageLock = true;
                         DownloadLock = false;
@@ -109,7 +109,7 @@ public class ManaData : Regist
                             if (PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
                             {
                                 Debug.LogWarning("Download Archive : MD5 doesn't match");
-                                ManaDebug.Log("Download Archive");
+                                //ManaDebug.Log("Download Archive");
 
                                 DamageLock = true;
                                 DownloadLock = false;
@@ -136,7 +136,7 @@ public class ManaData : Regist
                             if (PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
                             {
                                 Debug.LogWarning("Download Archive : MD5 doesn't match");
-                                ManaDebug.Log("Download Archive");
+                                //ManaDebug.Log("Download Archive");
 
                                 DamageLock = true;
                                 DownloadLock = false;
@@ -155,7 +155,7 @@ public class ManaData : Regist
                     DefaultDoc.LoadXml(textAsset.text);
 
                     Debug.LogWarning("Download Archive");
-                    ManaDebug.Log("Download Archive");
+                    //ManaDebug.Log("Download Archive");
 
                     DamageLock = true;
                     DownloadLock = false;

+ 3 - 3
Assets/Script/Manage/ManaIAP.cs

@@ -306,15 +306,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         IStoreController = controller;
         IExtensionProvider = extensions;
 
-        ManaDebug.Log("初始化IAP成功");
+        //ManaDebug.Log("初始化IAP成功");
     }
 
     public void OnInitializeFailed(InitializationFailureReason error)
     {
         Complete = false;
 
-        Debug.Log("初始化IAP失败");
-        ManaDebug.Log("初始化IAP失败");
+        //Debug.Log("初始化IAP失败");
+        //ManaDebug.Log("初始化IAP失败");
     }
 
     public void OnPurchaseFailed(Product i, PurchaseFailureReason p)

+ 16 - 4
Assets/Script/Manage/ManaServer.cs

@@ -133,11 +133,18 @@ public class ManaServer : Regist
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "D8G4W5");
+        //urlData.Add("u", "vn9q1k");
 
         //URLRequest.CreateStrURLRequest(BaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
 
 
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", "1709207727231988804 ");
+
+        URLRequest.CreateStrURLRequest(NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+
+
         //URLRequestData urlData = new URLRequestData();
 
         //urlData.Add("u", "1706142186026389627");
@@ -543,6 +550,11 @@ public class ManaServer : Regist
             return;
         }
 
+        if (id.ToLower() == "default")
+        {
+            return;
+        }
+
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", id);
@@ -965,13 +977,13 @@ public class ManaServer : Regist
                 StaticsManager.GetInstance().ActOrReg(ID, DataEyeGA.AccountType.Official);
             }
 
-            ManaDebug.Log("<color=red>连接成功</color>");
+            //ManaDebug.Log("<color=red>连接成功</color>");
         }
         else
         {
             Connect = false;
 
-            ManaDebug.Log("<color=red>连接失败</color>");
+            //ManaDebug.Log("<color=red>连接失败</color>");
         }
     }
 
@@ -994,7 +1006,7 @@ public class ManaServer : Regist
 
     private static void SaveCallback(JsonData jsonData)
     {
-        ManaDebug.Log("<color=red>发送存档成功</color>");
+        //ManaDebug.Log("<color=red>发送存档成功</color>");
     }
 
 

+ 3 - 3
Assets/Script/Object/PlazaRoom.cs

@@ -89,7 +89,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         Transform tra = ManaReso.Get("PlazaRoomCloud1");
 
-        tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
+        //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 
         TweenRoot tween = tra.CreateTweenVec2D(new Vector3(-21, tra.localPosition.y, tra.localPosition.z), 115f, true, false, true, Curve.Linear);
 
@@ -103,7 +103,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         tra = ManaReso.Get("PlazaRoomCloud2");
 
-        tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
+        //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 
         tween = tra.CreateTweenVec2D(new Vector3(-21, tra.localPosition.y, tra.localPosition.z), 157.5f, true, false, true, Curve.Linear);
 
@@ -117,7 +117,7 @@ public class PlazaRoom : MonoBehaviour, IPointerClickHandler
 
         tra = ManaReso.Get("PlazaRoomCloud3");
 
-        tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
+        //tra.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("云朵", Folder.Scene);
 
         tween = tra.CreateTweenVec2D(new Vector3(-21, tra.localPosition.y, tra.localPosition.z), 200f, true, false, true, Curve.Linear);
 

+ 2 - 1
Assets/Script/Tool/Auxiliary.cs

@@ -142,7 +142,8 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
-            SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
+            Debug.LogWarning(ManaServer.SerialNumber);
+            //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
             //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
             //ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
         }

+ 3 - 3
ProjectSettings/ProjectSettings.asset

@@ -122,13 +122,13 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleIdentifier: com.dashgame.garden
-  bundleVersion: 1.1.4
+  bundleVersion: 1.1.10
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   protectGraphicsMemory: 0
-  AndroidBundleVersionCode: 10
+  AndroidBundleVersionCode: 12
   AndroidMinSdkVersion: 16
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -136,7 +136,7 @@ PlayerSettings:
   stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
-  iPhoneBuildNumber: 4
+  iPhoneBuildNumber: 6
   ForceInternetPermission: 0
   ForceSDCardPermission: 1
   CreateWallpaper: 0

+ 9 - 4
第三期.txt

@@ -1,7 +1,12 @@
 Unix上的时间戳
 
+系统房间系统宝箱的价值
 
-服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期)
+
+缺排行榜按钮 公告按钮 截图按钮
+
+
+服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期) 1709207727231988804 vn9q1k
 
 关闭ManaDebug
 
@@ -11,11 +16,11 @@ Unix
 
 开启Service再打包
 
-更新Bundle(2个)
+//更新Bundle
 
-更新版本号(2个)
+//更新版本号
 
 IOS设置Team
 
 
-Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 上衣按钮需要打入图集)
+Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)