优化-将花朵打包为图集

Assets/Atlas.png.meta

@@ -138,5 +138,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: test
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower1.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower10.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower11.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower12.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower13.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower14.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower15.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower16.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower17.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower18.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower19.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower2.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower20.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower21.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower22.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower23.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower24.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower25.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower26.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower27.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower3.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower4.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower5.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower6.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower7.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower8.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/Flower9.png.meta

@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta

@@ -0,0 +1,506 @@
+fileFormatVersion: 2
+guid: bd007edf149fd024f99f0c5d743d0d57
+timeCreated: 1498656795
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: Flower25
+    21300002: Flower19
+    21300004: Flower21
+    21300006: Flower3
+    21300008: Flower26
+    21300010: Flower5
+    21300012: Flower20
+    21300014: Flower13
+    21300016: Flower22
+    21300018: Flower27
+    21300020: Flower6
+    21300022: Flower17
+    21300024: Flower8
+    21300026: Flower24
+    21300028: FlowerAtlas_14
+    21300030: Flower15
+    21300032: Flower4
+    21300034: Flower10
+    21300036: Flower18
+    21300038: Flower9
+    21300040: Flower12
+    21300042: FlowerAtlas_21
+    21300044: Flower16
+    21300046: Flower14
+    21300048: Flower2
+    21300050: Flower7
+    21300052: Flower23
+    21300054: Flower1
+    21300056: Flower11
+  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: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 200.00002, y: 184.49998}
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Flower25
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 2167
+        width: 388
+        height: 391
+      alignment: 9
+      pivot: {x: 0.525974, y: 0.4691517}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower19
+      rect:
+        serializedVersion: 2
+        x: 396
+        y: 2213
+        width: 426
+        height: 345
+      alignment: 9
+      pivot: {x: 0.4716981, y: 0.5349854}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower21
+      rect:
+        serializedVersion: 2
+        x: 827
+        y: 2218
+        width: 426
+        height: 340
+      alignment: 9
+      pivot: {x: 0.4692671, y: 0.5414201}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower3
+      rect:
+        serializedVersion: 2
+        x: 1258
+        y: 2179
+        width: 371
+        height: 380
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4853723}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower26
+      rect:
+        serializedVersion: 2
+        x: 1635
+        y: 2189
+        width: 362
+        height: 369
+      alignment: 9
+      pivot: {x: 0.55, y: 0.5027248}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower5
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1791
+        width: 365
+        height: 370
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4972752}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower20
+      rect:
+        serializedVersion: 2
+        x: 396
+        y: 1810
+        width: 372
+        height: 364
+      alignment: 9
+      pivot: {x: 0.4405406, y: 0.5609418}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower13
+      rect:
+        serializedVersion: 2
+        x: 828
+        y: 1854
+        width: 378
+        height: 359
+      alignment: 9
+      pivot: {x: 0.4920425, y: 0.5140056}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower22
+      rect:
+        serializedVersion: 2
+        x: 1212
+        y: 1813
+        width: 364
+        height: 361
+      alignment: 9
+      pivot: {x: 0.5027701, y: 0.6197771}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower27
+      rect:
+        serializedVersion: 2
+        x: 1635
+        y: 1814
+        width: 362
+        height: 370
+      alignment: 9
+      pivot: {x: 0.5555556, y: 0.5027248}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower6
+      rect:
+        serializedVersion: 2
+        x: 373
+        y: 1426
+        width: 339
+        height: 379
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4853723}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower17
+      rect:
+        serializedVersion: 2
+        x: 773
+        y: 1452
+        width: 333
+        height: 395
+      alignment: 9
+      pivot: {x: 0.5334346, y: 0.4669211}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower8
+      rect:
+        serializedVersion: 2
+        x: 1213
+        y: 1446
+        width: 363
+        height: 362
+      alignment: 9
+      pivot: {x: 0.5, y: 0.6197772}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower24
+      rect:
+        serializedVersion: 2
+        x: 1582
+        y: 1420
+        width: 310
+        height: 386
+      alignment: 9
+      pivot: {x: 0.4967532, y: 0.4611399}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: FlowerAtlas_14
+      rect:
+        serializedVersion: 2
+        x: 1792
+        y: 1798
+        width: 11
+        height: 11
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower15
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1445
+        width: 360
+        height: 341
+      alignment: 9
+      pivot: {x: 0.4343576, y: 0.5418879}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower4
+      rect:
+        serializedVersion: 2
+        x: 773
+        y: 1051
+        width: 333
+        height: 395
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4643766}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower10
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 1089
+        width: 350
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5244253}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower18
+      rect:
+        serializedVersion: 2
+        x: 374
+        y: 1044
+        width: 338
+        height: 377
+      alignment: 9
+      pivot: {x: 0.5178571, y: 0.4866667}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower9
+      rect:
+        serializedVersion: 2
+        x: 1111
+        y: 1104
+        width: 348
+        height: 336
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5464072}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower12
+      rect:
+        serializedVersion: 2
+        x: 1582
+        y: 1026
+        width: 310
+        height: 385
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4727979}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: FlowerAtlas_21
+      rect:
+        serializedVersion: 2
+        x: 1792
+        y: 1404
+        width: 11
+        height: 11
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower16
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 731
+        width: 344
+        height: 353
+      alignment: 9
+      pivot: {x: 0.5292398, y: 0.5171428}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower14
+      rect:
+        serializedVersion: 2
+        x: 374
+        y: 700
+        width: 373
+        height: 338
+      alignment: 9
+      pivot: {x: 0.5216216, y: 0.5446429}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower2
+      rect:
+        serializedVersion: 2
+        x: 760
+        y: 677
+        width: 259
+        height: 368
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower7
+      rect:
+        serializedVersion: 2
+        x: 1111
+        y: 712
+        width: 286
+        height: 385
+      alignment: 9
+      pivot: {x: 0.5, y: 0.45625}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower23
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 371
+        width: 341
+        height: 355
+      alignment: 9
+      pivot: {x: 0.4852941, y: 0.5454546}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower1
+      rect:
+        serializedVersion: 2
+        x: 351
+        y: 340
+        width: 243
+        height: 355
+      alignment: 9
+      pivot: {x: 0.5829875, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: Flower11
+      rect:
+        serializedVersion: 2
+        x: 3
+        y: 7
+        width: 196
+        height: 359
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5126405}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

