增加下载图片功能

Assets/AtlasUtility/SerializeObject.prefab

@@ -56,18 +56,13 @@ MonoBehaviour:
   PackSize: 2048
   SlicePadding: 0
   PackPadding: 1
-  PackPath: Assets/Resource/Sprite/SpriteUI
+  PackPath: Assets/Resource/Sprite/Garden
   SlicePath: Assets/AtlasUtility/Slice
-  PackName: PanelAtlas1
+  PackName: a
   Atlas: {fileID: 0}
-  Target: {fileID: 2800000, guid: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
+  Target: {fileID: 0}
   TextureList:
-  - {fileID: 2800000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
-  - {fileID: 2800000, guid: 8579c10a92c46534f901dc172092f4e7, type: 3}
-  - {fileID: 2800000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
-  - {fileID: 2800000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
-  - {fileID: 2800000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
-  - {fileID: 2800000, guid: 4000c78c117d00d41900cdd8f4b505f4, type: 3}
-  - {fileID: 2800000, guid: 14decf5fdd820524eb3435822116d326, type: 3}
+  - {fileID: 2800000, guid: 78b8e74740b020646836f3748695dd77, type: 3}
+  - {fileID: 2800000, guid: b8e96dceb4e5a964e8974f980326400c, type: 3}
   VirtualTextureList: []
   ReferenceTable: {fileID: 4900000, guid: e61ffc7d134032b48a4366dfa7284499, type: 3}

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

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 78b8e74740b020646836f3748695dd77
-timeCreated: 1500433962
+timeCreated: 1503639215
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -74,6 +74,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Assets/Script/Manage/ManaIAP.cs

@@ -10,8 +10,11 @@ using UnityEngine.Purchasing.Extension;
 using System;
 using System.IO;
 using System.Collections;
+using System.Diagnostics;
 using System.Collections.Generic;
 
+using Debug = UnityEngine.Debug;
+
 public enum PayChannel
 {
     AliPay,
@@ -64,27 +67,27 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         if (ChestList.Count > 0)
             return;
 
-        if (!Advertisement.IsReady())
+        Timer += Time.deltaTime;
+
+        if (Timer >= 10)
         {
-            Timer += Time.deltaTime;
+            Timer = 0;
 
-            if (Timer >= 10)
+            if (!Advertisement.IsReady())
             {
-                Timer = 0;
-
                 InitializeAD();
             }
-        }
-        else
-        {
-            if (ADPlayTime == null)
-                return;
-
-            if (ManaServer.Connect && (ManaServer.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
+            else
             {
-                if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA)
+                if (ADPlayTime == null)
+                    return;
+
+                if (ManaServer.Connect && (ManaServer.Time.Subtract((DateTime)ADPlayTime).TotalSeconds > 1200))
                 {
-                    ChestList.Add(ManaReso.GetChest());
+                    if (ManaGarden.MiniLock && !ManaVisit.InVisit && !ManaTutorial.TutorialA)
+                    {
+                        ChestList.Add(ManaReso.GetChest());
+                    }
                 }
             }
         }

Assets/Script/Manage/ManaServer.cs

@@ -5,6 +5,7 @@ using UnityEngine.UI;
 using UnityEngine.Events;
 
 using System;
+using System.IO;
 using System.Net;
 using System.Xml;
 using System.Text;
@@ -12,6 +13,7 @@ using System.Linq;
 using System.Net.Mail;
 using System.Collections;
 using System.Collections.Generic;
+
 using Random = UnityEngine.Random;
 
 public class MyCredentials : ICredentialsByHost
@@ -101,7 +103,6 @@ public class ManaServer : Regist
     public static string ReportContent;
 
     public static JsonData JsonData;
-    //public static JsonData IndexJsonData;
     public static DateTime Time;
 
     public static string MailXml;
@@ -165,6 +166,64 @@ public class ManaServer : Regist
     }
 
 
+    public static void DownloadAllTexture(List<WWW> wwwList)
+    {
+        List<Texture2D> textureList = new List<Texture2D>();
+        List<SpriteInfo> spriteInfoList = new List<SpriteInfo>();
+
+        for (int i = 0; i < wwwList.Count; i++)
+        {
+            textureList.Add(wwwList[i].texture);
+
+            SpriteInfo spriteInfo = new SpriteInfo();
+            spriteInfo.Name = Path.GetFileNameWithoutExtension(wwwList[i].url);
+
+            spriteInfoList.Add(spriteInfo);
+        }
+
+        Texture2D atlas = new Texture2D(2048, 2048);
+
+        Rect[] rects = atlas.PackTextures(textureList.ToArray(), 1);
+
+        Sprite sprite = Sprite.Create(atlas, new Rect(0, 0, atlas.width, atlas.height), new Vector2(0.5f, 0.5f));
+
+        for (int i = 0; i < spriteInfoList.Count; i++)
+        {
+            spriteInfoList[i].Width = textureList[i].width;
+            spriteInfoList[i].Height = textureList[i].height;
+
+            spriteInfoList[i].UvList = new List<Vector2>()
+            {
+                new Vector2(rects[i].xMin, rects[i].yMax),
+                new Vector2(rects[i].xMax, rects[i].yMax),
+                new Vector2(rects[i].xMax, rects[i].yMin),
+                new Vector2(rects[i].xMin, rects[i].yMin),
+            };
+
+            SpriteAsset.SpriteInfoDic.Add(spriteInfoList[i].Name, spriteInfoList[i]);
+        }
+
+        Auxiliary.Instance.Sprite = sprite;
+    }
+
+    public static IEnumerator DownloadAllAsset(List<string> urlList, Action<List<WWW>> callback)
+    {
+        List<WWW> wwwList = new List<WWW>();
+
+        for (int i = 0; i < urlList.Count; i++)
+        {
+            wwwList.Add(new WWW(urlList[i]));
+        }
+
+        for (int i = 0; i < wwwList.Count; i++)
+        {
+            yield return wwwList[i];
+        }
+
+        callback(wwwList);
+    }
+
+
     public static void Praise(string sendID, string receiveID)
     {
         URLRequestData urlData = new URLRequestData();
@@ -241,7 +300,6 @@ public class ManaServer : Regist
         );
     }
 
-
     public static void MailRequest()
     {
         IndexRequest
@@ -484,7 +542,6 @@ public class ManaServer : Regist
         }
     }
 
-
     public static void PackTypeRequest()
     {
         IndexRequest

Assets/Script/Manage/ManaSign.cs

@@ -660,19 +660,19 @@ public class Lottery
         {
             ManaCenter.AddCoin(Value, StaticsManager.ItemID.获得金币, StaticsManager.ConsumeModule.Checkin);
 
-            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + Value);
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + " " + Value);
         }
         else if (Type == 2)
         {
             ManaCenter.AddDiamond(Value, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.Checkin);
 
-            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + Value);
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + " " + Value);
         }
         else if (Type == 3)
         {
             ManaGarden.FlowerInfoDic[Value].Unlock = true;
 
-            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + ManaGarden.FlowerInfoDic[Value].Name);
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + " " + ManaGarden.FlowerInfoDic[Value].Name);
         }
         else if (Type == 4)
         {
@@ -680,7 +680,7 @@ public class Lottery
 
             ManaPlayer.BoughtCloseList.UniqueAdd(Value);
 
-            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + ManaPlayer.CloseUnitDic[Value].Name);
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + " " + ManaPlayer.CloseUnitDic[Value].Name);
         }
     }
 }

