Update 6.4

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/iOS.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a5e10dc911691a844b899edb78584282
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/Android/builds.meta → Assets/Extension.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Plugins/ShareSDK/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: db9454787e4284fa9899244d3663dcd4
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 091987eeef9232240963d4755d7ea67e
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Animations/人物动画/Closet_texture.png.meta

@@ -60,7 +60,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
-    textureFormat: 12
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -68,7 +68,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: 33
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -84,7 +84,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
-    textureFormat: 47
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0

Assets/Resource/Sprite/SpriteUI/Skill/4大技能1副.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: b68adf74951f1024ba8955820319ac11
-timeCreated: 1489052556
-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
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: tvOS
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能2副.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: 0491c6a15b5627d4ba63be75fd16dfda
-timeCreated: 1489052556
-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
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: tvOS
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能3副.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: 52ae2a1a47fa2fe4cbf1f20f830efa38
-timeCreated: 1489052556
-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
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: tvOS
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能4.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 70b51e41db9c4b84e8c084b13a4c228a
-timeCreated: 1489384390
+guid: e42bfa25f226c4a4983bf95c1b080c66
+timeCreated: 1489052981
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: 
+  assetBundleName: ui
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Skill/4大技能4副.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: e42bfa25f226c4a4983bf95c1b080c66
-timeCreated: 1489052981
-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
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: tvOS
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/商店大背景.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -67,7 +67,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -75,7 +75,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -83,7 +83,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: WebGL
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

Assets/Resource/Sprite/SpriteUI/大底板.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -67,7 +67,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -75,7 +75,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -83,7 +83,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: WebGL
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

Assets/Resource/Sprite/SpriteUI/游戏界面.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -67,7 +67,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -75,7 +75,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -83,7 +83,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: WebGL
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

Assets/Resource/XML/PlayerConfig.xml

@@ -1,8 +1,8 @@
 <PlayerConfig>
-  <Version value="492" />
+  <Version value="502" />
 
   <ID value="Default" />
-////  <TutorialA value="1" />
+////  <TutorialA value="0" />
 ////  <TutorialB value="1" />
 ////  <TutorialC value="1" />
   <TutorialIndexA value="1" />

Assets/Script/Extension/ExtensionTransform.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 
 public static class ExtensionTransform 
 {
@@ -50,6 +51,7 @@ public static class ExtensionTransform
         tra.eulerAngles = new Vector3(tra.eulerAngles.x, tra.eulerAngles.y, z);
     }
 
+
     public static Vector3 GetScale(this Transform tra)
     {
         Vector3 scale = tra.localScale;
@@ -72,4 +74,45 @@ public static class ExtensionTransform
     {
         return tra.gameObject.AddComponent(type);
     }
+
+
+    public static Dictionary<string, Transform> Compile(this Transform tra)
+    {
+        Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
+
+        Transform[] transforms = tra.GetComponentsInChildren<Transform>(true);
+
+        for (int i = 0; i < transforms.Length; i++)
+        {
+            if (dic.ContainsKey(transforms[i].name))
+            {
+                throw new Exception(transforms[i].name);
+            }
+            else
+            {
+                dic.Add(transforms[i].name, transforms[i]);
+            }
+        }
+
+        return dic;
+    }
+
+    public static Dictionary<string, Transform> Compile(this Transform tra, Dictionary<string, Transform> dic)
+    {
+        Transform[] transforms = tra.GetComponentsInChildren<Transform>(true);
+
+        for (int i = 0; i < transforms.Length; i++)
+        {
+            if (dic.ContainsKey(transforms[i].name))
+            {
+                throw new Exception(transforms[i].name);
+            }
+            else
+            {
+                dic.Add(transforms[i].name, transforms[i]);
+            }
+        }
+
+        return dic;
+    }
 }

Assets/Script/Manage/ManaMiniGame.cs

@@ -125,31 +125,24 @@ public class Award
             sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
         }
         else