Assets/Script/Manage/Initializer.cs

@@ -81,6 +81,8 @@ public class Initializer : MonoBehaviour
         ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
         ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
 
+        Bundle.LoadAtlas2Sprite();
+
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].Instantiate();

Assets/Script/Manage/ManaGarden.cs

@@ -336,7 +336,7 @@ public class ManaGarden : Regist
 
         image.sprite = flowerInfo.Icon;
 
-        image.Resize(true, 0.65f, 0.65f);
+        image.Resize(true, 0.75f, 0.75f);
     }
 
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -152,7 +152,7 @@ public class Award
             ManaReso.SetActive("Da_FlowerIcon", true);
 
             ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-            ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
+            ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
 
             ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -174,7 +174,7 @@ public class Award
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
 
                     ManaReso.SetText("Da_FlowerLab", flowerInfo.Name);
 
@@ -941,7 +941,6 @@ public class ManaMiniGame : Regist
             Panalty = true;
             PanaltyTimer = PanaltyTime;
             
-            //ManaReso.Get("D_FlowerBtn" + uiIndex).TweenForGra();
             ManaReso.Get("D_FlowerIcon" + index).TweenForGra();
 
             ManaReso.Get("D_FlowerBtn" + index).Shake(0.5f, 3, new Vector3(20f, 0, 0), Curve.EaseOutQuad);

Assets/Script/Manage/ManaReso.cs

@@ -16,6 +16,7 @@ public enum Folder
 {
     UI,
     Atlas,
+    Atlas2,
     Effect,
     Audio,
     Scene,
@@ -985,6 +986,46 @@ public class ManaReso : Regist
     }
 
 
+    public static void AsyncLoadAtlas2()
+    {
+        KV<AsyncRequest, UnityAction> kv = new KV<AsyncRequest, UnityAction>();
+
+        AssetBundleRequest bundleRequest = Bundle.LoadAllAsync<Sprite>(Folder.Atlas2);
+
+        AsyncRequest asyncRequest = new AsyncRequest();
+        asyncRequest.Request = bundleRequest;
+        asyncRequest.Callback = null;
+
+        kv.Key = asyncRequest;
+        kv.Value = () =>
+        {
+            for (int i = 0; i < bundleRequest.allAssets.Length; i++)
+            {
+                Sprite sprite = (Sprite)bundleRequest.allAssets[i];
+
+                ObjDic.UniqueAdd(sprite.name, sprite);
+            }
+
+            Bundle.Atlas2Complete = true;
+        };
+
+        RequestList.Add(bundleRequest);
+
+        InstantiateList.Add(kv);
+    }
+
+    public static void AddAsyncLoadAtlas2()
+    {
+        AsyncList.Add
+        (
+            () =>
+            {
+                AsyncLoadAtlas2();
+            }
+        );
+    }
+
+
     public void StopAsync()
     {
         StopCoroutine(CoroLoad);

Assets/Script/Manage/ManaSign.cs

@@ -123,8 +123,8 @@ public class Sign
                     ManaReso.SetActive("Bb_IconA", true);
 
                     ManaReso.SetSprite("Bb_IconA0", flowerInfo.Icon);
-
-                    ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.65f, 0.65f);
+                    
+                    ManaReso.Get<Image>("Bb_IconA0").Resize(true, 0.75f, 0.75f);
 
                     flowerInfo.Unlock = true;
 

Assets/Script/Manage/ManaUI.cs

@@ -524,7 +524,7 @@ public class ManaUI : Regist
                     ManaReso.SetActive("Da_Flower", true);
 
                     ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Icon;
-                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.2f, 0.2f);
+                    ManaReso.Get<Image>("Da_FlowerIcon").Resize(true, 0.25f, 0.25f);
 
                     ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID_));
 

Assets/Script/Object/Flower.cs