Assets/Script/Tool/Auxiliary.cs

@@ -61,8 +61,11 @@ public class Auxiliary : Regist
     public string String1;
     public string String2;
 
+    public Sprite Sprite;
     public TextAsset TextAsset;
     public Texture2D Texture;
+    public Texture2D Texture1;
+    public Texture2D Texture2;
 
     public Font Font;
     public GameObject Go;
@@ -144,16 +147,14 @@ public class Auxiliary : Regist
 
             //Lottery.EnterAnimation(false);
 
-
-            ManaReso.GetChest();
-
-
             //ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            ManaMiniGame.GameTimer = 45;
+            StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
+
+            //ManaMiniGame.GameTimer = 45;
 
             //Lottery.TempTypeList = new List<int>();
             //Lottery.TempValueList = new List<int>();

Assets/Script/Tool/UI/SpriteAsset.cs

@@ -7,6 +7,7 @@ using UnityEditor;
 using UnityEngine;
 
 using System;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -22,6 +23,20 @@ public class SpriteInfo
     public Sprite Sprite;
     public List<Vector2> UvList;
 
+    public SpriteInfo()
+    {
+        
+    }
+
+    public SpriteInfo(Sprite sprite)
+    {
+        Width = sprite.rect.width;
+        Height = sprite.rect.height;
+        Name = sprite.name;
+        Sprite = sprite;
+        UvList = sprite.uv.ToList();
+    }
+
     #endregion
 }
 

ToDoList.txt

@@ -1,3 +1,5 @@
+调整箱子
+
 图文混排使用网络图片和超链接
 
 是否要修改帧率
@@ -22,9 +24,9 @@ IOS
 
 图集
 {
+  把网络得到的小图合并为图集
+
   UseSelectedPath自动设置PackName
   
   自定义压缩功能
-
-  不同压缩格式对尺寸的要求
 }