-        {
-            float flowerRate = (float)Auxiliary.FmlParse(FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
-
-            if (Random.Range(0, 1f) <= flowerRate)
+        {       
+            if (!ManaMiniGame.FlowerLock)
             {
                 if (Random.Range(0, 1f) <= Odds[rate])
                 {
-                    while (true)
-                    {
-                        FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
+                    flowerFlag = true;
 
-                        if (flowerInfo.Unlock)
-                        {
-                            flowerFlag = true;
+                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic[ManaMiniGame.Flower];
 
-                            ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                            ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
+                    flowerInfo.Unlock = true;
 
-                            ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
-                            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
+                    ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(0.2f, 0.2f);
 
-                            break;
-                        }
-                    }
+                    ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
+
+                    sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(花朵)>", flowerInfo.Name);
                 }
             }
         }
@@ -618,6 +611,7 @@ public class ManaMiniGame : Regist
     public static string ScoreLab;
 
     public static bool Prepare;
+    public static bool FlowerLock;
     public static bool TutorialLock = true;
     public static bool DropDiamond;
 
@@ -870,44 +864,58 @@ public class ManaMiniGame : Regist
 
     public static void GameEnter()
     {
-        if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
+        float flowerRate = (float)Auxiliary.FmlParse(Award.FlowerFml, "l", ManaCenter.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
+
+        if (Random.Range(0, 1f) <= flowerRate)
         {
-            while (true)
+            if (ManaGarden.MyFlower < ManaGarden.TotalFlower)
             {
-                FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
-
-                if (!flowerInfo.Unlock)
+                while (true)
                 {
-                    Flower = flowerInfo.ID_;
+                    FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
 
-                    break;
+                    if (!flowerInfo.Unlock)
+                    {
+                        Flower = flowerInfo.ID_;
+
+                        FlowerLock = false;
+
+                        break;
+                    }
                 }
             }
+            else
+            {
+                FlowerLock = true;
+            }
         }
         else
         {
-            Flower = ManaGarden.FlowerInfoDic.Random().ID_;
+            FlowerLock = true;
         }
 
 
-        int flowerAmt = 1;
-
-        while (true)
+        if (FlowerLock)
         {
-            FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random();
-
-            if (flowerInfo.Unlock)
+            for (int i = 1; i < 10; i++)
             {
-                IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + flowerAmt)));
+                IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[1], ManaReso.Get("SlotMini" + i)));
+            }
+        }
+        else
+        {
+            List<int> idList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
-                flowerAmt++;
+            int special = idList.Random(true);
 
-                if (flowerAmt == 10)
-                {
-                    break;
-                }
+            IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[Flower], ManaReso.Get("SlotMini" + special)));
+
+            for (int i = 0; i < idList.Count; i++)
+            {
+                IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[1], ManaReso.Get("SlotMini" + idList[i])));
             }
         }
+        
 
         ScoreLab = Language.GetStr("UI", "D_ScoreLab");
 

Assets/Script/Manage/ManaVisit.cs

@@ -552,17 +552,9 @@ public class ManaVisit
 
         if (Random.Range(0f, 1f) <= CreateRate)
         {
-            XmlDocument document = new XmlDocument();
-
-            document.LoadXml(ManaData.PlayerDoc.OuterXml);
-
-
-            WriteArchive(document);
-
-
             LoadComplete = true;
 
-            XmlStr = document.OuterXml;
+            XmlStr = WriteArchive();
 
             Enter();
         }
@@ -574,7 +566,16 @@ public class ManaVisit
                 {
                     LoadComplete = true;
 
-                    XmlStr = jsonData["l"].ToString();
+                    if (jsonData.Inst_Object.ContainsKey("l"))
+                    {
+                        XmlStr = jsonData["l"].ToString();
+                    }
+                    else
+                    {
+                        LoadComplete = true;
+
+                        XmlStr = WriteArchive();
+                    }
 
                     Enter();
                 }
@@ -582,8 +583,13 @@ public class ManaVisit
         }
     }
 
