ソースを参照

修复-IOS帧率低

jet 8 年 前
コミット
8a47a48d6f
67 ファイル変更626 行追加660 行削除
  1. BIN
      Assets/Atlas.png
  2. 0 142
      Assets/Atlas.png.meta
  3. 0 54
      Assets/Image102.cs
  4. 0 12
      Assets/Image102.cs.meta
  5. 0 117
      Assets/NewImageEffectShader.shader
  6. 0 9
      Assets/NewImageEffectShader.shader.meta
  7. BIN
      Assets/Resource/Logo.unity
  8. BIN
      Assets/Resource/Prefab/Object/Flower.prefab
  9. BIN
      Assets/Resource/Prefab/PrefabUI/AchieveItem.prefab
  10. BIN
      Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab
  11. BIN
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  12. BIN
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  13. BIN
      Assets/Resource/Prefab/PrefabUI/GroupC.prefab
  14. BIN
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  15. BIN
      Assets/Resource/Prefab/PrefabUI/SkillItem.prefab
  16. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/4大技能1.png.meta
  17. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/4大技能2.png.meta
  18. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/4大技能3.png.meta
  19. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/4大技能4.png.meta
  20. BIN
      Assets/Resource/Sprite/SpriteUI/Skill/Skill.png
  21. 520 0
      Assets/Resource/Sprite/SpriteUI/Skill/Skill.png.meta
  22. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/红-公园.png.meta
  23. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/红-彩虹.png.meta
  24. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/红-樱花树.png.meta
  25. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/红-黄鹂鸟.png.meta
  26. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/绿-免费金币.png.meta
  27. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/绿-繁花似锦.png.meta
  28. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包1.png.meta
  29. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包2.png.meta
  30. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包3.png.meta
  31. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-中级包.png.meta
  32. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-中量钻石.png.meta
  33. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-免费钻.png.meta
  34. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-初级包.png.meta
  35. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-大量钻石.png.meta
  36. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-小量钻石.png.meta
  37. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/蓝-高级包.png.meta
  38. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-白色蜜蜂.png.meta
  39. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-白蝴蝶.png.meta
  40. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-紫色蜜蜂.png.meta
  41. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-紫蝴蝶.png.meta
  42. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-红色蜜蜂.png.meta
  43. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-红蝴蝶.png.meta
  44. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-蓝色蜜蜂.png.meta
  45. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-蓝蝴蝶.png.meta
  46. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-黄色蜜蜂.png.meta
  47. 1 1
      Assets/Resource/Sprite/SpriteUI/Skill/黄-黄蝴蝶.png.meta
  48. 3 0
      Assets/Script/Manage/Initializer.cs
  49. 20 1
      Assets/Script/Manage/ManaDebug.cs
  50. 1 1
      Assets/Script/Manage/ManaReso.cs
  51. 8 8
      Assets/Script/Tool/Auxiliary.cs
  52. 0 40
      Assets/Script/Tool/Bundle.cs
  53. 37 15
      Assets/Script/Tool/UI/BestfitText.cs
  54. 0 100
      Assets/SpriteRender101.shader
  55. 0 9
      Assets/SpriteRender101.shader.meta
  56. BIN
      Assets/Sr101Mat.mat
  57. 0 8
      Assets/Sr101Mat.mat.meta
  58. 0 81
      Assets/Test.cs
  59. 0 12
      Assets/Test.cs.meta
  60. BIN
      Assets/TestMat.mat
  61. 0 8
      Assets/TestMat.mat.meta
  62. BIN
      ProjectSettings/EditorSettings.asset
  63. BIN
      ProjectSettings/GraphicsSettings.asset
  64. BIN
      ProjectSettings/ProjectSettings.asset
  65. 1 1
      ProjectSettings/ProjectVersion.txt
  66. BIN
      ProjectSettings/QualitySettings.asset
  67. 6 12
      ToList.txt

BIN
Assets/Atlas.png


+ 0 - 142
Assets/Atlas.png.meta