@@ -96,7 +96,7 @@ public class FlowerInfo
 
     public Sprite Icon
     {
-        get { return ManaReso.LoadSprite(Icon_, Folder.Scene); }
+        get { return ManaReso.LoadSprite(Icon_, Folder.Atlas2); }
     }
 
     public int ID_;
@@ -134,7 +134,7 @@ public class FlowerInfo
 
         Image.sprite = Icon;
 
-        Image.Resize(true, 0.2f, 0.2f);
+        Image.Resize(true, 0.25f, 0.25f);
 
         Button.onClick.AddListener
         (

Assets/Script/Tool/Auxiliary.cs

@@ -125,7 +125,13 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            //ManaServer.Download("hsoiv1", data => Debug.Log(data.ToJson()));
+            foreach (var kv in ManaGarden.FlowerInfoDic)
+            {
+                if (kv.Value.Unlock == false)
+                {
+                    kv.Value.Unlock = true;
+                }
+            }
         }
 
         if (Input.GetKeyDown(KeyCode.X))

Assets/Script/Tool/Bundle.cs

@@ -16,8 +16,10 @@ public class Bundle : MonoBehaviour
     public static Bundle Instance;
 
     public static bool Complete;
+    public static bool Atlas2Complete;
 
     public static AssetBundle Atlas;
+    public static AssetBundle Atlas2;
 
     public static AssetBundle UI;
     public static AssetBundle Effect;
@@ -28,6 +30,7 @@ public class Bundle : MonoBehaviour
 
     public List<Object> UiList;
     public List<Object> AtlasList;
+    public List<Sprite> Atlas2List;
     public List<Object> EffectList;
     public List<Object> AudioList;
     public List<Object> SceneList;
@@ -165,6 +168,38 @@ public class Bundle : MonoBehaviour
         throw new Exception();
     }
 
+    public static void LoadAtlas2Sprite()
+    {
+        if (Atlas2Complete)
+        {
+            return;
+        }
+
+        Atlas2Complete = true;
+
+        if (Initializer.Instance.DebugMode)
+        {
+            for (int i = 0; i < Instance.Atlas2List.Count; i++)
+            {
+                ManaReso.ObjDic.UniqueAdd(Instance.Atlas2List[i].name, Instance.Atlas2List[i]);
+            }
+        }
+        else
+        {
+            #region MyRegion
+
+            Sprite[] sprites = Atlas2.LoadAllAssets<Sprite>();
+
+            for (int i = 0; i < sprites.Length; i++)
+            {
+                ManaReso.ObjDic.UniqueAdd(sprites[i].name, sprites[i]);
+            }
+
+            #endregion
+        }
+    }
+
+
     public static AssetBundleRequest LoadAsync<T>(string goName, Folder folder)
     {
         if (folder == Folder.UI)
@@ -201,6 +236,18 @@ public class Bundle : MonoBehaviour
         }
     }
 
+    public static AssetBundleRequest LoadAllAsync<T>(Folder folder)
+    {
+        if (folder == Folder.Atlas2)
+        {
+            return Atlas2.LoadAllAssetsAsync<T>();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
 
     public static string GetStreamPath()
     {
@@ -284,8 +331,12 @@ public class Bundle : MonoBehaviour
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
             ManaReso.AddAsyncLoad("Music", 1, Folder.Audio, ObjType.Music);
+        }
 
+        yield return LoadAtlas2();
 
+        if (!Logo.Complete && !Initializer.Instance.DebugMode)
+        {
             ManaReso.AddAsyncLoad<TextAsset>("skill_config", Folder.Config);
             ManaReso.AddAsyncLoad<TextAsset>("pack_config", Folder.Config);
             ManaReso.AddAsyncLoad<TextAsset>("ability_config", Folder.Config);
@@ -359,10 +410,7 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad<Sprite>("黄-蓝色蜜蜂", Folder.UI);
             ManaReso.AddAsyncLoad<Sprite>("黄-黄色蜜蜂", Folder.UI);
 
-            for (int i = 1; i < 28; i++)
-            {
-                ManaReso.AddAsyncLoad<Sprite>("Flower" + i, Folder.Scene);
-            }
+            ManaReso.AddAsyncLoadAtlas2();
         }
 
         yield return LoadAtlas();
@@ -407,6 +455,22 @@ public class Bundle : MonoBehaviour
         }
     }
 
+    public static IEnumerator LoadAtlas2()
+    {
+        WWW www = new WWW(GetStreamPath() + "atlas2");
+
+        yield return www;
+
+        if (string.IsNullOrEmpty(www.error))
+        {
+            Atlas2 = www.assetBundle;
+        }
+        else
+        {
+            Debug.Log(www.error);
+        }
+    }
+
     public static IEnumerator LoadAudio()
     {
         WWW www = new WWW(GetStreamPath() + "audio");

ToList.txt

@@ -1,3 +1,5 @@
+debugmode中的图集
+
 删掉TestBundle
 
 Prefab中的图片和Bundle中的图片不要重复
@@ -11,9 +13,9 @@ Prefab
 
 //还原PlayerConfig
 
-//关闭调试界面
+关闭调试界面
 
-//关闭调试按键
+关闭调试按键
 
 //关闭DebugMode