-    public static void WriteArchive(XmlDocument doc)
+    public static string WriteArchive()
     {
+        XmlDocument doc = new XmlDocument();
+
+        doc.LoadXml(ManaData.PlayerDoc.OuterXml);
+
+
         bool fancy;
 
         if (Random.Range(0f, 1f) < FancyRate)
@@ -633,48 +639,30 @@ public class ManaVisit
 
         List<int> flowerList = new List<int>();
 
-        for (int i = 2; i < 21; i++)
+        for (int i = 2; i < 28; i++)
         {
             flowerList.Add(i);
         }
 
-        for (int i = 27; i >= 21; i--)
-        {
-            flowerList.Add(i);
-        }
-
-        if (!fancy)
-        {
-            slot = Mathf.CeilToInt(slot/2f);
-        }
-
         int slotIndex = 0;
+        bool pinkLock = false;
         string plantList = "";
 
         for (int i = 0; i < slot; i++)
         {
-            if (fancy || Random.Range(0f, 1f) >= 0.25f)
+            if (fancy || Random.Range(0f, 1f) >= 0.35f)
             {
                 int flowerID;
 
-                if (i == 0)
+                if (!pinkLock)
                 {
                     flowerID = 1;
-                }
-                else if (i < 8)
-                {
-                    flowerID = flowerList.Last(i - 1, true);
+
+                    pinkLock = true;
                 }
                 else
                 {
-                    if (fancy)
-                    {
-                        flowerID = flowerList.Random(true);
-                    }
-                    else
-                    {
-                        break;
-                    }
+                    flowerID = flowerList.Random(true);
                 }
 
                 plantList += string.Format("{0},{1} ", flowerID, slotIndex);
@@ -702,5 +690,8 @@ public class ManaVisit
         {
             doc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player").Attributes[0].Value = "PlayerBrown";
         }
+
+
+        return doc.OuterXml;
     }
 }

Assets/Script/Object/Skill/BigSkill.cs

@@ -11,14 +11,6 @@ public class BigSkill : Skill
 {
     #region 变量
 
-    public Sprite BarIcon
-    {
-        get
-        {
-            return ManaReso.LoadSprite(Icon_ + "副", Folder.UI);
-        }
-    }
-
     public int BarIndex;
     public Text BarLab;
     public Image BarBk0;
@@ -193,7 +185,7 @@ public class BigSkill : Skill
         NewCoinOnceBuff = CoinOnceBuff;
 
 
-        BarBk1.sprite = BarIcon;
+        BarBk1.sprite = Icon;
 
         BarBtn.onClick.RemoveAllListeners();
         BarBtn.onClick.AddListener(Buy);

Assets/Script/Object/Skill/Skill.cs

@@ -257,12 +257,12 @@ public class Skill : SkillRoot
 
         if (!temp.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(金币)>", temp);
+            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(金币)>", temp.ToString("0"));
         }
 
         if (!DiamondOnce.Equal(0))
         {
-            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(钻石)>", DiamondOnce);
+            sb.AppendFormat("{0}{1}{2}", Language.GetStr("UI", "J_Info0"), "<(钻石)>", DiamondOnce.ToString("0"));
         }
 
         string str = sb.ToString();
@@ -339,12 +339,6 @@ public class Skill : SkillRoot
     {
         ManaAudio.PlayClip(Clip.BtnClip);
 
-        ManaReso.Get("Fe_Info").TweenForCG();
-
-        ManaReso.SetText("Fe_Tit", Name);
-
-        ManaReso.SetSprite("Fe_Icon", Icon);
-
         if (ItemStatus == SkillStatus.Buy)
         {
             if (BuyCur == Current.AD)
@@ -353,6 +347,12 @@ public class Skill : SkillRoot
             }
             else
             {
+                ManaReso.Get("Fe_Info").TweenForCG();
+
+                ManaReso.SetText("Fe_Tit", Name);
+
+                ManaReso.SetSprite("Fe_Icon", Icon);
+
                 ManaReso.SetText("Fe_Lab0", "");
                 ManaReso.SetText("Fe_Lab1", GetDescription(0));
 

Assets/Script/Tool/DashGame/Logo.cs

@@ -9,7 +9,7 @@ public class Logo : MonoBehaviour
     #region 变量
 
     public static bool Complete;
-
+    
     public static GameObject Camera;
 
     #endregion

MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,27 +15,24 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,11 +1,3 @@
 从Hierrarchy视图中检查是否有Bug
 
-发布前把服务器中的存档清理一次
-
-
-封装UnityAction的AddEventOneTime
-
-优化
-{
-  带宽优化
-}
+发布前把服务器中的存档清理一次