@@ -1,142 +0,0 @@
-fileFormatVersion: 2
-guid: d75bdd14a819bf541a63f96c6eb5d8df
-timeCreated: 1498627739
-licenseType: Pro
-TextureImporter:
-  fileIDToRecycleName:
-    21300000: Atlas_0
-    21300002: Atlas_1
-    21300004: Atlas_2
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Standalone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: Atlas_0
-      rect:
-        serializedVersion: 2
-        x: 5
-        y: 108
-        width: 194
-        height: 181
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: 0
-    - serializedVersion: 2
-      name: Atlas_1
-      rect:
-        serializedVersion: 2
-        x: 5
-        y: 10
-        width: 89
-        height: 88
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: 0
-    - serializedVersion: 2
-      name: Atlas_2
-      rect:
-        serializedVersion: 2
-        x: 104
-        y: 11
-        width: 88
-        height: 87
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: 0
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 54
Assets/Image102.cs

@@ -1,54 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Collections;
-using System.Collections.Generic;
-
-public class Image102 : Image 
-{
-    #region 变量
-
-    public Vector2 LowerLeftUV;
-    public Vector2 LowerRightUV;
-    public Vector2 UpperLeftUV;
-    public Vector2 UpperRightUV;
-
-    #endregion
-
-    protected override void OnPopulateMesh(VertexHelper toFill)
-    {
-        base.OnPopulateMesh(toFill);
-
-        List<UIVertex> verticeList = new List<UIVertex>();
-
-        toFill.GetUIVertexStream(verticeList);
-
-        UIVertex vertex0 = verticeList[0];
-        UIVertex vertex1 = verticeList[1];
-        UIVertex vertex2 = verticeList[2];
-        UIVertex vertex3 = verticeList[4];
-
-        vertex0.uv0 = LowerLeftUV;
-        vertex1.uv0 = UpperLeftUV;
-        vertex2.uv0 = UpperRightUV;
-        vertex3.uv0 = LowerRightUV;
-
-        //Debug.Log(vertex0.uv0);
-        //Debug.Log(vertex1.uv0);
-        //Debug.Log(vertex2.uv0);
-        //Debug.Log(vertex3.uv0);
-
-        UIVertex[] vertices = new UIVertex[]
-        {
-            vertex0,
-            vertex1,
-            vertex2,
-            vertex3,
-        };
-
-
-        toFill.Clear();
-
-        toFill.AddUIVertexQuad(vertices);
-    }
-}

+ 0 - 12
Assets/Image102.cs.meta

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

+ 0 - 117
Assets/NewImageEffectShader.shader

