Browse Source

图片优化

LiuQilin 7 years ago
parent
commit
710d8bf167
100 changed files with 2136 additions and 1259 deletions
  1. 0 0
      Assets/AtlasUtility/AtlasReferenceTable.txt
  2. 2 2
      Assets/AtlasUtility/AtlasReferenceTable.txt.meta
  3. 0 0
      Assets/AtlasUtility/PlatformReferenceTable.txt
  4. 8 0
      Assets/AtlasUtility/PlatformReferenceTable.txt.meta
  5. 59 18
      Assets/AtlasUtility/Script/AtlasUtility.cs
  6. 1 1
      Assets/AtlasUtility/Script/AtlasUtility.cs.meta
  7. 306 392
      Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs
  8. 21 0
      Assets/AtlasUtility/Script/Editor/GUIDManager.cs
  9. 2 2
      Assets/AtlasUtility/Script/Editor/GUIDManager.cs.meta
  10. 26 0
      Assets/AtlasUtility/Script/Editor/InstanceManager.cs
  11. 12 0
      Assets/AtlasUtility/Script/Editor/InstanceManager.cs.meta
  12. 26 7
      Assets/AtlasUtility/Script/Editor/Postprocess.cs
  13. 9 0
      Assets/AtlasUtility/Script/Editor/Reference.meta
  14. 158 0
      Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs
  15. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs.meta
  16. 76 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs
  17. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs.meta
  18. 163 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs
  19. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs.meta
  20. 60 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs
  21. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs.meta
  22. 71 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceTable.cs
  23. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceTable.cs.meta
  24. 20 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReference.cs
  25. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReference.cs.meta
  26. 87 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceManager.cs
  27. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceManager.cs.meta
  28. 158 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs
  29. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs.meta
  30. 73 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceTable.cs
  31. 12 0
      Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceTable.cs.meta
  32. 147 0
      Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs
  33. 2 2
      Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs.meta
  34. 0 264
      Assets/AtlasUtility/Script/Editor/ReferenceManager.cs
  35. 0 54
      Assets/AtlasUtility/Script/Editor/ReferenceTable.cs
  36. 0 2
      Assets/AtlasUtility/Script/Editor/Startup.cs
  37. 2 41
      Assets/AtlasUtility/Script/Editor/TestEditor.cs
  38. 0 35
      Assets/AtlasUtility/Script/ExMath.cs
  39. 9 0
      Assets/AtlasUtility/Script/Extension.meta
  40. 35 0
      Assets/AtlasUtility/Script/Extension/ExMath.cs
  41. 0 0
      Assets/AtlasUtility/Script/Extension/ExMath.cs.meta
  42. 0 0
      Assets/AtlasUtility/Script/Extension/ExPath.cs
  43. 0 0
      Assets/AtlasUtility/Script/Extension/ExPath.cs.meta
  44. 16 11
      Assets/AtlasUtility/Script/Extension/ExtList.cs
  45. 0 0
      Assets/AtlasUtility/Script/Extension/ExtList.cs.meta
  46. 0 4
      Assets/AtlasUtility/Script/Test.cs
  47. 31 15
      Assets/AtlasUtility/SerializeObject.prefab
  48. 11 0
      Assets/AtlasUtility/使用说明.txt
  49. 8 0
      Assets/AtlasUtility/使用说明.txt.meta
  50. 3 0
      Assets/AtlasUtility/备忘录.txt
  51. 8 0
      Assets/AtlasUtility/备忘录.txt.meta
  52. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  53. 0 0
      Assets/Resource/Animations/人物动画/stand_tex.json
  54. BIN
      Assets/Resource/Animations/人物动画/stand_texture.png
  55. 165 165
      Assets/Resource/Animations/人物动画/stand_texture.png.meta
  56. 1 1
      Assets/Resource/Prefab/Object/Bee.prefab
  57. 1 1
      Assets/Resource/Prefab/Object/Beetle.prefab
  58. 4 4
      Assets/Resource/Prefab/Object/Bird0.prefab
  59. 1 1
      Assets/Resource/Prefab/Object/Butterfly.prefab
  60. 108 108
      Assets/Resource/Prefab/Object/DebugMode.prefab
  61. 1 1
      Assets/Resource/Prefab/Object/Dragonfly.prefab
  62. 1 1
      Assets/Resource/Prefab/Object/DropDiamond.prefab
  63. 1 1
      Assets/Resource/Prefab/Object/DropGold.prefab
  64. 6 6
      Assets/Resource/Prefab/Object/Flower.prefab
  65. 14 14
      Assets/Resource/Prefab/Object/Garden.prefab
  66. 10 10
      Assets/Resource/Prefab/Object/Page.prefab
  67. 1 1
      Assets/Resource/Prefab/Object/Rainbow.prefab
  68. 1 1
      Assets/Resource/Prefab/Object/Star.prefab
  69. 1 1
      Assets/Resource/Prefab/Object/Tree1.prefab
  70. 1 1
      Assets/Resource/Prefab/PrefabUI/CloseItem.prefab
  71. 1 1
      Assets/Resource/Prefab/PrefabUI/CommentItem.prefab
  72. 25 25
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  73. 27 27
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  74. 12 12
      Assets/Resource/Prefab/PrefabUI/GroupC.prefab
  75. 12 12
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  76. 15 15
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  77. 9 0
      Assets/Resource/Sprite/Atlas.meta
  78. 0 0
      Assets/Resource/Sprite/Atlas/Atlas.png
  79. 0 0
      Assets/Resource/Sprite/Atlas/Atlas.png.meta
  80. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas1.png
  81. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas1.png.meta
  82. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas2.png
  83. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas2.png.meta
  84. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas3.png
  85. 0 0
      Assets/Resource/Sprite/Atlas/BtnAtlas3.png.meta
  86. 0 0
      Assets/Resource/Sprite/Atlas/ElfAtlas.png
  87. 0 0
      Assets/Resource/Sprite/Atlas/ElfAtlas.png.meta
  88. 0 0
      Assets/Resource/Sprite/Atlas/FlowerAtlas.png
  89. 0 0
      Assets/Resource/Sprite/Atlas/FlowerAtlas.png.meta
  90. 0 0
      Assets/Resource/Sprite/Atlas/FlowerItemAtlas1.png
  91. 0 0
      Assets/Resource/Sprite/Atlas/FlowerItemAtlas1.png.meta
  92. 0 0
      Assets/Resource/Sprite/Atlas/GardenAtlas1.png
  93. 0 0
      Assets/Resource/Sprite/Atlas/GardenAtlas1.png.meta
  94. 0 0
      Assets/Resource/Sprite/Atlas/GardenAtlas2.png
  95. 0 0
      Assets/Resource/Sprite/Atlas/GardenAtlas2.png.meta
  96. 0 0
      Assets/Resource/Sprite/Atlas/PanelAtlas1.png
  97. 0 0
      Assets/Resource/Sprite/Atlas/PanelAtlas1.png.meta
  98. 0 0
      Assets/Resource/Sprite/Atlas/PanelAtlas2.png
  99. 0 0
      Assets/Resource/Sprite/Atlas/PanelAtlas2.png.meta
  100. 0 0
      Assets/Resource/Sprite/Atlas/SkillAtlas.png

+ 0 - 0
Assets/AtlasUtility/ReferenceTable.txt → Assets/AtlasUtility/AtlasReferenceTable.txt


+ 2 - 2
Assets/AtlasUtility/ReferenceTable.txt.meta → Assets/AtlasUtility/AtlasReferenceTable.txt.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: e61ffc7d134032b48a4366dfa7284499
-timeCreated: 1502432859
+guid: 297de77c3d160814480e67b163473841
+timeCreated: 1504144947
 licenseType: Pro
 TextScriptImporter:
   userData: 

+ 0 - 0
Assets/AtlasUtility/PlatformReferenceTable.txt


+ 8 - 0
Assets/AtlasUtility/PlatformReferenceTable.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c0cf65f650ad5143a480bff1d852d1d
+timeCreated: 1504144947
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 59 - 18
Assets/AtlasUtility/Script/AtlasUtility.cs

@@ -11,38 +11,79 @@
         Smallest,
     }
 
-    public class AtlasUtility : MonoBehaviour
+    public enum Platform
+    {
+        Editor,
+        Mobile,
+        Desktop,
+    }
+
+    public enum ScalePlatform
+    {
+        Mobile,
+        Desktop,
+    }
+
+    [Serializable]
+    public class AtlasSet
     {
-        [Serializable]
-        public class VirtualTexture
-        {
-            public int Width;
-            public int Height;
-            public string Name;
-        }
+        public Texture2D EditorAtlas;
+        public Texture2D MobileAtlas;
+        public Texture2D DesktopAtlas;
+    }
 
+    [Serializable]
+    public class VirtualTexture
+    {
         #region Variable
 
-        public PackPlan PackPlan = PackPlan.Smallest;
+        public int Width;
+        public int Height;
+        public string Name;
 
-        public Texture2D SpriteSheet;
+        #endregion
+    }
 
+    public class AtlasUtility : MonoBehaviour
+    {
+        #region Variable
+
+        public bool PackAtlasFunction;
+        public bool SliceAtlasFunction;
+        public bool SearchReferenceFunction;
+        public bool ReferenceControllFunction;
+        public bool ScaleTextureFunction;
+        public bool DebugFunction;
 
         public int PackSize = 2048;
-        public int SlicePadding = 0;
         public int PackPadding = 1;
-
+        public string PackName = "Atlas";
         public string PackPath = "Assets/AtlasUtility";
+        public PackPlan PackPlan = PackPlan.Smallest;
+        public Texture2D PackAtlas;
+        public List<Texture2D> TextureList = new List<Texture2D>();
+        public List<VirtualTexture> VirtualTextureList = new List<VirtualTexture>();
+
+        public int SlicePadding = 0;
         public string SlicePath = "Assets/AtlasUtility/Slice";
-        public string PackName = "Atlas";
+        public Texture2D SliceAtlas;
 
-        public Texture2D Atlas;
-        public Texture2D Target;
+        public Texture2D SearchTarget;
 
-        public List<Texture2D> TextureList = new List<Texture2D>();
-        public List<VirtualTexture> VirtualTextureList = new List<VirtualTexture>();
+        public int ScalePadding;
+        public float ScaleFactor;
+        public string ScalePath;
+        public string ScaleName;
+        public Texture2D MobileTexture;
+        public Texture2D DesktopTexture;
+        public Texture2D SourceTexture;
+        public Texture2D LastSourceTexture;
+        public ScalePlatform ScalePlatform;
+        
+        public List<AtlasSet> AtlasSets;
 
-        public TextAsset ReferenceTable;
+        public TextAsset AtlasReferenceTable;
+        public TextAsset PlatformReferenceTable;
 
         #endregion
     }

+ 1 - 1
Assets/AtlasUtility/Script/AtlasUtility.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b95c390c169d0c342a44bf125aefc458
+guid: 5855deb34ca797c4ab1b14de79906080
 timeCreated: 1502063536
 licenseType: Pro
 MonoImporter:

File diff suppressed because it is too large
+ 306 - 392
Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs


+ 21 - 0
Assets/AtlasUtility/Script/Editor/GUIDManager.cs

@@ -0,0 +1,21 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+
+    using System.Collections.Generic;
+
+    public class GUIDManager
+    {
+        public static List<string> GetGUID(List<string> assetPathList)
+        {
+            List<string> guidList = new List<string>();
+
+            foreach (var assetPath in assetPathList)
+            {
+                guidList.Add(AssetDatabase.AssetPathToGUID(assetPath));
+            }
+
+            return guidList;
+        }
+    }
+}

+ 2 - 2
Assets/AtlasUtility/Script/Editor/ReferenceTable.cs.meta → Assets/AtlasUtility/Script/Editor/GUIDManager.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 15d1f9e49227e4c41aca619fdea6266c
-timeCreated: 1502065332
+guid: 38422efc8dc42e44ba52904bb4918925
+timeCreated: 1503202759
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 26 - 0
Assets/AtlasUtility/Script/Editor/InstanceManager.cs