@@ -1,117 +0,0 @@
-Shader "DashGame/DefaultUI"
-{
-	Properties
-	{
-		[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
-		_Color ("Tint", Color) = (1,1,1,1)
-		
-		_StencilComp ("Stencil Comparison", Float) = 8
-		_Stencil ("Stencil ID", Float) = 0
-		_StencilOp ("Stencil Operation", Float) = 0
-		_StencilWriteMask ("Stencil Write Mask", Float) = 255
-		_StencilReadMask ("Stencil Read Mask", Float) = 255
-
-		_ColorMask ("Color Mask", Float) = 15
-
-		[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
-	}
-
-	SubShader
-	{
-		Tags
-		{ 
-			"Queue"="Transparent" 
-			"IgnoreProjector"="True" 
-			"RenderType"="Transparent" 
-			"PreviewType"="Plane"
-			"CanUseSpriteAtlas"="True"
-		}
-		
-		Stencil
-		{
-			Ref [_Stencil]
-			Comp [_StencilComp]
-			Pass [_StencilOp] 
-			ReadMask [_StencilReadMask]
-			WriteMask [_StencilWriteMask]
-		}
-
-		Cull Off
-		Lighting Off
-		ZWrite Off
-		ZTest [unity_GUIZTestMode]
-		Blend SrcAlpha OneMinusSrcAlpha
-		ColorMask [_ColorMask]
-
-		Pass
-		{
-			Name "Default"
-			CGPROGRAM
-			#pragma vertex vert
-			#pragma fragment frag
-			#pragma target 2.0
-
-			#include "UnityCG.cginc"
-			#include "UnityUI.cginc"
-
-			#pragma multi_compile __ UNITY_UI_ALPHACLIP
-			
-			struct appdata_t
-			{
-				float4 vertex   : POSITION;
-				float4 color    : COLOR;
-				float2 texcoord : TEXCOORD0;
-				UNITY_VERTEX_INPUT_INSTANCE_ID
-			};
-
-			struct v2f
-			{
-				float4 vertex   : SV_POSITION;
-				fixed4 color    : COLOR;
-				float2 texcoord  : TEXCOORD0;
-				float4 worldPosition : TEXCOORD1;
-				UNITY_VERTEX_OUTPUT_STEREO
-			};
-
-			float _MinX;
-			float _MinY;
-			float _RatioX;
-			float _RatioY;
-			fixed4 _Color;
-			fixed4 _TextureSampleAdd;
-			float4 _ClipRect;
-
-			v2f vert(appdata_t IN)
-			{
-				v2f OUT;
-				UNITY_SETUP_INSTANCE_ID(IN);
-				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
-				OUT.worldPosition = IN.vertex;
-				OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
-
-				OUT.texcoord = IN.texcoord;
-				
-				OUT.color = IN.color * _Color;
-				return OUT;
-			}
-
-			sampler2D _MainTex;
-
-			fixed4 frag(v2f IN) : SV_Target
-			{
-				IN.texcoord = float2(_MinX,_MinY)+float2(IN.texcoord.x*_RatioX,IN.texcoord.y*_RatioY);
-
-				half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
-				
-				color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
-				
-				#ifdef UNITY_UI_ALPHACLIP
-				clip (color.a - 0.001);
-				#endif
-
-				return color;
-			}
-		ENDCG
-		}
-	}
-}

+ 0 - 9
Assets/NewImageEffectShader.shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b7dc877220e2d094c902809f94a039bd
-timeCreated: 1498633691
-licenseType: Pro
-ShaderImporter:
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Resource/Logo.unity


BIN
Assets/Resource/Prefab/Object/Flower.prefab


BIN
Assets/Resource/Prefab/PrefabUI/AchieveItem.prefab


BIN
Assets/Resource/Prefab/PrefabUI/FlowerItem.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupB.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupC.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupD.prefab


BIN
Assets/Resource/Prefab/PrefabUI/SkillItem.prefab


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

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/4大技能2.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/4大技能3.png.meta

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

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

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

BIN
Assets/Resource/Sprite/SpriteUI/Skill/Skill.png


+ 520 - 0
Assets/Resource/Sprite/SpriteUI/Skill/Skill.png.meta

@@ -0,0 +1,520 @@
+fileFormatVersion: 2
+guid: ff54675045a50274cb3e0094de4954e5
+timeCreated: 1498706521
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: "4\u5927\u6280\u80FD4"
+    21300002: "4\u5927\u6280\u80FD3"
+    21300004: "\u7EFF-\u514D\u8D39\u91D1\u5E01"
+    21300006: "\u7EFF-\u91D1\u5E01\u53051"
+    21300008: "\u9EC4-\u9EC4\u8272\u871C\u8702"
+    21300010: "\u9EC4-\u84DD\u8774\u8776"
+    21300012: "\u9EC4-\u767D\u8272\u871C\u8702"
+    21300014: "\u84DD-\u5927\u91CF\u94BB\u77F3"
+    21300016: "\u7EA2-\u516C\u56ED"
+    21300018: "\u9EC4-\u7D2B\u8272\u871C\u8702"
+    21300020: "\u84DD-\u9AD8\u7EA7\u5305"
+    21300022: "\u9EC4-\u9EC4\u8774\u8776"
+    21300024: "4\u5927\u6280\u80FD2"
+    21300026: "\u9EC4-\u767D\u8774\u8776"
+    21300028: "\u84DD-\u4E2D\u91CF\u94BB\u77F3"
+    21300030: "4\u5927\u6280\u80FD1"
+    21300032: "\u84DD-\u521D\u7EA7\u5305"
+    21300034: "\u7EA2-\u5F69\u8679"
+    21300036: "\u84DD-\u4E2D\u7EA7\u5305"
+    21300038: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
+    21300040: "\u84DD-\u514D\u8D39\u94BB"
+    21300042: "\u84DD-\u5C0F\u91CF\u94BB\u77F3"
+    21300044: "\u7EA2-\u9EC4\u9E42\u9E1F"
+    21300046: "\u7EFF-\u91D1\u5E01\u53052"
+    21300048: "\u7EFF-\u91D1\u5E01\u53053"
+    21300050: "\u9EC4-\u7EA2\u8272\u871C\u8702"
+    21300052: "\u9EC4-\u7EA2\u8774\u8776"
+    21300054: "\u7EA2-\u6A31\u82B1\u6811"
+    21300056: "\u9EC4-\u7D2B\u8774\u8776"
+    21300058: "\u9EC4-\u84DD\u8272\u871C\u8702"
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD4"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD3"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u514D\u8D39\u91D1\u5E01"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 770
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53051"
+      rect:
+        serializedVersion: 2
+        x: 694
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u9EC4\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 886
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u84DD\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1078
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u767D\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 1270
+        y: 808
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u5927\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 540
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u516C\u56ED"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 540
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7D2B\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 578
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u9AD8\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 578
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u9EC4\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD2"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u767D\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1232
+        y: 616
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u4E2D\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 310
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "4\u5927\u6280\u80FD1"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 310
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u521D\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 386
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u5F69\u8679"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 386
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u4E2D\u7EA7\u5305"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 424
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 424
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u514D\u8D39\u94BB"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 425
+        width: 188
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u84DD-\u5C0F\u91CF\u94BB\u77F3"
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 80
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u9EC4\u9E42\u9E1F"
+      rect:
+        serializedVersion: 2
+        x: 234
+        y: 80
+        width: 226
+        height: 226
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53052"
+      rect:
+        serializedVersion: 2
+        x: 464
+        y: 194
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EFF-\u91D1\u5E01\u53053"
+      rect:
+        serializedVersion: 2
+        x: 656
+        y: 194
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7EA2\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 232
+        width: 188
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7EA2\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 1040
+        y: 232
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u7EA2-\u6A31\u82B1\u6811"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 233
+        width: 187
+        height: 188
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u7D2B\u8774\u8776"
+      rect:
+        serializedVersion: 2
+        x: 848
+        y: 41
+        width: 188
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u9EC4-\u84DD\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 1231
+        y: 42
+        width: 187
+        height: 187
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/红-公园.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/红-彩虹.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/红-樱花树.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/红-黄鹂鸟.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/绿-免费金币.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/绿-繁花似锦.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包1.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包2.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/绿-金币包3.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-中级包.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-中量钻石.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-免费钻.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-初级包.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-大量钻石.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-小量钻石.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/蓝-高级包.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-白色蜜蜂.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-白蝴蝶.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-紫色蜜蜂.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-紫蝴蝶.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-红色蜜蜂.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-红蝴蝶.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-蓝色蜜蜂.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-蓝蝴蝶.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-黄色蜜蜂.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/SpriteUI/Skill/黄-黄蝴蝶.png.meta

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

+ 3 - 0
Assets/Script/Manage/Initializer.cs

@@ -27,6 +27,8 @@ public class Initializer : MonoBehaviour
 
     private void Awake()
     {
+        Application.targetFrameRate = 60;
+
         DontDestroyOnLoad(gameObject);
 
         ManaServer.Login(ManaCenter.LoginCallbackInitial);
@@ -44,6 +46,7 @@ public class Initializer : MonoBehaviour
         }
 
         gameObject.AddComponent<ManaIAP>();
+        gameObject.AddComponent<ManaDebug>();
 
         gameObject.AddScript<Auxiliary>();
         gameObject.AddScript<ManaData>();

+ 20 - 1
Assets/Script/Manage/ManaDebug.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 
 using Random = UnityEngine.Random;
 
-public class ManaDebug
+public class ManaDebug : MonoBehaviour
 {
     #region 变量
 
@@ -29,8 +29,27 @@ public class ManaDebug
 
     private static Text Lab_;
 
+
+    public int Counter;
+    public float Timer;
+
     #endregion
 
+    public void Update()
+    {
+        //Timer += Time.deltaTime;
+        //Counter++;
+
+        //if (Timer >= 1)
+        //{
+        //    Log("FrameRate " + Counter);
+
+        //    Timer = 0;
+        //    Counter = 0;
+        //}
+    }
+
+
     public static void Log(string message)
     {
         if (Lab == null)

+ 1 - 1
Assets/Script/Manage/ManaReso.cs

@@ -420,7 +420,7 @@ public class ManaReso : Regist
             {
                 ObjectPool.UniqueAdd(objType, new List<Transform>());
             }
-
+            
             return (T) obj;
         }
         else

+ 8 - 8
Assets/Script/Tool/Auxiliary.cs

@@ -125,18 +125,18 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            foreach (var kv in ManaGarden.FlowerInfoDic)
-            {
-                if (kv.Value.Unlock == false)
-                {
-                    kv.Value.Unlock = true;
-                }
-            }
+            //foreach (var kv in ManaGarden.FlowerInfoDic)
+            //{
+            //    if (kv.Value.Unlock == false)
+            //    {
+            //        kv.Value.Unlock = true;
+            //    }
+            //}
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-           //ManaMiniGame.GameTimer = 45;
+            //Application.targetFrameRate = 30;
         }
 
         if (Input.GetKeyDown(KeyCode.C))

+ 0 - 40
Assets/Script/Tool/Bundle.cs

@@ -370,46 +370,6 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad<TextAsset>("Closet_ske", Folder.Config);
             ManaReso.AddAsyncLoad<Texture2D>("Closet_texture", Folder.Scene);
 
-            ManaReso.AddAsyncLoad<Sprite>("4大技能1", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能2", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能3", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能4", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能1副", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能2副", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能3副", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("4大技能4副", Folder.UI);
-
-            ManaReso.AddAsyncLoad<Sprite>("红-公园", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("红-彩虹", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("红-樱花树", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("红-灌木", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("红-黄莺鸟", Folder.UI);
-
-            ManaReso.AddAsyncLoad<Sprite>("绿-免费金币", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("绿-繁花似锦", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("绿-金币包1", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("绿-金币包2", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("绿-金币包3", Folder.UI);
-
-            ManaReso.AddAsyncLoad<Sprite>("蓝-中级包", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-免费钻", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-高级包", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-初级包", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-中量钻石", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-大量钻石", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("蓝-小量钻石", Folder.UI);
-
-            ManaReso.AddAsyncLoad<Sprite>("黄-白蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-紫蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-红蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-蓝蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-黄蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-白色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-紫色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-红色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-蓝色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad<Sprite>("黄-黄色蜜蜂", Folder.UI);
-
             ManaReso.AddAsyncLoadAtlas2();
         }
 

+ 37 - 15
Assets/Script/Tool/UI/BestfitText.cs

@@ -41,7 +41,10 @@ public class BestfitText : Text
         bool expand = false;
 
         int antiCrush = 0;
-        
+
+        VerticalMinSize = 1;
+        VerticalMaxSize = 29;
+
         while (true)
         {
             antiCrush++;
@@ -59,12 +62,27 @@ public class BestfitText : Text
             {
                 textGenerationSettings.fontSize--;
 
-                if (expand)
+                if (textGenerationSettings.fontSize < VerticalMinSize)
                 {
+                    textGenerationSettings.fontSize = VerticalMinSize;
+
                     break;
                 }
-
-                shrink = true;
+                else if (textGenerationSettings.fontSize > VerticalMaxSize)
+                {
+                    textGenerationSettings.fontSize = VerticalMaxSize;
+                }
+                else
+                {
+                    if (expand)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        shrink = true;
+                    }
+                }
             }
             else if (bestHeight < rectTransform.rect.size.y * canvas.scaleFactor)
             {
@@ -72,10 +90,23 @@ public class BestfitText : Text
                 {
                     break;
                 }
-
+                
                 textGenerationSettings.fontSize++;
 
-                expand = true;
+                if (textGenerationSettings.fontSize < VerticalMinSize)
+                {
+                    textGenerationSettings.fontSize = VerticalMinSize;
+                }
+                else if (textGenerationSettings.fontSize >= VerticalMaxSize)
+                {
+                    textGenerationSettings.fontSize = VerticalMaxSize;
+
+                    break;
+                }
+                else
+                {
+                    expand = true;
+                }
             }
             else if (bestHeight.Equal(rectTransform.rect.size.y * canvas.scaleFactor))
             {
@@ -83,15 +114,6 @@ public class BestfitText : Text
             }
         }
 
-        //if (textGenerationSettings.fontSize < VerticalMinSize)
-        //{
-        //    textGenerationSettings.fontSize = VerticalMinSize;
-        //}
-        //else if (textGenerationSettings.fontSize > VerticalMaxSize)
-        //{
-        //    textGenerationSettings.fontSize = VerticalMaxSize;
-        //}
-
         fontSize = textGenerationSettings.fontSize;
     }
 

+ 0 - 100
Assets/SpriteRender101.shader

@@ -1,100 +0,0 @@
-Shader "DashGame/SpriteRenderer101"
-{
-	Properties
-	{
-		[PerRendererData]_Alpha ("Alpha", float) = 0
-
-		[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
-		_Color ("Tint", Color) = (1,1,1,1)
-		[MaterialToggle] PixelSnap ("Pixel snap", Float) = 0
-	}
-
-	SubShader
-	{
-		Tags
-		{ 
-			"Queue"="Transparent" 
-			"IgnoreProjector"="True" 
-			"RenderType"="Transparent" 
-			"PreviewType"="Plane"
-			"CanUseSpriteAtlas"="True"
-		}
-
-		Cull Off
-		Lighting Off
-		ZWrite Off
-		//Blend One OneMinusSrcAlpha
-		Blend SrcAlpha OneMinusSrcAlpha
-
-		Pass
-		{
-		CGPROGRAM
-			#pragma vertex vert
-			#pragma fragment frag
-			#pragma target 2.0
-			#pragma multi_compile _ PIXELSNAP_ON
-			#pragma multi_compile _ ETC1_EXTERNAL_ALPHA
-			#include "UnityCG.cginc"
-			
-			struct appdata_t
-			{
-				float4 vertex   : POSITION;
-				float4 color    : COLOR;
-				float2 texcoord : TEXCOORD0;
-				UNITY_VERTEX_INPUT_INSTANCE_ID
-			};
-
-			struct v2f
-			{
-				float4 vertex   : SV_POSITION;
-				fixed4 color    : COLOR;
-				float2 texcoord  : TEXCOORD0;
-				UNITY_VERTEX_OUTPUT_STEREO
-			};
-			
-			fixed4 _Color;
-
-			v2f vert(appdata_t IN)
-			{
-				v2f OUT;
-				UNITY_SETUP_INSTANCE_ID(IN);
-				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
-				OUT.vertex = UnityObjectToClipPos(IN.vertex);
-				OUT.texcoord = IN.texcoord;
-				OUT.color = IN.color * _Color;
-				#ifdef PIXELSNAP_ON
-				OUT.vertex = UnityPixelSnap (OUT.vertex);
-				#endif
-
-				return OUT;
-			}
-
-			float _Alpha;
-			sampler2D _MainTex;
-			sampler2D _AlphaTex;
-
-			fixed4 SampleSpriteTexture (float2 uv)
-			{
-				fixed4 color = tex2D (_MainTex, uv);
-
-#if ETC1_EXTERNAL_ALPHA
-				// get the color from an external texture (usecase: Alpha support for ETC1 on android)
-				color.a = tex2D (_AlphaTex, uv).r;
-#endif //ETC1_EXTERNAL_ALPHA
-
-				return color;
-			}
-
-			fixed4 frag(v2f IN) : SV_Target
-			{
-				fixed4 c = SampleSpriteTexture (IN.texcoord) * IN.color;
-				c.rgb *= c.a;
-
-				c.a = _Alpha;
-
-				return c;
-			}
-		ENDCG
-		}
-	}
-}

+ 0 - 9
Assets/SpriteRender101.shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 860881a4d9814c54eaecf822b772f95f
-timeCreated: 1498638045
-licenseType: Pro
-ShaderImporter:
-  defaultTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Sr101Mat.mat


+ 0 - 8
Assets/Sr101Mat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 745b46b4473ab08418783b01ff1fafdc
-timeCreated: 1498638225
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 81
Assets/Test.cs

@@ -1,81 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-using System.Collections;
-
-public class Test : Regist 
-{
-    #region 变量
-
-    public Image Image1;
-    public Image Image2;
-    public Image Image3;
-
-	public Sprite Sprite1;
-	public Sprite Sprite2;
-	public Sprite Sprite3;
-
-	public SpriteRenderer Sr1;
-	public SpriteRenderer Sr2;
-	public SpriteRenderer Sr3;
-
-    #endregion
-
-    public void Awake()
-    {
-        StartCoroutine(TestLoad());
-    }
-
-    public IEnumerator TestLoad()
-    {
-        WWW www = new WWW(Auxiliary.GetStreamPath() + "/Bundle/Windows/test");
-
-        while (!www.isDone)
-        {
-            yield return null;
-        }
-
-        if (string.IsNullOrEmpty(www.error))
-        {
-            Sprite[] sprites = www.assetBundle.LoadAllAssets<Sprite>();
-
-            //			MaterialPropertyBlock materialPropertyBlock = new MaterialPropertyBlock ();
-            //
-            //			Sr1.GetPropertyBlock (materialPropertyBlock);
-            //
-            //			materialPropertyBlock.SetFloat ("_Alpha", 0);
-            //
-            //			Sr1.SetPropertyBlock (materialPropertyBlock);
-            //        	
-            //
-            //			materialPropertyBlock = new MaterialPropertyBlock ();
-            //
-            //			Sr2.GetPropertyBlock (materialPropertyBlock);
-            //
-            //			materialPropertyBlock.SetFloat ("_Alpha", 0.5f);
-            //
-            //			Sr2.SetPropertyBlock (materialPropertyBlock);
-            //
-            //
-            //			materialPropertyBlock = new MaterialPropertyBlock ();
-            //
-            //			Sr3.GetPropertyBlock (materialPropertyBlock);
-            //
-            //			materialPropertyBlock.SetFloat ("_Alpha", 1f);
-            //
-            //			Sr3.SetPropertyBlock (materialPropertyBlock);
-
-            //Sr1.sprite = sprites[0];
-            //Sr2.sprite = sprites[1];
-            //Sr3.sprite = sprites[2];
-
-            Image1.sprite = sprites[0];
-            Image2.sprite = sprites[1];
-            Image3.sprite = sprites[2];
-        }
-        else
-        {
-            Debug.Log(www.error);
-        }
-    }
-}

+ 0 - 12
Assets/Test.cs.meta

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

BIN
Assets/TestMat.mat


+ 0 - 8
Assets/TestMat.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d5b445e5875f1404289664e1b328499a
-timeCreated: 1498633691
-licenseType: Pro
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
ProjectSettings/EditorSettings.asset


BIN
ProjectSettings/GraphicsSettings.asset


BIN
ProjectSettings/ProjectSettings.asset


+ 1 - 1
ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 5.5.2f1

BIN
ProjectSettings/QualitySettings.asset


+ 6 - 12
ToList.txt

@@ -1,24 +1,18 @@
-floweritem flower flowercard skillitem skillbar achieveitem signitem
+IPhone的图集有问题
 
-debugmode中的图集
-
-删掉TestBundle
-
-Prefab中的图片和Bundle中的图片不要重复
-
-图集-有异步加载和无异步加载的情况
 
-小游戏说明加个padding
+分享appid申请
 
+debugmode中的图集
 
-分享appid申请
+VerticalBestfit计算次数太多时性能低
 
 
 //还原PlayerConfig
 
-关闭调试界面
+//关闭调试界面
 
-关闭调试按键
+//关闭调试按键
 
 //关闭DebugMode