@@ -0,0 +1,26 @@
+namespace AtlasUtility
+{
+    using UnityEngine;
+    using UnityEditor;
+
+    using System;
+    using System.IO;
+
+    public class InstanceManager
+    {
+        public static AtlasUtility GetAtlasUtility()
+        {
+            foreach (var path in Directory.GetFiles(Application.dataPath, "SerializeObject.prefab", SearchOption.AllDirectories))
+            {
+                AtlasUtility atlasUtility = AssetDatabase.LoadAssetAtPath<GameObject>(path.GetRelativePath()).GetComponent<AtlasUtility>();
+
+                if (atlasUtility != null)
+                {
+                    return atlasUtility;
+                }
+            }
+
+            throw new Exception("找不到SerializeObject");
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/InstanceManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d0b60c1eb4ca70940869b1b2bc073257
+timeCreated: 1503217815
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 26 - 7
Assets/AtlasUtility/Script/Editor/Postprocess.cs

@@ -1,27 +1,46 @@
 namespace AtlasUtility
 {
     using UnityEditor;
-    using UnityEngine;
 
     using System.IO;
-    using System.Reflection;
     using System.Collections.Generic;
 
     public class Postprocess : AssetPostprocessor
     {
-        public static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        public static void OnPostprocessAllAssets(string[] importedPathes, string[] deletedPathes, string[] movedPathes, string[] movedFromAssetPathes)
         {
             List<string> pngPathList = new List<string>();
 
-            for (int i = 0; i < deletedAssets.Length; i++)
+            for (int i = 0; i < deletedPathes.Length; i++)
             {
-                if (Path.GetExtension(deletedAssets[i]) == ".png")
+                if (Path.GetExtension(deletedPathes[i]) == ".png")
                 {
-                    pngPathList.Add(deletedAssets[i]);
+                    pngPathList.Add(deletedPathes[i]);
                 }
             }
 
-            ReferenceManager.ResetReference(pngPathList);
+            if (pngPathList.Count == 0)
+            {
+                return;
+            }
+
+            List<string> guidList = GUIDManager.GetGUID(pngPathList);
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceManager.GetReferencePair(guidList);
+
+            AtlasReferenceManager.RemoveReferencePair(referencePairList);
+            PlatformReferenceManager.RemoveReference(guidList);
+
+            List<AtlasReference> fromReferenceList = new List<AtlasReference>();
+            List<AtlasReference> toReferenceList = new List<AtlasReference>();
+
+            foreach (var referencePair in referencePairList)
+            {
+                fromReferenceList.Add(referencePair.AtlasReference);
+                toReferenceList.Add(referencePair.SourceAtlasReference);
+            }
+
+            AtlasReferenceManager.ChangeReference(fromReferenceList, toReferenceList);
         }
     }
 }

+ 9 - 0
Assets/AtlasUtility/Script/Editor/Reference.meta

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

+ 158 - 0
Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs

@@ -0,0 +1,158 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+
+    public class AssetBundleManager
+    {
+        public static void SwitchAssetBundle(string editorPath, string mobilePath, string desktopPath, Platform toPlatform)
+        {
+            AssetImporter mobileImporter = AssetImporter.GetAtPath(mobilePath);
+            AssetImporter desktopImporter = AssetImporter.GetAtPath(desktopPath);
+            AssetImporter editorImporter = AssetImporter.GetAtPath(editorPath);
+
+            if (toPlatform == Platform.Editor)
+            {
+                if (editorImporter == null)
+                {
+                    Debug.Log("没有编辑器版本");
+
+                    return;
+                }
+            }
+            else if (toPlatform == Platform.Mobile)
+            {
+                if (mobileImporter == null)
+                {
+                    Debug.Log("没有移动版本");
+
+                    return;
+                }
+            }
+            else if (toPlatform == Platform.Desktop)
+            {
+                if (desktopImporter == null)
+                {
+                    Debug.LogWarning("没有桌面版本");
+
+                    return;
+                }
+            }
+            else
+            {
+                throw new Exception();
+            }
+
+            List<string> pathes = new List<string>();
+            List<string> bundleNames = new List<string>();
+            List<string> bundleVariants = new List<string>();
+
+            if (mobileImporter != null)
+            {
+                if (mobileImporter.assetBundleName != "" || mobileImporter.assetBundleVariant != "")
+                {
+                    pathes.Add(mobileImporter.assetPath);
+                }
+            }
+
+            if (desktopImporter != null)
+            {
+                if (desktopImporter.assetBundleName != "" || desktopImporter.assetBundleVariant != "")
+                {
+                    pathes.Add(desktopImporter.assetPath);
+                }
+            }
+
+            if (editorImporter != null)
+            {
+                if (editorImporter.assetBundleName != "" || editorImporter.assetBundleVariant != "")
+                {
+                    pathes.Add(editorImporter.assetPath);
+                }
+            }
+
+            if (pathes.Count == 0)
+            {
+                return;
+            }
+
+            if (!IsSameAssetBundle(pathes, bundleNames, bundleVariants))
+            {
+                Debug.LogWarning($"{editorPath} 的不同版本有不同的AssetBundle");
+
+                return;
+            }
+
+            if (editorImporter != null)
+            {
+                editorImporter.SetAssetBundleNameAndVariant("", "");
+                editorImporter.SaveAndReimport();
+            }
+
+            if (mobileImporter != null)
+            {
+                mobileImporter.SetAssetBundleNameAndVariant("", "");
+                mobileImporter.SaveAndReimport();
+            }
+
+            if (desktopImporter != null)
+            {
+                desktopImporter.SetAssetBundleNameAndVariant("", "");
+                desktopImporter.SaveAndReimport();
+            }
+
+            if (toPlatform == Platform.Editor)
+            {
+                editorImporter.assetBundleName = bundleNames[0];
+                editorImporter.assetBundleVariant = bundleVariants[0];
+                editorImporter.SaveAndReimport();
+            }
+            else if (toPlatform == Platform.Mobile)
+            {
+                mobileImporter.assetBundleName = bundleNames[0];
+                mobileImporter.assetBundleVariant = bundleVariants[0];
+                mobileImporter.SaveAndReimport();
+            }
+            else if (toPlatform == Platform.Desktop)
+            {
+                desktopImporter.assetBundleName = bundleNames[0];
+                desktopImporter.assetBundleVariant = bundleVariants[0];
+                desktopImporter.SaveAndReimport();
+            }
+            else
+            {
+                throw new Exception();
+            }
+        }
+
+        public static bool IsSameAssetBundle(List<string> pathes, List<string> bundleNames, List<string> bundleVariants)
+        {
+            for (int i = 0; i < pathes.Count; i++)
+            {
+                if (bundleNames.Count > 0 && !bundleNames.Contains(AssetImporter.GetAtPath(pathes[i]).assetBundleName))
+                {
+                    return false;
+                }
+                else
+                {
+                    bundleNames.Add(AssetImporter.GetAtPath(pathes[i]).assetBundleName);
+                }
+
+                if (bundleVariants.Count > 0 && !bundleVariants.Contains(AssetImporter.GetAtPath(pathes[i]).assetBundleVariant))
+                {
+                    return false;
+                }
+                else
+                {
+                    bundleVariants.Add(AssetImporter.GetAtPath(pathes[i]).assetBundleVariant);
+                }
+            }
+
+            return true;
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/AssetBundleManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d4a6fe9bc8e3ae549b3de7bbb84e1a72
+timeCreated: 1504322107
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs

@@ -0,0 +1,76 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+
+    public class AtlasReference
+    {
+        #region Variable
+
+        public string GUID;
+        public string FileID;
+        public string Content;
+
+        public string DebugPath
+        {
+            get
+            {
+                int spriteIndex = (int.Parse(FileID) - 21300000) / 2;
+
+                string assetPath = AssetDatabase.GUIDToAssetPath(GUID);
+
+                TextureImporter textureImporter = (TextureImporter)AssetImporter.GetAtPath(assetPath);
+
+                return $"{assetPath}/{textureImporter.spritesheet[spriteIndex].name}";
+            }
+        }
+
+        #endregion
+
+        public AtlasReference(string content)
+        {
+            Content = content;
+            GUID = content.Split(',')[1].Split(' ')[2];
+            FileID = content.Split(',')[0].Split(' ')[1];
+        }
+
+        public AtlasReference(string fileID, string guid)
+        {
+            Content = $"fileID: {fileID}, guid: {guid}";
+            GUID = guid;
+            FileID = fileID;
+        }
+
+
+        public override int GetHashCode()
+        {
+            return Content.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            AtlasReference atlasReference = obj as AtlasReference;
+
+            if (atlasReference == null)
+            {
+                return false;
+            }
+
+            return Content == atlasReference.Content;
+        }
+
+        public static bool operator !=(AtlasReference reference1, AtlasReference reference2)
+        {
+            return !reference1.Equals(reference2);
+        }
+
+        public static bool operator ==(AtlasReference reference1, AtlasReference reference2)
+        {
+            return reference1.Equals(reference2);
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReference.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: cf340e92e560b274c8e32f5f59206a78
+timeCreated: 1504146208
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 163 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs

@@ -0,0 +1,163 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+    using UnityEditor.SceneManagement;
+
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Text.RegularExpressions;
+
+    public class AtlasReferenceManager
+    {
+        public static void ChangeReference(List<AtlasReference> fromReferenceList, List<AtlasReference> toReferenceList)
+        {
+            List<string> toList = new List<string>();
+            List<string> fromList = new List<string>();
+
+            for (int i = 0; i < toReferenceList.Count; i++)
+            {
+                toList.Add(toReferenceList[i].Content);
+            }
+
+            for (int i = 0; i < fromReferenceList.Count; i++)
+            {
+                fromList.Add(fromReferenceList[i].Content);
+            }
+
+            ReferenceManager.ChangeReference(false, fromList, toList);
+        }
+
+        public static void EnableAtlas()
+        {
+            List<AtlasReference> fromReferenceList = new List<AtlasReference>();
+            List<AtlasReference> toReferenceList = new List<AtlasReference>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+            
+            for (int i = 0; i < referencePairList.Count; i++)
+            {
+                AtlasReference atlasReference = referencePairList[i].AtlasReference;
+                AtlasReference sourceAtlasReference = referencePairList[i].SourceAtlasReference;
+
+                if (fromReferenceList.Contains(sourceAtlasReference))
+                {
+                    int index = fromReferenceList.IndexOf(sourceAtlasReference);
+
+                    Debug.LogWarning($"重复的Sprite    {atlasReference.DebugPath}    {toReferenceList[index].DebugPath}");
+                }
+
+                fromReferenceList.Add(sourceAtlasReference);
+                toReferenceList.Add(atlasReference);
+            }
+
+            ChangeReference(fromReferenceList, toReferenceList);
+        }
+
+        public static void DisableAtlas()
+        {
+            List<AtlasReference> fromReferenceList = new List<AtlasReference>();
+            List<AtlasReference> toReferenceList = new List<AtlasReference>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+
+            for (int i = 0; i < referencePairList.Count; i++)
+            {
+                fromReferenceList.Add(referencePairList[i].AtlasReference);
+                toReferenceList.Add(referencePairList[i].SourceAtlasReference);
+            }
+
+            ChangeReference(fromReferenceList, toReferenceList);
+        }
+
+        public static void GetEnableFromToList(List<string> fromList, List<string> toList)
+        {
+            List<AtlasReference> fromReferenceList = new List<AtlasReference>();
+            List<AtlasReference> toReferenceList = new List<AtlasReference>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+
+            for (int i = 0; i < referencePairList.Count; i++)
+            {
+                AtlasReference atlasReference = referencePairList[i].AtlasReference;
+                AtlasReference sourceAtlasReference = referencePairList[i].SourceAtlasReference;
+
+                if (fromReferenceList.Contains(sourceAtlasReference))
+                {
+                    int index = fromReferenceList.IndexOf(sourceAtlasReference);
+
+                    Debug.LogWarning($"重复的Sprite    {atlasReference.DebugPath}    {toReferenceList[index].DebugPath}");
+                }
+
+                fromReferenceList.Add(sourceAtlasReference);
+                toReferenceList.Add(atlasReference);
+            }
+
+            for (int i = 0; i < toReferenceList.Count; i++)
+            {
+                toList.Add(toReferenceList[i].Content);
+            }
+
+            for (int i = 0; i < fromReferenceList.Count; i++)
+            {
+                fromList.Add(fromReferenceList[i].Content);
+            }
+        }
+
+        public static void GetDisableFromToList(List<string> fromList, List<string> toList)
+        {
+            List<AtlasReference> fromReferenceList = new List<AtlasReference>();
+            List<AtlasReference> toReferenceList = new List<AtlasReference>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+
+            for (int i = 0; i < referencePairList.Count; i++)
+            {
+                fromReferenceList.Add(referencePairList[i].AtlasReference);
+                toReferenceList.Add(referencePairList[i].SourceAtlasReference);
+            }
+
+            for (int i = 0; i < toReferenceList.Count; i++)
+            {
+                toList.Add(toReferenceList[i].Content);
+            }
+
+            for (int i = 0; i < fromReferenceList.Count; i++)
+            {
+                fromList.Add(fromReferenceList[i].Content);
+            }
+        }
+
+
+        public static List<AtlasReferencePair> GetReferencePair(List<string> atlasGuidList)
+        {
+            List<AtlasReferencePair> resultList = new List<AtlasReferencePair>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+
+            foreach (string guid in atlasGuidList)
+            {
+                foreach (var referencePair in referencePairList)
+                {
+                    if (referencePair.AtlasReference.GUID == guid)
+                    {
+                        resultList.Add(referencePair);
+                    }
+                }
+            }
+
+            return resultList;
+        }
+
+        public static void RemoveReferencePair(List<AtlasReferencePair> referencePairList)
+        {
+            List<AtlasReferencePair> pairList = AtlasReferenceTable.ReadAllLine();
+
+            pairList.RemoveRange(referencePairList);
+
+            AtlasReferenceTable.WriteAllLine(pairList);
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f5fdfe420815dd14fb2102713a3cfbed
+timeCreated: 1504146208
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 60 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs

@@ -0,0 +1,60 @@
+namespace AtlasUtility
+{
+    public class AtlasReferencePair
+    {
+        #region Variable
+
+        public string Content;
+        public AtlasReference AtlasReference;
+        public AtlasReference SourceAtlasReference;
+
+        #endregion
+
+        public AtlasReferencePair(string content)
+        {
+            Content = content;
+            AtlasReference = new AtlasReference(content.Split('|')[0]);
+            SourceAtlasReference = new AtlasReference(content.Split('|')[1]);
+        }
+
+        public AtlasReferencePair(AtlasReference atlasReference, AtlasReference sourceAtlasReference)
+        {
+            Content = $"{atlasReference.Content}|{sourceAtlasReference.Content}";
+            AtlasReference = atlasReference;
+            SourceAtlasReference = sourceAtlasReference;
+        }
+
+
+        public override int GetHashCode()
+        {
+            return Content.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+            AtlasReferencePair atlasReferencePair = obj as AtlasReferencePair;
+
+            if (atlasReferencePair == null)
+            {
+                return false;
+            }
+
+            return AtlasReference == atlasReferencePair.AtlasReference && SourceAtlasReference == atlasReferencePair.SourceAtlasReference;
+        }
+
+        public static bool operator !=(AtlasReferencePair atlasReferencePair1, AtlasReferencePair atlasReferencePair2)
+        {
+            return !atlasReferencePair1.Equals(atlasReferencePair2);
+        }
+
+        public static bool operator ==(AtlasReferencePair atlasReferencePair1, AtlasReferencePair atlasReferencePair2)
+        {
+            return atlasReferencePair1.Equals(atlasReferencePair2);
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferencePair.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a9d8a2ba591a29f4cba835e00aa68af5
+timeCreated: 1504146208
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceTable.cs

@@ -0,0 +1,71 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Collections.Generic;
+
+    public class AtlasReferenceTable
+    {
+        #region Variable
+
+        protected static string ReferenceTablePath
+        {
+            get { return AssetDatabase.GetAssetPath(InstanceManager.GetAtlasUtility().AtlasReferenceTable); }
+        }
+
+        #endregion
+
+        public static List<AtlasReferencePair> ReadAllLine()
+        {
+            StreamReader streamReader = new StreamReader(ReferenceTablePath);
+
+            string referenceTable = streamReader.ReadToEnd().Trim();
+
+            streamReader.Close();
+
+            if (referenceTable == "")
+            {
+                return new List<AtlasReferencePair>();
+            }
+            else
+            {
+                List<AtlasReferencePair> list = new List<AtlasReferencePair>();
+
+                foreach (var content in referenceTable.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries).ToList())
+                {
+                    list.Add(new AtlasReferencePair(content));
+                }
+
+                return list;
+            }
+        }
+
+
+        public static void WriteAllLine(List<AtlasReferencePair> referencePairList, bool append = false)
+        {
+            List<string> lineList = new List<string>();
+
+            foreach (var referencePair in referencePairList)
+            {
+                lineList.Add(referencePair.Content);
+            }
+
+            WriteAllLine(lineList, append);
+        }
+
+        public static void WriteAllLine(List<string> lineList, bool append = false)
+        {
+            StreamWriter streamWriter = new StreamWriter(ReferenceTablePath, append);
+
+            for (int i = 0; i < lineList.Count; i++)
+            {
+                streamWriter.WriteLine(lineList[i]);
+            }
+
+            streamWriter.Close();
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceTable.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 3de351bdd8527e6468c623812aa91090
+timeCreated: 1504145770
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 20 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReference.cs

@@ -0,0 +1,20 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+
+    public class PlatformReference
+    {
+        #region Variable
+
+        public string Path;
+        public string GUID = "None";
+
+        #endregion
+
+        public PlatformReference(string guid)
+        {
+            Path = AssetDatabase.GUIDToAssetPath(guid);
+            GUID = guid;
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReference.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: ef226ff2e820e89479a0f89082c5891b
+timeCreated: 1504146283
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 87 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceManager.cs

@@ -0,0 +1,87 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+
+    using System.Collections.Generic;
+
+    public class PlatformReferenceManager
+    {
+        public static void SwitchPlatform(Platform toPlatform)
+        {
+            List<string> fromList = new List<string>();
+            List<string> toList = new List<string>();
+
+            GetFromToList(toPlatform, fromList, toList);
+
+            ReferenceManager.ChangeReference(true, fromList, toList);
+        }
+
+        public static void GetFromToList(Platform toPlatform, List<string> fromList, List<string> toList)
+        {
+            List<PlatformReferenceSet> referenceSetList = PlatformReferenceTable.ReadAllLine();
+
+            for (int i = 0; i < referenceSetList.Count; i++)
+            {
+                referenceSetList[i].SwitchPlatform(toPlatform, fromList, toList);
+            }
+        }
+
+        public static void RemoveReference(List<string> guidList)
+        {
+            List<PlatformReferenceSet> platformSetList = PlatformReferenceTable.ReadAllLine();
+
+            for (int i = 0; i < platformSetList.Count; i++)
+            {
+                if (guidList.Contains(platformSetList[i].MobileReference.GUID))
+                {
+                    platformSetList[i].MobileReference.GUID = "None";
+                }
+
+                if (guidList.Contains(platformSetList[i].DesktopReference.GUID))
+                {
+                    platformSetList[i].DesktopReference.GUID = "None";
+                }
+
+                if (guidList.Contains(platformSetList[i].EditorReference.GUID))
+                {
+                    platformSetList[i].EditorReference.GUID = "None";
+
+                    AssetDatabase.DeleteAsset(platformSetList[i].MobileReference.Path);
+                    AssetDatabase.DeleteAsset(platformSetList[i].DesktopReference.Path);
+                    AssetDatabase.Refresh();
+                }
+
+                if (!platformSetList[i].Valid)
+                {
+                    platformSetList.RemoveAt(i--);
+                }
+            }
+
+            PlatformReferenceTable.WriteAllLine(platformSetList);
+        }
+
+
+        public static PlatformReferenceSet GetMatchedReferenceSet(Texture2D texture)
+        {
+            string guid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(texture));
+
+            List<PlatformReferenceSet> referenceSetList = PlatformReferenceTable.ReadAllLine();
+
+            return GetMatchedReferenceSet(guid, referenceSetList);
+        }
+
+        public static PlatformReferenceSet GetMatchedReferenceSet(string guid, List<PlatformReferenceSet> referenceSetList)
+        {
+            for (int i = 0; i < referenceSetList.Count; i++)
+            {
+                if (referenceSetList[i].MobileReference.GUID == guid || referenceSetList[i].DesktopReference.GUID == guid || referenceSetList[i].EditorReference.GUID == guid)
+                {
+                    return referenceSetList[i];
+                }
+            }
+
+            return null;
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 5ab0601341e892342accf273fcc3d721
+timeCreated: 1504146395
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 158 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs

@@ -0,0 +1,158 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+
+    public class PlatformReferenceSet
+    {
+        #region Variable
+
+        public bool Valid
+        {
+            get
+            {
+                return MobileReference.GUID != "None" || DesktopReference.GUID != "None" || EditorReference.GUID != "None";
+            }
+        }
+        public string Content
+        {
+            get { return $"{EditorReference.GUID}|{MobileReference.GUID}|{DesktopReference.GUID}"; }
+        }
+
+        public Texture2D MobileTexture
+        {
+            get { return AssetDatabase.LoadAssetAtPath<Texture2D>(MobileReference.Path); }
+        }
+        public Texture2D DesktopTexture
+        {
+            get { return AssetDatabase.LoadAssetAtPath<Texture2D>(DesktopReference.Path); }
+        }
+        public Texture2D EditorTexture
+        {
+            get { return AssetDatabase.LoadAssetAtPath<Texture2D>(EditorReference.Path); }
+        }
+
+        public PlatformReference MobileReference;
+        public PlatformReference DesktopReference;
+        public PlatformReference EditorReference;
+
+        #endregion
+
+        public PlatformReferenceSet(string content)
+        {
+            MobileReference = new PlatformReference(content.Split('|')[1]);
+            DesktopReference = new PlatformReference(content.Split('|')[2]);
+            EditorReference = new PlatformReference(content.Split('|')[0]);
+        }
+
+        public PlatformReferenceSet(Texture2D editorTexture, string guid, ScalePlatform platform)
+        {
+            MobileReference = new PlatformReference("None");
+            DesktopReference = new PlatformReference("None");
+            EditorReference = new PlatformReference(AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(editorTexture)));
+
+            SetPlatformReference(guid, platform);
+        }
+
+
+        public void SwitchPlatform(Platform toPlatform, List<string> fromList, List<string> toList)
+        {
+            if (toPlatform == Platform.Editor)
+            {
+                AssetBundleManager.SwitchAssetBundle(EditorReference.Path, MobileReference.Path, DesktopReference.Path, toPlatform);
+
+                if (MobileReference.GUID != "None")
+                {
+                    fromList.Add(MobileReference.GUID);
+                    toList.Add(EditorReference.GUID);
+                }
+
+                if (DesktopReference.GUID != "None")
+                {
+                    fromList.Add(DesktopReference.GUID);
+                    toList.Add(EditorReference.GUID);
+                }
+            }
+            else if (toPlatform == Platform.Mobile)
+            {
+                if (MobileReference.GUID == "None")
+                {
+                    Debug.LogWarning(EditorReference.Path + " 没有移动版本");
+                }
+                else
+                {
+                    AssetBundleManager.SwitchAssetBundle(EditorReference.Path, MobileReference.Path, DesktopReference.Path, toPlatform);
+
+                    if (EditorReference.GUID != "None")
+                    {
+                        fromList.Add(EditorReference.GUID);
+                        toList.Add(MobileReference.GUID);
+                    }
+
+                    if (DesktopReference.GUID != "None")
+                    {
+                        fromList.Add(DesktopReference.GUID);
+                        toList.Add(MobileReference.GUID);
+                    }
+                }
+            }
+            else if (toPlatform == Platform.Desktop)
+            {
+                if (DesktopReference.GUID == "None")
+                {
+                    Debug.LogWarning(EditorReference.Path + " 没有桌面版本");
+                }
+                else
+                {
+                    AssetBundleManager.SwitchAssetBundle(EditorReference.Path, MobileReference.Path, DesktopReference.Path, toPlatform);
+
+                    if (EditorReference.GUID != "None")
+                    {
+                        fromList.Add(EditorReference.GUID);
+                        toList.Add(DesktopReference.GUID);
+                    }
+
+                    if (MobileReference.GUID != "None")
+                    {
+                        fromList.Add(MobileReference.GUID);
+                        toList.Add(DesktopReference.GUID);
+                    }
+                }
+            }
+            else
+            {
+                throw new Exception();
+            }
+        }
+
+        public void SetPlatformReference(string guid, ScalePlatform platform)
+        {
+            if (platform == ScalePlatform.Mobile)
+            {
+                if (MobileReference.GUID != "None" && MobileReference.GUID != guid)
+                {
+                    Debug.LogWarning("注意 已经有一个移动版本了");
+                }
+
+                MobileReference.GUID = guid;
+            }
+            else if (platform == ScalePlatform.Desktop)
+            {
+                if (DesktopReference.GUID != "None" && DesktopReference.GUID != guid)
+                {
+                    Debug.LogWarning("注意 已经有一个桌面版本了");
+                }
+
+                DesktopReference.GUID = guid;
+            }
+            else
+            {
+                throw new Exception("遇到了一个Bug");
+            }
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceSet.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 1ca2f022d503e6a4b924eae9daf7d255
+timeCreated: 1504146380
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceTable.cs

@@ -0,0 +1,73 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Collections;
+    using System.Collections.Generic;
+
+    public class PlatformReferenceTable
+    {
+        #region Variable
+
+        protected static string ReferenceTablePath
+        {
+            get { return AssetDatabase.GetAssetPath(InstanceManager.GetAtlasUtility().PlatformReferenceTable); }
+        }
+
+        #endregion
+
+        public static List<PlatformReferenceSet> ReadAllLine()
+        {
+            StreamReader streamReader = new StreamReader(ReferenceTablePath);
+
+            string referenceTable = streamReader.ReadToEnd().Trim();
+
+            streamReader.Close();
+
+            if (referenceTable == "")
+            {
+                return new List<PlatformReferenceSet>();
+            }
+            else
+            {
+                List<PlatformReferenceSet> list = new List<PlatformReferenceSet>();
+
+                foreach (var content in referenceTable.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries).ToList())
+                {
+                    list.Add(new PlatformReferenceSet(content));
+                }
+
+                return list;
+            }
+        }
+
+
+        public static void WriteAllLine(List<PlatformReferenceSet> referenceSetList, bool append = false)
+        {
+            List<string> lineList = new List<string>();
+
+            foreach (var referencePair in referenceSetList)
+            {
+                lineList.Add(referencePair.Content);
+            }
+
+            WriteAllLine(lineList, append);
+        }
+
+        public static void WriteAllLine(List<string> lineList, bool append = false)
+        {
+            StreamWriter streamWriter = new StreamWriter(ReferenceTablePath, append);
+
+            for (int i = 0; i < lineList.Count; i++)
+            {
+                streamWriter.WriteLine(lineList[i]);
+            }
+
+            streamWriter.Close();
+        }
+    }
+}

+ 12 - 0
Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceTable.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 9c31c4319f45d5c4aa193bd978721857
+timeCreated: 1504146412
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 147 - 0
Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs

@@ -0,0 +1,147 @@
+namespace AtlasUtility
+{
+    using UnityEditor;
+    using UnityEngine;
+    using UnityEditor.SceneManagement;
+
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Text.RegularExpressions;
+
+    public class ReferenceManager
+    {
+        public static void FindReference(string path)
+        {
+            SerializationMode userSerializationMode = EditorSettings.serializationMode;
+
+            EditorSettings.serializationMode = SerializationMode.ForceText;
+
+            string guid = AssetDatabase.AssetPathToGUID(path);
+
+            List<string> pathList = GetAllFile(true);
+
+            for (int i = 0; i < pathList.Count; i++)
+            {
+                EditorUtility.DisplayProgressBar("匹配", pathList[i], (i + 1) / (float)pathList.Count);
+
+                int count = Regex.Matches(File.ReadAllText(pathList[i]), guid).Count;
+
+                if (count > 0)
+                {
+                    Debug.LogWarning($"{count}处引用 {pathList[i].GetRelativePath()}");
+                }
+            }
+
+            EditorUtility.ClearProgressBar();
+
+            EditorSettings.serializationMode = userSerializationMode;
+        }
+
+        public static void ChangeReference(bool includeMaterial, List<string> fromList, List<string> toList)
+        {
+            if (fromList.Count != toList.Count)
+            {
+                throw new Exception("遇到一个Bug");
+            }
+
+            if (fromList.Count == 0)
+            {
+                return;
+            }
+
+            AssetDatabase.SaveAssets();
+            EditorSceneManager.SaveOpenScenes();
+
+            SerializationMode userSerializationMode = EditorSettings.serializationMode;
+
+            EditorSettings.serializationMode = SerializationMode.ForceText;
+
+            List<string> pathList = GetAllFile(includeMaterial);
+
+            for (int i = 0; i < pathList.Count; i++)
+            {
+                EditorUtility.DisplayProgressBar("修改引用", Path.GetFileNameWithoutExtension(pathList[i]), (i + 1) / (float)pathList.Count);
+
+                string originText = File.ReadAllText(pathList[i]);
+                string newText = originText;
+
+                for (int j = 0; j < fromList.Count; j++)
+                {
+                    newText = newText.Replace(fromList[j], toList[j]);
+                }
+
+                if (newText != originText)
+                {
+                    File.WriteAllText(pathList[i], newText);
+                }
+            }
+
+            EditorUtility.ClearProgressBar();
+
+            EditorSettings.serializationMode = userSerializationMode;
+
+            AssetDatabase.Refresh();
+        }
+
+
+        public static List<string> GetAllFile(bool includeMaterial)
+        {
+            List<string> searchExtension = new List<string>()
+            {
+                ".asset",
+                ".anim",
+                ".unity",
+                ".prefab"
+            };
+
+            if (includeMaterial)
+            {
+                searchExtension.Add(".mat");
+            }
+
+            List<string> pathList = Directory.GetFiles(Application.dataPath, "*.*", SearchOption.AllDirectories).Where
+                (
+                    path =>
+                    {
+                        string extension = Path.GetExtension(path);
+
+                        if (searchExtension.Contains(extension))
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                )
+                .ToList();
+
+            return pathList;
+        }
+
+        public static List<string> GetChildSpritePath(string atlasPath)
+        {
+            string atlasGUID = AssetDatabase.AssetPathToGUID(atlasPath);
+
+            List<string> spritePathList = new List<string>();
+
+            List<AtlasReferencePair> referencePairList = AtlasReferenceTable.ReadAllLine();
+
+            foreach (var referencePair in referencePairList)
+            {
+                AtlasReference atlasReference = referencePair.AtlasReference;
+                AtlasReference sourceAtlasReference = referencePair.SourceAtlasReference;
+
+                if (atlasReference.GUID == atlasGUID)
+                {
+                    spritePathList.Add(AssetDatabase.GUIDToAssetPath(sourceAtlasReference.GUID));
+                }
+            }
+
+            return spritePathList;
+        }
+    }
+}

+ 2 - 2
Assets/AtlasUtility/Script/Editor/ReferenceManager.cs.meta → Assets/AtlasUtility/Script/Editor/Reference/ReferenceManager.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 39fd1b206a7f87b4b9e84e489f4c1b64
-timeCreated: 1502112990
+guid: 62589b5f61ce8bd4482f182ce27dcc51
+timeCreated: 1504156257
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 0 - 264
Assets/AtlasUtility/Script/Editor/ReferenceManager.cs

@@ -1,264 +0,0 @@
-namespace AtlasUtility
-{
-    using UnityEditor;
-    using UnityEngine;
-    using UnityEditor.SceneManagement;
-
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Collections.Generic;
-    using System.Text.RegularExpressions;
-
-    public class ReferenceManager
-    {
-        public static void ChangeReference(List<string> fromReferenceList, List<string> toReferenceList)
-        {
-            if (fromReferenceList.Count != toReferenceList.Count)
-            {
-                throw new Exception("An error occured");
-            }
-
-            if (fromReferenceList.Count == 0)
-            {
-                return;
-            }
-
-            AssetDatabase.SaveAssets();
-            EditorSceneManager.SaveOpenScenes();
-
-            SerializationMode userSerializationMode = EditorSettings.serializationMode;
-
-            EditorSettings.serializationMode = SerializationMode.ForceText;
-
-            List<string> pathList = GetAllFilePath();
-
-            for (int i = 0; i < pathList.Count; i++)
-            {
-                EditorUtility.DisplayProgressBar("Changing reference", Path.GetFileNameWithoutExtension(pathList[i]), (i + 1)/(float) pathList.Count);
-
-                string originText = File.ReadAllText(pathList[i]);
-                string newText = originText;
-
-                for (int j = 0; j < fromReferenceList.Count; j++)
-                {
-                    newText = newText.Replace(fromReferenceList[j], toReferenceList[j]);
-                }
-
-                if (newText != originText)
-                {
-                    File.WriteAllText(pathList[i], newText);
-                }
-            }
-
-            EditorUtility.ClearProgressBar();
-
-            EditorSettings.serializationMode = userSerializationMode;
-
-            AssetDatabase.Refresh();
-        }
-
-        public static void ChangeAllReference()
-        {
-            if (!EditorUtility.DisplayDialog("Warning", "Are you sure you want to set all the references?", "Go ahead", "Cancel"))
-            {
-                return;
-            }
-
-            List<string> fromReferenceList = new List<string>();
-            List<string> toReferenceList = new List<string>();
-
-            List<string> itemList = ReferenceTable.ReadAllLine();
-
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                itemList[i] = itemList[i].TrimEnd((char)13);
-
-                string atlasReference = itemList[i].Split('|')[0];
-                string sourceReference = itemList[i].Split('|')[1];
-
-                if (fromReferenceList.Contains(sourceReference))
-                {
-                    int index = fromReferenceList.IndexOf(sourceReference);
-
-                    Debug.LogWarning($"Repeat sprite detected    {ReferenceToFakePath(atlasReference)}    {ReferenceToFakePath(toReferenceList[index])}");
-                }
-
-                fromReferenceList.Add(sourceReference);
-                toReferenceList.Add(atlasReference);
-            }
-
-            ChangeReference(fromReferenceList, toReferenceList);
-        }
-
-        public static void ResetReference(List<string> pngPathList)
-        {
-            if (pngPathList.Count == 0)
-            {
-                return;
-            }
-            
-            List<string> fromReferenceList = new List<string>();
-            List<string> toReferenceList = new List<string>();
-
-            List<string> itemList = ReferenceTable.ReadAllLine();
-
-            foreach (string path in pngPathList)
-            {
-                string atlasGUID = AssetDatabase.AssetPathToGUID(path);
-
-                for (int i = 0; i < itemList.Count; i++)
-                {
-                    itemList[i] = itemList[i].TrimEnd((char)13);
-
-                    string atlasReference = itemList[i].Split('|')[0];
-                    string sourceReference = itemList[i].Split('|')[1];
-
-                    if (atlasReference.Contains(atlasGUID))
-                    {
-                        fromReferenceList.Add(atlasReference);
-                        toReferenceList.Add(sourceReference);
-
-                        itemList.RemoveAt(i--);
-                    }
-                }
-            }
-
-            ChangeReference(fromReferenceList, toReferenceList);
-
-            ReferenceTable.WriteAllLine(itemList);
-        }
-
-        public static void ResetAllReference()
-        {
-            if (!EditorUtility.DisplayDialog("Warning", "Are you sure you want to reset all the references?", "Go ahead", "Cancel"))
-            {
-                return;
-            }
-
-            List<string> fromReferenceList = new List<string>();
-            List<string> toReferenceList = new List<string>();
-
-            List<string> itemList = ReferenceTable.ReadAllLine();
-
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                itemList[i] = itemList[i].TrimEnd((char)13);
-
-                string atlasReference = itemList[i].Split('|')[0];
-                string sourceReference = itemList[i].Split('|')[1];
-
-                fromReferenceList.Add(atlasReference);
-                toReferenceList.Add(sourceReference);
-            }
-
-            ChangeReference(fromReferenceList, toReferenceList);
-        }
-
-
-        public static void FindReference(string path)
-        {
-            SerializationMode userSerializationMode = EditorSettings.serializationMode;
-
-            EditorSettings.serializationMode = SerializationMode.ForceText;
-
-            string guid = AssetDatabase.AssetPathToGUID(path);
-
-            List<string> pathList = GetAllFilePath();
-
-            for (int i = 0; i < pathList.Count; i++)
-            {
-                EditorUtility.DisplayProgressBar("Searching", pathList[i], (i + 1)/(float) pathList.Count);
-
-                int count = Regex.Matches(File.ReadAllText(pathList[i]), guid).Count;
-
-                if (count > 0)
-                {
-                    Debug.LogWarning($"{count}处引用 {pathList[i].GetRelativePath()}");
-                }
-            }
-
-            EditorUtility.ClearProgressBar();
-
-            EditorSettings.serializationMode = userSerializationMode;
-        }
-
-        public static List<string> GetAllFilePath()
-        {
-            List<string> searchExtension = new List<string>()
-            {
-                ".asset",
-                ".anim",
-                ".unity",
-                ".prefab"
-            };
-
-            List<string> pathList = Directory.GetFiles(Application.dataPath, "*.*", SearchOption.AllDirectories).Where
-                (
-                    path =>
-                    {
-                        string extension = Path.GetExtension(path);
-
-                        if (searchExtension.Contains(extension))
-                        {
-                            return true;
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-                )
-                .ToList();
-
-            return pathList;
-        }
-
-        public static string ReferenceToFakePath(string reference)
-        {
-            string guid = ReferenceToGUID(reference);
-            string fileId = ReferenceToFileId(reference);
-
-            int spriteIndex = (int.Parse(fileId) - 21300000)/2;
-            
-            string atlasPath = AssetDatabase.GUIDToAssetPath(guid);
-
-            TextureImporter textureImporter = (TextureImporter) AssetImporter.GetAtPath(atlasPath);
-
-            return $"{atlasPath}/{textureImporter.spritesheet[spriteIndex].name}";
-        }
-
-        public static string ReferenceToGUID(string reference)
-        {
-            return reference.Split(',')[1].Split(' ')[2];
-        }
-
-        public static string ReferenceToFileId(string reference)
-        {
-            return reference.Split(',')[0].Split(' ')[1];
-        }
-
-        public static List<string> GetChildPathList(string path)
-        {
-            List<string> pathList = new List<string>();
-            List<string> itemList = ReferenceTable.ReadAllLine();
-
-            string atlasGUID = AssetDatabase.AssetPathToGUID(path);
-            
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                itemList[i] = itemList[i].TrimEnd((char) 13);
-
-                string atlasReference = itemList[i].Split('|')[0];
-                string sourceReference = itemList[i].Split('|')[1];
-
-                if (atlasReference.Contains(atlasGUID))
-                {
-                    pathList.Add(AssetDatabase.GUIDToAssetPath(ReferenceToGUID(sourceReference)));
-                }
-            }
-
-            return pathList;
-        }
-    }
-}

+ 0 - 54
Assets/AtlasUtility/Script/Editor/ReferenceTable.cs

@@ -1,54 +0,0 @@
-namespace AtlasUtility
-{
-    using UnityEditor;
-    using UnityEngine;
-
-    using System.IO;
-    using System.Linq;
-
-    using System.Collections.Generic;
-
-    public class ReferenceTable
-    {
-        #region Variable
-
-        public static string ReferenceTablePath
-        {
-            get { return AssetDatabase.GetAssetPath(AtlasUtilityWindow.GetAtlasUtility().ReferenceTable); }
-        }
-
-        #endregion
-
-        public static List<string> ReadAllLine()
-        {
-            StreamReader streamReader = new StreamReader(ReferenceTablePath);
-
-            string referenceTable = streamReader.ReadToEnd().TrimEnd('\n');
-
-            streamReader.Close();
-
-            List<string> lineList = referenceTable.Split('\n').ToList();
-
-            if (lineList.Count == 1 && lineList[0] == "")
-            {
-                return new List<string>();
-            }
-            else
-            {
-                return lineList;
-            }
-        }
-
-        public static void WriteAllLine(List<string> lineList)
-        {
-            StreamWriter streamWriter = new StreamWriter(ReferenceTablePath);
-
-            for (int i = 0; i < lineList.Count; i++)
-            {
-                streamWriter.WriteLine(lineList[i]);
-            }
-
-            streamWriter.Close();
-        }
-    }
-}

+ 0 - 2
Assets/AtlasUtility/Script/Editor/Startup.cs

@@ -2,8 +2,6 @@
 {
     using UnityEditor;
 
-    using System.IO;
-
     [InitializeOnLoad]
     public static class Startup
     {

+ 2 - 41
Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -1,19 +1,7 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace AtlasUtility
+namespace AtlasUtility
 {
-    using LitJson;
-
-    using System.IO;
-    using System.Linq;
-    using System.Collections.Generic;
-
     using UnityEditor;
     using UnityEngine;
-    using UnityEngine.UI;
-
-	using UnityEditor.iOS.Xcode;
 
     [CustomEditor(typeof(Test))]
     public class TestEditor : Editor
@@ -35,34 +23,7 @@ namespace AtlasUtility
 
             if (GUILayout.Button("Test"))
             {
-                MD5 md5 = new MD5CryptoServiceProvider();
-
-                byte[] bytes1 = File.ReadAllBytes(@"C:\Users\Administrator\Desktop\MD5测试1.txt");
-
-                byte[] md5Bytes1 = md5.ComputeHash(bytes1);
-
-                byte[] bytes2 = File.ReadAllBytes(@"C:\Users\Administrator\Desktop\MD5测试2.txt");
-
-                byte[] md5Bytes2 = md5.ComputeHash(bytes2);
-
-                if (md5Bytes1.Length != md5Bytes2.Length)
-                {
-                    Debug.Log("false");
-                    return;
-                }
-                else
-                {
-                    for (int i = 0; i < md5Bytes1.Length; i++)
-                    {
-                        if (md5Bytes1[i] != md5Bytes2[i])
-                        {
-                            Debug.Log("false");
-                            return;
-                        }
-                    }
-
-                    Debug.Log("true");
-                }
+                
             }
         }
     }

+ 0 - 35
Assets/AtlasUtility/Script/ExMath.cs

@@ -1,35 +0,0 @@
-namespace AtlasUtility
-{
-    using UnityEngine;
-
-    public static class ExMath
-    {
-        public static int PrevPOT(float value)
-        {
-            int result = Mathf.ClosestPowerOfTwo(Mathf.CeilToInt(value));
-
-            if (result > value)
-            {
-                return result/2;
-            }
-            else
-            {
-                return result;
-            }
-        }
-
-        public static int NextPOT(float value)
-        {
-            int result = Mathf.ClosestPowerOfTwo(Mathf.CeilToInt(value));
-
-            if (result >= value)
-            {
-                return result;
-            }
-            else
-            {
-                return result*2;
-            }
-        }
-    }
-}

+ 9 - 0
Assets/AtlasUtility/Script/Extension.meta

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

+ 35 - 0
Assets/AtlasUtility/Script/Extension/ExMath.cs

@@ -0,0 +1,35 @@
+namespace AtlasUtility
+{
+    using UnityEngine;
+
+    public static class ExMath
+    {
+        public static int PrevPOT(int value)
+        {
+            int closestPOT = Mathf.ClosestPowerOfTwo(value);
+
+            if (closestPOT > value)
+            {
+                return closestPOT/2;
+            }
+            else
+            {
+                return closestPOT;
+            }
+        }
+
+        public static int NextPOT(int value)
+        {
+            int closestPOT = Mathf.ClosestPowerOfTwo(value);
+
+            if (closestPOT >= value)
+            {
+                return closestPOT;
+            }
+            else
+            {
+                return closestPOT*2;
+            }
+        }
+    }
+}

+ 0 - 0
Assets/AtlasUtility/Script/ExMath.cs.meta → Assets/AtlasUtility/Script/Extension/ExMath.cs.meta


+ 0 - 0
Assets/AtlasUtility/Script/ExPath.cs → Assets/AtlasUtility/Script/Extension/ExPath.cs


+ 0 - 0
Assets/AtlasUtility/Script/ExPath.cs.meta → Assets/AtlasUtility/Script/Extension/ExPath.cs.meta


+ 16 - 11
Assets/AtlasUtility/Script/ExtList.cs → Assets/AtlasUtility/Script/Extension/ExtList.cs

@@ -17,18 +17,23 @@
             return t;
         }
 
+        public static void RemoveRange<T>(this List<T> list, List<T> targetList)
+        {
+            foreach (var t in targetList)
+            {
+                list.Remove(t);
+            }
+        }
 
-        public static void MySort<T>(this List<T> list, Func<T, T, bool> func)
+        public static void MySort<T>(this List<T> list, Func<T, T, bool> compare)
         {
-            bool finish = false;
-            
             for (int i = 0; i < list.Count; i++)
             {
-                finish = true;
+                bool finish = true;
 
                 for (int j = 0; j < list.Count - i - 1; j++)
                 {
-                    if (func(list[j], list[j + 1]))
+                    if (compare(list[j], list[j + 1]))
                     {
                         finish = false;
 
@@ -46,28 +51,28 @@
             }
         }
 
-        public static float MyMax<T>(this List<T> list, Func<T, float> func)
+        public static float MyMax<T>(this List<T> list, Func<T, float> calculate)
         {
-            float result = func(list[0]);
+            float result = calculate(list[0]);
 
             for (int i = 1; i < list.Count; i++)
             {
-                if (result < func(list[i]))
+                if (result < calculate(list[i]))
                 {
-                    result = func(list[i]);
+                    result = calculate(list[i]);
                 }
             }
 
             return result;
         }
 
-        public static float MySum<T>(this List<T> list, Func<T, float> func)
+        public static float MySum<T>(this List<T> list, Func<T, float> calculate)
         {
             float result = 0;
 
             for (int i = 0; i < list.Count; i++)
             {
-                result += func(list[i]);
+                result += calculate(list[i]);
             }
 
             return result;

+ 0 - 0
Assets/AtlasUtility/Script/ExtList.cs.meta → Assets/AtlasUtility/Script/Extension/ExtList.cs.meta


+ 0 - 4
Assets/AtlasUtility/Script/Test.cs

@@ -1,16 +1,12 @@
 namespace AtlasUtility
 {
     using UnityEngine;
-    using UnityEngine.UI;
 
     public class Test : MonoBehaviour
     {
         #region Variable
 
         public Sprite Sprite;
-        public Graphic Graphic;
-        public TextAsset TextAsset1;
-        public TextAsset TextAsset2;
         public Texture2D Texture2D;
         public SpriteRenderer SpriteRenderer;
 

+ 31 - 15
Assets/AtlasUtility/SerializeObject.prefab

@@ -19,7 +19,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4611373381130502}
-  - component: {fileID: 114804911014545120}
+  - component: {fileID: 114055335046780308}
   m_Layer: 0
   m_Name: SerializeObject
   m_TagString: Untagged
@@ -40,7 +40,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114804911014545120
+--- !u!114 &114055335046780308
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
@@ -48,21 +48,37 @@ MonoBehaviour:
   m_GameObject: {fileID: 1365587588779566}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b95c390c169d0c342a44bf125aefc458, type: 3}
+  m_Script: {fileID: 11500000, guid: 5855deb34ca797c4ab1b14de79906080, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PackPlan: 1
-  SpriteSheet: {fileID: 0}
+  PackAtlasFunction: 0
+  SliceAtlasFunction: 0
+  SearchReferenceFunction: 0
+  ReferenceControllFunction: 1
+  ScaleTextureFunction: 0
+  DebugFunction: 0
   PackSize: 2048
-  SlicePadding: 0
   PackPadding: 1
-  PackPath: Assets/Resource/Sprite/Garden
-  SlicePath: Assets/AtlasUtility/Slice
-  PackName: a
-  Atlas: {fileID: 0}
-  Target: {fileID: 0}
-  TextureList:
-  - {fileID: 2800000, guid: 78b8e74740b020646836f3748695dd77, type: 3}
-  - {fileID: 2800000, guid: b8e96dceb4e5a964e8974f980326400c, type: 3}
+  PackName: Atlas
+  PackPath: Assets/AtlasUtility
+  PackPlan: 1
+  PackAtlas: {fileID: 0}
+  TextureList: []
   VirtualTextureList: []
-  ReferenceTable: {fileID: 4900000, guid: e61ffc7d134032b48a4366dfa7284499, type: 3}
+  SlicePadding: 0
+  SlicePath: Assets/AtlasUtility/Slice
+  SliceAtlas: {fileID: 0}
+  SearchTarget: {fileID: 0}
+  ScalePadding: 0
+  ScaleFactor: 0
+  ScalePath: 
+  ScaleName: 
+  MobileTexture: {fileID: 0}
+  DesktopTexture: {fileID: 0}
+  SourceTexture: {fileID: 0}
+  LastSourceTexture: {fileID: 0}
+  ScalePlatform: 0
+  AtlasSets: []
+  AtlasReferenceTable: {fileID: 4900000, guid: 297de77c3d160814480e67b163473841, type: 3}
+  PlatformReferenceTable: {fileID: 4900000, guid: 0c0cf65f650ad5143a480bff1d852d1d,
+    type: 3}

+ 11 - 0
Assets/AtlasUtility/使用说明.txt

@@ -0,0 +1,11 @@
+可以修改.unity .anim .prefab .asset中的引用
+
+.asset被修改后需要重新编译一次
+
+DebugInfo位于Assets目录下
+
+打包图集会覆盖同名的文件
+
+缩放的时候不会覆盖同名文件
+
+拆图的时候不会覆盖同名文件

+ 8 - 0
Assets/AtlasUtility/使用说明.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 357e617892627dd44b097dfd43765599
+timeCreated: 1503132969
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/AtlasUtility/备忘录.txt

@@ -0,0 +1,3 @@
+AtlasReferenceTable : 图集GUID|原图GUID
+
+PlatformReferenceTable : 编辑器端GUID|移动端GUID|桌面端GUID

+ 8 - 0
Assets/AtlasUtility/备忘录.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d7f3fe7ed263f74da2a76f0582b51ad
+timeCreated: 1503132969
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


BIN
Assets/Resource/Animations/人物动画/stand_texture.png


+ 165 - 165
Assets/Resource/Animations/人物动画/stand_texture.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d523bac11c2f3742ab88a2cbd71bf39
-timeCreated: 1502703786
+timeCreated: 1504340980
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -203,8 +203,8 @@ TextureImporter:
       name: "\u8111\u58F31"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1949
+        x: 2313
+        y: 1632
         width: 646
         height: 391
       alignment: 0
@@ -242,10 +242,10 @@ TextureImporter:
       name: "\u88D9\u5B501"
       rect:
         serializedVersion: 2
-        x: 2871
-        y: 756
+        x: 2666
+        y: 749
         width: 212
-        height: 135
+        height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -268,8 +268,8 @@ TextureImporter:
       name: "\u8116\u5B50"
       rect:
         serializedVersion: 2
-        x: 3351
-        y: 809
+        x: 1583
+        y: 1642
         width: 35
         height: 51
       alignment: 0
@@ -281,10 +281,10 @@ TextureImporter:
       name: "\u978B\u5B501"
       rect:
         serializedVersion: 2
-        x: 4063
-        y: 390
-        width: 31
-        height: 38
+        x: 2579
+        y: 2103
+        width: 44
+        height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -294,10 +294,10 @@ TextureImporter:
       name: "\u5634\u5DF41"
       rect:
         serializedVersion: 2
-        x: 3085
-        y: 881
-        width: 12
-        height: 10
+        x: 501
+        y: 2344
+        width: 56
+        height: 35
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -320,8 +320,8 @@ TextureImporter:
       name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 3085
-        y: 765
+        x: 2313
+        y: 2056
         width: 264
         height: 95
       alignment: 0
@@ -334,7 +334,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3126
-        y: 2059
+        y: 2058
         width: 226
         height: 214
       alignment: 0
@@ -346,8 +346,8 @@ TextureImporter:
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 350
-        y: 8
+        x: 591
+        y: 169
         width: 165
         height: 111
       alignment: 0
@@ -359,8 +359,8 @@ TextureImporter:
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 517
-        y: 32
+        x: 742
+        y: 25
         width: 165
         height: 111
       alignment: 0
@@ -372,8 +372,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 183
-        y: 8
+        x: 909
+        y: 25
         width: 165
         height: 111
       alignment: 0
@@ -385,10 +385,10 @@ TextureImporter:
       name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 3112
-        y: 357
-        width: 231
-        height: 77
+        x: 3094
+        y: 765
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -398,10 +398,10 @@ TextureImporter:
       name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 591
-        y: 202
-        width: 220
-        height: 78
+        x: 3368
+        y: 30
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -424,10 +424,10 @@ TextureImporter:
       name: "\u88D9\u5B503"
       rect:
         serializedVersion: 2
-        x: 386
-        y: 145
-        width: 203
-        height: 135
+        x: 2880
+        y: 749
+        width: 212
+        height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -437,8 +437,8 @@ TextureImporter:
       name: "\u5634\u5DF42"
       rect:
         serializedVersion: 2
-        x: 1583
-        y: 1588
+        x: 385
+        y: 2344
         width: 56
         height: 35
       alignment: 0
@@ -450,10 +450,10 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 386
-        y: 123
-        width: 54
-        height: 20
+        x: 443
+        y: 2344
+        width: 56
+        height: 35
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -463,9 +463,9 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3008
-        y: 1086
-        width: 39
+        x: 2895
+        y: 1582
+        width: 44
         height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
@@ -476,10 +476,10 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 2349
-        width: 26
-        height: 30
+        x: 3373
+        y: 1149
+        width: 44
+        height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -515,10 +515,10 @@ TextureImporter:
       name: "\u88D9\u5B502"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1107
-        width: 203
-        height: 138
+        x: 773
+        y: 1643
+        width: 212
+        height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -528,8 +528,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2146
-        y: 3438
+        x: 652
+        y: 2850
         width: 572
         height: 657
       alignment: 0
@@ -541,8 +541,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 652
-        y: 2850
+        x: 1
+        y: 2381
         width: 572
         height: 657
       alignment: 0
@@ -554,8 +554,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 2381
+        x: 2146
+        y: 3438
         width: 572
         height: 657
       alignment: 0
@@ -567,8 +567,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1226
-        y: 2499
+        x: 575
+        y: 2342
         width: 610
         height: 506
       alignment: 0
@@ -580,8 +580,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 575
-        y: 2342
+        x: 3431
+        y: 3589
         width: 610
         height: 506
       alignment: 0
@@ -593,8 +593,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 3589
+        x: 1226
+        y: 2499
         width: 610
         height: 506
       alignment: 0
@@ -606,8 +606,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1609
+        x: 3431
+        y: 1273
         width: 382
         height: 770
       alignment: 0
@@ -619,8 +619,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 2215
-        y: 282
+        x: 2961
+        y: 1575
         width: 449
         height: 448
       alignment: 0
@@ -633,7 +633,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3431
-        y: 1273
+        y: 2045
         width: 382
         height: 770
       alignment: 0
@@ -659,7 +659,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3431
-        y: 2045
+        y: 2817
         width: 382
         height: 770
       alignment: 0
@@ -671,8 +671,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 2961
-        y: 1575
+        x: 2215
+        y: 282
         width: 449
         height: 448
       alignment: 0
@@ -684,8 +684,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 2817
+        x: 1
+        y: 1609
         width: 382
         height: 770
       alignment: 0
@@ -710,7 +710,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u6A59)"
       rect:
         serializedVersion: 2
-        x: 844
+        x: 1495
         y: 3509
         width: 649
         height: 586
@@ -723,8 +723,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 3040
+        x: 844
+        y: 3509
         width: 649
         height: 586
       alignment: 0
@@ -736,8 +736,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1495
-        y: 3509
+        x: 1
+        y: 3040
         width: 649
         height: 586
       alignment: 0
@@ -749,8 +749,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2720
-        y: 3093
+        x: 1226
+        y: 3007
         width: 709
         height: 500
       alignment: 0
@@ -762,8 +762,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2720
-        y: 3595
+        x: 1937
+        y: 2936
         width: 709
         height: 500
       alignment: 0
@@ -775,8 +775,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7EFF)"
       rect:
         serializedVersion: 2
-        x: 1226
-        y: 3007
+        x: 2720
+        y: 3093
         width: 709
         height: 500
       alignment: 0
@@ -788,8 +788,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 1937
-        y: 2936
+        x: 2720
+        y: 3595
         width: 709
         height: 500
       alignment: 0
@@ -801,8 +801,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 1665
-        y: 2009
+        x: 385
+        y: 1949
         width: 646
         height: 391
       alignment: 0
@@ -814,8 +814,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 2313
-        y: 1632
+        x: 1665
+        y: 2009
         width: 646
         height: 391
       alignment: 0
@@ -866,8 +866,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 739
+        x: 1838
+        y: 2402
         width: 476
         height: 532
       alignment: 0
@@ -879,8 +879,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 1838
-        y: 2402
+        x: 1187
+        y: 1965
         width: 476
         height: 532
       alignment: 0
@@ -892,8 +892,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1187
-        y: 1965
+        x: 2648
+        y: 2559
         width: 476
         height: 532
       alignment: 0
@@ -905,8 +905,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2666
-        y: 351
+        x: 1583
+        y: 1195
         width: 444
         height: 386
       alignment: 0
@@ -918,8 +918,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2648
-        y: 2559
+        x: 3431
+        y: 739
         width: 476
         height: 532
       alignment: 0
@@ -944,8 +944,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1583
-        y: 1195
+        x: 2666
+        y: 351
         width: 444
         height: 386
       alignment: 0
@@ -970,10 +970,10 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 3126
-        y: 2275
+        x: 3144
+        y: 1389
         width: 271
-        height: 183
+        height: 184
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -996,8 +996,8 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 3144
-        y: 1389
+        x: 3126
+        y: 2274
         width: 271
         height: 184
       alignment: 0
@@ -1009,8 +1009,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1646
+        x: 3112
+        y: 436
         width: 386
         height: 301
       alignment: 0
@@ -1023,7 +1023,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3126
-        y: 2659
+        y: 2460
         width: 302
         height: 197
       alignment: 0
@@ -1035,8 +1035,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 3112
-        y: 436
+        x: 385
+        y: 1646
         width: 386
         height: 301
       alignment: 0
@@ -1049,7 +1049,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3126
-        y: 2460
+        y: 2659
         width: 302
         height: 197
       alignment: 0
@@ -1061,8 +1061,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 2666
-        y: 749
+        x: 386
+        y: 138
         width: 203
         height: 142
       alignment: 0
@@ -1074,8 +1074,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 773
-        y: 1643
+        x: 1
+        y: 1103
         width: 203
         height: 142
       alignment: 0
@@ -1100,8 +1100,8 @@ TextureImporter:
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 2316
-        y: 2427
+        x: 3126
+        y: 2858
         width: 287
         height: 233
       alignment: 0
@@ -1113,8 +1113,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 3126
-        y: 2858
+        x: 2316
+        y: 2427
         width: 287
         height: 233
       alignment: 0
@@ -1217,8 +1217,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 3688
-        y: 439
+        x: 2616
+        y: 2061
         width: 30
         height: 40
       alignment: 0
@@ -1230,8 +1230,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 1895
-        y: 2937
+        x: 3360
+        y: 792
         width: 39
         height: 68
       alignment: 0
@@ -1243,8 +1243,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 3387
-        y: 765
+        x: 1619
+        y: 1598
         width: 34
         height: 42
       alignment: 0
@@ -1256,8 +1256,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 1583
-        y: 1625
+        x: 1895
+        y: 2937
         width: 39
         height: 68
       alignment: 0
@@ -1269,8 +1269,8 @@ TextureImporter:
       name: 8
       rect:
         serializedVersion: 2
-        x: 3373
-        y: 1140
+        x: 2579
+        y: 2044
         width: 35
         height: 57
       alignment: 0
@@ -1295,8 +1295,8 @@ TextureImporter:
       name: 10
       rect:
         serializedVersion: 2
-        x: 3351
-        y: 764
+        x: 1583
+        y: 1597
         width: 34
         height: 43
       alignment: 0
@@ -1308,10 +1308,10 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 413
-        y: 2349
-        width: 26
-        height: 30
+        x: 3054
+        y: 1086
+        width: 44
+        height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -1321,9 +1321,9 @@ TextureImporter:
       name: 12
       rect:
         serializedVersion: 2
-        x: 2895
-        y: 1582
-        width: 39
+        x: 3008
+        y: 1086
+        width: 44
         height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
@@ -1334,9 +1334,9 @@ TextureImporter:
       name: 13
       rect:
         serializedVersion: 2
-        x: 3049
-        y: 1086
-        width: 39
+        x: 3360
+        y: 742
+        width: 44
         height: 48
       alignment: 0
       pivot: {x: 0, y: 0}
@@ -1386,8 +1386,8 @@ TextureImporter:
       name: "\u5934\u99707"
       rect:
         serializedVersion: 2
-        x: 2316
-        y: 2662
+        x: 3108
+        y: 862
         width: 270
         height: 272
       alignment: 0
@@ -1399,8 +1399,8 @@ TextureImporter:
       name: "\u5934\u99708"
       rect:
         serializedVersion: 2
-        x: 3108
-        y: 862
+        x: 2316
+        y: 2662
         width: 270
         height: 272
       alignment: 0
@@ -1412,8 +1412,8 @@ TextureImporter:
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 3368
-        y: 127
+        x: 3721
+        y: 430
         width: 351
         height: 307
       alignment: 0
@@ -1425,8 +1425,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 3721
-        y: 430
+        x: 3368
+        y: 127
         width: 351
         height: 307
       alignment: 0
@@ -1477,8 +1477,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 3550
-        y: 11
+        x: 574
+        y: 22
         width: 166
         height: 114
       alignment: 0
@@ -1503,8 +1503,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 3368
-        y: 14
+        x: 183
+        y: 8
         width: 180
         height: 111
       alignment: 0
@@ -1555,8 +1555,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 2313
-        y: 2030
+        x: 386
+        y: 15
         width: 186
         height: 121
       alignment: 0
@@ -1582,7 +1582,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2029
-        y: 1241
+        y: 1077
         width: 180
         height: 162
       alignment: 0
@@ -1595,7 +1595,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 961
+        y: 957
         width: 179
         height: 144
       alignment: 0
@@ -1621,7 +1621,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2029
-        y: 1077
+        y: 1241
         width: 180
         height: 162
       alignment: 0
@@ -1672,8 +1672,8 @@ TextureImporter:
       name: "\u7981\u6B62\u6807\u5FD7"
       rect:
         serializedVersion: 2
-        x: 3373
-        y: 1137
+        x: 262
+        y: 1422
         width: 1
         height: 1
       alignment: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Bee.prefab

@@ -147,7 +147,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300038, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8be90607a97ac7842867d389e30c43ea, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Beetle.prefab

@@ -2846,7 +2846,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300030, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 78b8e74740b020646836f3748695dd77, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 4 - 4
Assets/Resource/Prefab/Object/Bird0.prefab

@@ -238,7 +238,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300016, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 46af2dea65c80ff42a16f8058d11dc1a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -273,7 +273,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300012, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4ce180404f7f2014691901510ada5ac6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -308,7 +308,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300018, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 66bf632fb963b2f438e28510b73c3735, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -343,7 +343,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300014, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 900ebf6ef22db7948a43e5fe1f384c83, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Butterfly.prefab

@@ -2846,7 +2846,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300020, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 70cb02380943ab44b9b6c5f6a2425493, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 108 - 108
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -53,10 +53,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Texture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   UiList:
-  - {fileID: 21300004, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300018, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300000, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300008, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300000, guid: e3accf445fffb7044a4d3d70109b38a9, type: 3}
+  - {fileID: 21300000, guid: ea6f8b98dba80ed4da98783d4b67a05f, type: 3}
+  - {fileID: 21300000, guid: 1bb19e193689f4049b199f274fc541f7, type: 3}
+  - {fileID: 21300000, guid: e42bfa25f226c4a4983bf95c1b080c66, type: 3}
   - {fileID: 1452624794413892, guid: 207b7751524785a428904038ac978d0a, type: 2}
   - {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   - {fileID: 1778995246200592, guid: e71b00d758f7c8341ac775c8694a411a, type: 2}
@@ -72,33 +72,33 @@ MonoBehaviour:
   - {fileID: 1424904125323438, guid: c176e58cecd9fd5428a8498de87375a2, type: 2}
   - {fileID: 1530314730688346, guid: aefbbfee089a9964e9b377589692f48c, type: 2}
   - {fileID: 1987736408932752, guid: e94e1c2506968d14ba9792fb79e31e39, type: 2}
-  - {fileID: 21300006, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300020, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300002, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300010, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300080, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300058, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300062, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300060, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300070, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300014, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300068, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300064, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300012, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300016, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300066, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300032, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300034, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300036, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300038, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300040, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300076, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300042, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300044, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300046, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300000, guid: 326709b7cdc393b48a424d7c579b2d4c, type: 3}
+  - {fileID: 21300000, guid: 063ea374e9043374499794044f72b8b6, type: 3}
+  - {fileID: 21300000, guid: 297963e10fd5cd6468d54b9d7624580b, type: 3}
+  - {fileID: 21300000, guid: a8375c9373541f143a22b32032e3f9aa, type: 3}
+  - {fileID: 21300000, guid: 53f5b57feb7b3db4b8377ff00dd5ad8f, type: 3}
+  - {fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37, type: 3}
+  - {fileID: 21300000, guid: fc658fa06ccb5404985d96c3674d51e4, type: 3}
+  - {fileID: 21300000, guid: 022e76b847c721744aee952b7acf3861, type: 3}
+  - {fileID: 21300000, guid: 710f7bac607de0649bc6eec777aba0e0, type: 3}
+  - {fileID: 21300000, guid: 1a3f6d31018cbb744acfd13f58a87009, type: 3}
+  - {fileID: 21300000, guid: 46034fb626c8f684da9887ce2bdcc24e, type: 3}
+  - {fileID: 21300000, guid: 07cc644f7a3fd904fb64c47ce79edd76, type: 3}
+  - {fileID: 21300000, guid: 5fd3c6b9cfc772d46bf1f2d8fcdb950b, type: 3}
+  - {fileID: 21300000, guid: f6bf044ac8f41104b960e1cf17dab266, type: 3}
+  - {fileID: 21300000, guid: b6a60532d81cb9b40ad3a4d0d670670d, type: 3}
+  - {fileID: 21300000, guid: dc7a4d60850d37d44bd3c0a518f8d2b3, type: 3}
+  - {fileID: 21300000, guid: 81726f9b381c9b54186089538fbb19a4, type: 3}
+  - {fileID: 21300000, guid: 3d3428a8490fa724890de93156161f05, type: 3}
+  - {fileID: 21300000, guid: 9918124a9bd12974daca85f20d03abd9, type: 3}
+  - {fileID: 21300000, guid: 88de22291cb66ff48a87d06830c8062b, type: 3}
+  - {fileID: 21300000, guid: 2da572dc3b99c9540967065d74407a28, type: 3}
+  - {fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78, type: 3}
+  - {fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347, type: 3}
+  - {fileID: 21300000, guid: 5bba921ee5be7dc47be1d203534ce56f, type: 3}
+  - {fileID: 21300000, guid: 86da3f7f4adcbbd4792704387e938d72, type: 3}
+  - {fileID: 21300000, guid: 79b6c36436ae37b4391c2ec81661f269, type: 3}
+  - {fileID: 21300000, guid: 224c92a9460ab28458454690ed628ff5, type: 3}
   - {fileID: 21300000, guid: e7d6142574a077b4f8699621861308d3, type: 3}
   - {fileID: 2100000, guid: 9afe516b3d7c64a4f9c1f4f2b9419129, type: 2}
   - {fileID: 2100000, guid: 698e0e29c7d443d43ba379c4ab2f9fbb, type: 2}
@@ -109,17 +109,17 @@ MonoBehaviour:
   - {fileID: 1574183927423390, guid: f9745d1e09b5acc47a0abe1eb100c9b8, type: 2}
   - {fileID: 21300000, guid: b302746e597587e4ea2e8d2e9765a58c, type: 3}
   - {fileID: 1648846713598210, guid: 9b0fa99244cc9c94fa53cbfd572e5f1b, type: 2}
-  - {fileID: 21300072, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300048, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300050, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300052, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300054, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300056, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300022, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300030, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300028, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300026, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300024, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300000, guid: b75f0efa8cf6be94ea93b2745f43fc8c, type: 3}
+  - {fileID: 21300000, guid: b8f88a8792d1a344c99e6b4073031b6c, type: 3}
+  - {fileID: 21300000, guid: 8178e4bf518056e40bb19b29a0c62be3, type: 3}
+  - {fileID: 21300000, guid: 0392344aa3984d54193820e54c96fc4e, type: 3}
+  - {fileID: 21300000, guid: 838e23ac5ad7f3a439d044121287835e, type: 3}
+  - {fileID: 21300000, guid: 19d618563b7e1e141ae6b8a60c98da5f, type: 3}
+  - {fileID: 21300000, guid: c9429ca4c11b98b45bcc6c9d785b528f, type: 3}
+  - {fileID: 21300000, guid: ddd4f7cd239bd0847ab18b1d6b26d14f, type: 3}
+  - {fileID: 21300000, guid: 1cd1c7843dfab4f47845dee056dd4b0f, type: 3}
+  - {fileID: 21300000, guid: bf824f5d04fde9b4788c615b68f1cfd1, type: 3}
+  - {fileID: 21300000, guid: 8a8eca1e9acc1da4a97c91c58979c2a5, type: 3}
   - {fileID: 1073147265121344, guid: 100bc0b1747d64e4db7883a2f0d726c5, type: 2}
   - {fileID: 1301950428336920, guid: 3251e6b903666f2488364daaf1f2cc88, type: 2}
   AtlasList:
@@ -131,62 +131,62 @@ MonoBehaviour:
   - {fileID: 21300008, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300008, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   Atlas2List:
-  - {fileID: 21300068, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300066, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300026, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300056, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300028, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300054, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300060, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300032, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300042, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300040, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300070, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300064, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300018, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300024, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300038, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300048, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300058, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300052, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300000, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300002, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300020, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300022, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300004, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300030, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300050, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300062, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300010, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300036, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300034, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300008, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300006, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300014, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300016, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300012, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300044, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300046, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
-  - {fileID: 21300038, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300036, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300010, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300032, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300034, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300030, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300028, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300022, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300024, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300026, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300020, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300012, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300014, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300016, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300018, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300000, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300002, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300004, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300008, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
-  - {fileID: 21300006, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300000, guid: 6de60095d752d2748b50b3ac408328cb, type: 3}
+  - {fileID: 21300000, guid: efc82d3850d7f3444aa6b4490ae9a2a8, type: 3}
+  - {fileID: 21300000, guid: f33b0a6c87c4faa44b9769fda019e3a2, type: 3}
+  - {fileID: 21300000, guid: 350660722139e2e4caefa9d507060f69, type: 3}
+  - {fileID: 21300000, guid: 85308d5010b45774e877f3fae319dac5, type: 3}
+  - {fileID: 21300000, guid: 06892e67e81ef9742a9a2846b54363ab, type: 3}
+  - {fileID: 21300000, guid: adb700f01ab714d4aa4dd80ac0241cf5, type: 3}
+  - {fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e, type: 3}
+  - {fileID: 21300000, guid: 2281497cc8538ec46aa8e611d10bf5b1, type: 3}
+  - {fileID: 21300000, guid: 4a486aebbda05c84e8fad4a648ac95f4, type: 3}
+  - {fileID: 21300000, guid: b7d083c187fd2ad47b4c8d905af6af48, type: 3}
+  - {fileID: 21300000, guid: b80d85d8782bd4e459c73617eb6a81f0, type: 3}
+  - {fileID: 21300000, guid: fbd26fef3e54016408278f3d56082625, type: 3}
+  - {fileID: 21300000, guid: a5bc323e0f4da674691cd45825b3bff6, type: 3}
+  - {fileID: 21300000, guid: ca2bc3b7d6c2b8b478c6814ad5565672, type: 3}
+  - {fileID: 21300000, guid: 1b03544f55d1a8b41aac7beb7b7cee04, type: 3}
+  - {fileID: 21300000, guid: 842e5f2a31851e346b9b551244e81398, type: 3}
+  - {fileID: 21300000, guid: a0b39d37b068b554ba0084663dec1780, type: 3}
+  - {fileID: 21300000, guid: 68e1ed04a89dfbb4baa62245c40addb6, type: 3}
+  - {fileID: 21300000, guid: 36523d742a883124482c4a87e4d9a3cc, type: 3}
+  - {fileID: 21300000, guid: 5849701d971d12e488cfc7ceb6118637, type: 3}
+  - {fileID: 21300000, guid: 19da5f7abec13e84f8684b5eb59ea6b4, type: 3}
+  - {fileID: 21300000, guid: 91654037d83a8ba4ea2a85b9b1f5c0b9, type: 3}
+  - {fileID: 21300000, guid: cb72fb32df67aa24f91a9afae97a08a6, type: 3}
+  - {fileID: 21300000, guid: 8414a26d4c82880469245196b8d325e3, type: 3}
+  - {fileID: 21300000, guid: 1e80d70ac3b7774449bd882f7961f66d, type: 3}
+  - {fileID: 21300000, guid: 97e16cc167122074daa2690e28f8b008, type: 3}
+  - {fileID: 21300000, guid: 6cdf870f3aa9717498ed05a74b1948ae, type: 3}
+  - {fileID: 21300000, guid: 7730260b51b8a954d9fa50bfd60e4b7a, type: 3}
+  - {fileID: 21300000, guid: 9df78e70b9d03264985541a621bce28c, type: 3}
+  - {fileID: 21300000, guid: 2fa154c29266e33468975bdbe6c00c0e, type: 3}
+  - {fileID: 21300000, guid: 24a1cc7523255434b9f13ddb8bce44ef, type: 3}
+  - {fileID: 21300000, guid: c184e6f3babc63f4190f48e0cd96f54a, type: 3}
+  - {fileID: 21300000, guid: b5aa8d5c3ac9fe340ab0165f4a5e4f3b, type: 3}
+  - {fileID: 21300000, guid: fe4553741ca18ef4d9a0268e2d01eb12, type: 3}
+  - {fileID: 21300000, guid: 9b1e12c6b0a66cf409477d5524da10e9, type: 3}
+  - {fileID: 21300000, guid: 8be90607a97ac7842867d389e30c43ea, type: 3}
+  - {fileID: 21300000, guid: 808053d8bb98d124fac454f652d772d8, type: 3}
+  - {fileID: 21300000, guid: cc8a39bb941f4aa408ef3d942a5b4beb, type: 3}
+  - {fileID: 21300000, guid: ab7d1767c1439b248954b6c76d5d3f88, type: 3}
+  - {fileID: 21300000, guid: ebc1119f992e078458ae897199fc3b48, type: 3}
+  - {fileID: 21300000, guid: 78b8e74740b020646836f3748695dd77, type: 3}
+  - {fileID: 21300000, guid: b8e96dceb4e5a964e8974f980326400c, type: 3}
+  - {fileID: 21300000, guid: 4778a7c92fd2b0344857bf7b4d69262e, type: 3}
+  - {fileID: 21300000, guid: 4c1d2b955877c184f885d98aa6a2f2f0, type: 3}
+  - {fileID: 21300000, guid: 116d2bf31e6f0fb48a1cdd4291160351, type: 3}
+  - {fileID: 21300000, guid: 70cb02380943ab44b9b6c5f6a2425493, type: 3}
+  - {fileID: 21300000, guid: 2751e2d88a82ab2459f19d47dcd7c9a9, type: 3}
+  - {fileID: 21300000, guid: 69598ae5ce2e3c04ba58e6a89ae5fdcb, type: 3}
+  - {fileID: 21300000, guid: 6d280216a9006a9439661027cdd128a2, type: 3}
+  - {fileID: 21300000, guid: 10e90d3c1c5f0354786bcaebb6746b9f, type: 3}
+  - {fileID: 21300000, guid: 3becf28a881ca004aac96b8626844d1a, type: 3}
+  - {fileID: 21300000, guid: b23f84d78b2ee3443b11253a61f85f59, type: 3}
+  - {fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c, type: 3}
+  - {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
+  - {fileID: 21300000, guid: 7d6f22b630025984482ed1d75fef0fc4, type: 3}
   EffectList:
   - {fileID: 2100000, guid: d112dba8bb2f53941b3807271af7bc52, type: 2}
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
@@ -220,16 +220,16 @@ MonoBehaviour:
   - {fileID: 2100000, guid: fb2dfea585d68dc47a46204dac2928d9, type: 2}
   - {fileID: 1388920081486088, guid: e7e5120af8916d144931c09850445367, type: 2}
   - {fileID: 1376626361390566, guid: dc899950ee8f7614dbd44d7edc7c0f3d, type: 2}
-  - {fileID: 21300012, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300002, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300000, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300004, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300008, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300006, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
-  - {fileID: 21300014, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300000, guid: e5694b9751b551a448db7ce043b7cbc1, type: 3}
+  - {fileID: 21300000, guid: 360030e3073fa4c4d8f216f55be30cf0, type: 3}
+  - {fileID: 21300000, guid: a455128274f65a54c98757ad807d02a0, type: 3}
+  - {fileID: 21300000, guid: bf75508b192ac794e96f3b750aca4531, type: 3}
+  - {fileID: 21300000, guid: defb31a82b042e34e823c5eb4d1305d6, type: 3}
+  - {fileID: 21300000, guid: a1d0f8c1a27a9bd479b941f36dd761a1, type: 3}
+  - {fileID: 21300000, guid: 11d74327a607f964abd9325d6ae00192, type: 3}
+  - {fileID: 21300000, guid: b5792498de291e44fbc1f8ad9c8448f9, type: 3}
+  - {fileID: 21300000, guid: 224c92a9460ab28458454690ed628ff5, type: 3}
+  - {fileID: 21300000, guid: 1799afa399060a4499f948da25246ccc, type: 3}
   - {fileID: 1658220073256390, guid: 4211c250985daa64582ec4922f16e3f5, type: 2}
   - {fileID: 21300000, guid: c4fc7aa8356e62948b06cfc31aea088e, type: 3}
   - {fileID: 1778995246200592, guid: e71b00d758f7c8341ac775c8694a411a, type: 2}

+ 1 - 1
Assets/Resource/Prefab/Object/Dragonfly.prefab

@@ -2846,7 +2846,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300008, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/DropDiamond.prefab

@@ -86,7 +86,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300014, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1799afa399060a4499f948da25246ccc, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/DropGold.prefab

@@ -86,7 +86,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bf75508b192ac794e96f3b750aca4531, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

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

@@ -5967,7 +5967,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300006, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 11d74327a607f964abd9325d6ae00192, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -6037,7 +6037,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 224c92a9460ab28458454690ed628ff5, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_FlipX: 0
   m_FlipY: 0
@@ -6072,7 +6072,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300008, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a1d0f8c1a27a9bd479b941f36dd761a1, type: 3}
   m_Color: {r: 0.8431373, g: 0.4784314, b: 0.74509805, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -6107,7 +6107,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300008, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a1d0f8c1a27a9bd479b941f36dd761a1, type: 3}
   m_Color: {r: 0.8431373, g: 0.4784314, b: 0.74509805, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -6212,7 +6212,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300006, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 11d74327a607f964abd9325d6ae00192, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_FlipX: 0
   m_FlipY: 0
@@ -6247,7 +6247,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300004, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: defb31a82b042e34e823c5eb4d1305d6, type: 3}
   m_Color: {r: 0.8431373, g: 0.4784314, b: 0.74509805, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 14 - 14
Assets/Resource/Prefab/Object/Garden.prefab

@@ -1251,7 +1251,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300006, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: dcefcdda05dc30744be3ed53c298062b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1286,7 +1286,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300016, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 46af2dea65c80ff42a16f8058d11dc1a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1321,7 +1321,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300014, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 900ebf6ef22db7948a43e5fe1f384c83, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1356,7 +1356,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b2e3a634a9e321c479438f39188aa8d4, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1426,7 +1426,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300008, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0f304ae6a7e08274bb7a346d5e57d202, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_FlipX: 0
   m_FlipY: 0
@@ -1461,7 +1461,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300022, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2ff363cd320cf0d4a8c7a3d0dd50087f, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_FlipX: 0
   m_FlipY: 0
@@ -1531,7 +1531,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300010, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8c72fe5ef5f71ce4cbefc192b80a5a34, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1566,7 +1566,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300010, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8c72fe5ef5f71ce4cbefc192b80a5a34, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1601,7 +1601,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300020, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bad292ba899474c479da729fe383f633, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_FlipX: 0
   m_FlipY: 0
@@ -1636,7 +1636,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300004, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 208285e407aecc040abae18a57915b26, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1671,7 +1671,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300010, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8c72fe5ef5f71ce4cbefc192b80a5a34, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1741,7 +1741,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300012, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4ce180404f7f2014691901510ada5ac6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1776,7 +1776,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300018, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 66bf632fb963b2f438e28510b73c3735, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1811,7 +1811,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4598a2be803928044b11b3bf209a203a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 10 - 10
Assets/Resource/Prefab/Object/Page.prefab

@@ -1663,7 +1663,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1698,7 +1698,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 94f1c0246e971a24581cf425455ec271, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1733,7 +1733,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1768,7 +1768,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1803,7 +1803,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1838,7 +1838,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1873,7 +1873,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1908,7 +1908,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1943,7 +1943,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1978,7 +1978,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Rainbow.prefab

@@ -71,7 +71,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300020, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bad292ba899474c479da729fe383f633, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Star.prefab

@@ -136,7 +136,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b5792498de291e44fbc1f8ad9c8448f9, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/Object/Tree1.prefab

@@ -71,7 +71,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300008, guid: 700a246d0e2b9b740a21b1304a4a8d28, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0f304ae6a7e08274bb7a346d5e57d202, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/CloseItem.prefab

@@ -324,7 +324,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/CommentItem.prefab

@@ -131,7 +131,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 82e315b06b317424fa171ba1079b64d3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 25 - 25
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -2565,7 +2565,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2619,7 +2619,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2784,7 +2784,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2811,7 +2811,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2964,7 +2964,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3098,7 +3098,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c1bd930204518d34490b0a65ce52cfe2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3582,7 +3582,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3609,7 +3609,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3764,7 +3764,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4061,7 +4061,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4508,7 +4508,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4601,7 +4601,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a324ee6c20ae102438570789022106a8, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4661,7 +4661,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5320,7 +5320,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5380,7 +5380,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5925,7 +5925,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6364,7 +6364,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6612,7 +6612,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 368f403b73078e24fbc0ed5b0fea1b1c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6827,7 +6827,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7079,7 +7079,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 65cd80b0cc4229943acab26732d161a6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7160,7 +7160,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7247,7 +7247,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7307,7 +7307,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7645,7 +7645,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7765,7 +7765,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 82e315b06b317424fa171ba1079b64d3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 27 - 27
Assets/Resource/Prefab/PrefabUI/GroupB.prefab

@@ -3897,7 +3897,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4129,7 +4129,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4445,7 +4445,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b53e691e4c8fc5c45b3b5436708d5c4d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4658,7 +4658,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d2b776327fb8f9244af6766cf0f5e859, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4707,7 +4707,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4865,7 +4865,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4973,7 +4973,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5045,7 +5045,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5407,7 +5407,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5589,7 +5589,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5629,7 +5629,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6568,7 +6568,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7284,7 +7284,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7338,7 +7338,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7554,7 +7554,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7603,7 +7603,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 495ae6d1453b4e545a4e879a262f799f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7630,7 +7630,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 20af4e62d33cc694f8754f2105934ea0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7657,7 +7657,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7951,7 +7951,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6d7a9b26c5292f24da196644249fb8b0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8029,7 +8029,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2b7c9c874516dee428611dc70e42c56d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8129,7 +8129,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8219,7 +8219,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4b2aa598a8b767740afbd328b6a4f6af, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8576,7 +8576,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8718,7 +8718,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8781,7 +8781,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -9155,7 +9155,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -9258,7 +9258,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c11fa6575b949f14fab3373b1a463232, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 12 - 12
Assets/Resource/Prefab/PrefabUI/GroupC.prefab

@@ -816,7 +816,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -843,7 +843,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -903,7 +903,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -986,7 +986,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8579c10a92c46534f901dc172092f4e7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1612,7 +1612,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1652,7 +1652,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b53e691e4c8fc5c45b3b5436708d5c4d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1679,7 +1679,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 14decf5fdd820524eb3435822116d326, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1824,7 +1824,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: c8e673ebab81ff34e95ecff941a31312, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b2b6e02f3768cb941af8c5519ca9506c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1862,7 +1862,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4b2aa598a8b767740afbd328b6a4f6af, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1922,7 +1922,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2018,7 +2018,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: c8e673ebab81ff34e95ecff941a31312, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3a966c70f70c2044fbcf3c611eb7b0fa, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2288,7 +2288,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4000c78c117d00d41900cdd8f4b505f4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 12 - 12
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -1722,7 +1722,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2048,7 +2048,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8579c10a92c46534f901dc172092f4e7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2259,7 +2259,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2327,7 +2327,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2514,7 +2514,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2750,7 +2750,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2870,7 +2870,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3503,7 +3503,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3771,7 +3771,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4122,7 +4122,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4209,7 +4209,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4329,7 +4329,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 15 - 15
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -1540,7 +1540,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cc406256d3e6c6544af7f91fee3855cd, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2053,7 +2053,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2148,7 +2148,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 20af4e62d33cc694f8754f2105934ea0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2235,7 +2235,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b070139c782da6b4cb35cc70c7d66274, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2405,7 +2405,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300014, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cde66b70acacf1a47b8a81614f11dcfb, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2459,7 +2459,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300016, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 787176d36456ad840ba878659cabcea0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2587,7 +2587,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2799,7 +2799,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4b2aa598a8b767740afbd328b6a4f6af, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3110,7 +3110,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300002, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2b7c9c874516dee428611dc70e42c56d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3222,7 +3222,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c1bd930204518d34490b0a65ce52cfe2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3249,7 +3249,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300012, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 2304504aea964d54c8d62a15dc5067bf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3593,7 +3593,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d2b776327fb8f9244af6766cf0f5e859, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3732,7 +3732,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: 8cb55b7599a957a40906b7bf939ce8b4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6d7a9b26c5292f24da196644249fb8b0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3792,7 +3792,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4015,7 +4015,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: 58bd33602e3d47547800c82dd95c291b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: c11fa6575b949f14fab3373b1a463232, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 9 - 0
Assets/Resource/Sprite/Atlas.meta

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

+ 0 - 0
Assets/Resource/Sprite/SpriteUI/Atlas.png → Assets/Resource/Sprite/Atlas/Atlas.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/Atlas.png.meta → Assets/Resource/Sprite/Atlas/Atlas.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas1.png → Assets/Resource/Sprite/Atlas/BtnAtlas1.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas1.png.meta → Assets/Resource/Sprite/Atlas/BtnAtlas1.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas2.png → Assets/Resource/Sprite/Atlas/BtnAtlas2.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas2.png.meta → Assets/Resource/Sprite/Atlas/BtnAtlas2.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas3.png → Assets/Resource/Sprite/Atlas/BtnAtlas3.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/BtnAtlas3.png.meta → Assets/Resource/Sprite/Atlas/BtnAtlas3.png.meta


+ 0 - 0
Assets/Resource/Sprite/Garden/ElfAtlas.png → Assets/Resource/Sprite/Atlas/ElfAtlas.png


+ 0 - 0
Assets/Resource/Sprite/Garden/ElfAtlas.png.meta → Assets/Resource/Sprite/Atlas/ElfAtlas.png.meta


+ 0 - 0
Assets/Resource/Sprite/Garden/FlowerAtlas.png → Assets/Resource/Sprite/Atlas/FlowerAtlas.png


+ 0 - 0
Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta → Assets/Resource/Sprite/Atlas/FlowerAtlas.png.meta


+ 0 - 0
Assets/Resource/Sprite/Garden/FlowerItemAtlas1.png → Assets/Resource/Sprite/Atlas/FlowerItemAtlas1.png


+ 0 - 0
Assets/Resource/Sprite/Garden/FlowerItemAtlas1.png.meta → Assets/Resource/Sprite/Atlas/FlowerItemAtlas1.png.meta


+ 0 - 0
Assets/Resource/Sprite/Garden/GardenAtlas1.png → Assets/Resource/Sprite/Atlas/GardenAtlas1.png


+ 0 - 0
Assets/Resource/Sprite/Garden/GardenAtlas1.png.meta → Assets/Resource/Sprite/Atlas/GardenAtlas1.png.meta


+ 0 - 0
Assets/Resource/Sprite/Garden/GardenAtlas2.png → Assets/Resource/Sprite/Atlas/GardenAtlas2.png


+ 0 - 0
Assets/Resource/Sprite/Garden/GardenAtlas2.png.meta → Assets/Resource/Sprite/Atlas/GardenAtlas2.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png → Assets/Resource/Sprite/Atlas/PanelAtlas1.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png.meta → Assets/Resource/Sprite/Atlas/PanelAtlas1.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/PanelAtlas2.png → Assets/Resource/Sprite/Atlas/PanelAtlas2.png


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/PanelAtlas2.png.meta → Assets/Resource/Sprite/Atlas/PanelAtlas2.png.meta


+ 0 - 0
Assets/Resource/Sprite/SpriteUI/Skill/SkillAtlas.png → Assets/Resource/Sprite/Atlas/SkillAtlas.png


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