Browse Source

Drawcall优化

liuqilin 7 years ago
parent
commit
331a32c28e
100 changed files with 379 additions and 484 deletions
  1. 10 18
      Assets/AtlasUtility/AtlasReferenceTable.txt
  2. 15 4
      Assets/AtlasUtility/SerializeObject.prefab
  3. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  4. 0 0
      Assets/Resource/Animations/人物动画/stand_tex.json
  5. BIN
      Assets/Resource/Animations/人物动画/stand_texture.png
  6. 180 164
      Assets/Resource/Animations/人物动画/stand_texture.png.meta
  7. 10 1
      Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityFactory.cs
  8. 3 4
      Assets/Resource/Logo.unity
  9. 1 1
      Assets/Resource/Prefab/Object/Garden.prefab
  10. 42 38
      Assets/Resource/Prefab/Object/Player.prefab
  11. 1 1
      Assets/Resource/Shader/GrayMesh.shader.meta
  12. 1 1
      Assets/Resource/Shader/GrayMeshMat.mat.meta
  13. BIN
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png
  14. 30 166
      Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta
  15. 1 1
      Assets/Resource/Sprite/Editor/SpriteUI/领取物品发光转动.png.meta
  16. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Fertilize.png.meta
  17. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower1.png.meta
  18. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower10.png.meta
  19. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower11.png.meta
  20. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower12.png.meta
  21. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower13.png.meta
  22. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower14.png.meta
  23. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower15.png.meta
  24. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower16.png.meta
  25. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower17.png.meta
  26. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower18.png.meta
  27. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower19.png.meta
  28. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower2.png.meta
  29. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower20.png.meta
  30. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower21.png.meta
  31. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower22.png.meta
  32. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower23.png.meta
  33. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower24.png.meta
  34. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower25.png.meta
  35. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower26.png.meta
  36. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower27.png.meta
  37. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower28.png.meta
  38. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower29.png.meta
  39. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower3.png.meta
  40. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower30.png.meta
  41. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower31.png.meta
  42. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower32.png.meta
  43. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower33.png.meta
  44. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower34.png.meta
  45. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower35.png.meta
  46. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower36.png.meta
  47. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower4.png.meta
  48. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower5.png.meta
  49. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower6.png.meta
  50. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower7.png.meta
  51. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower8.png.meta
  52. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Flower9.png.meta
  53. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Rip.png.meta
  54. 1 1
      Assets/Resource/Sprite/Mobile/Garden/Water.png.meta
  55. 1 1
      Assets/Resource/Sprite/Mobile/Garden/云朵.png.meta
  56. 1 1
      Assets/Resource/Sprite/Mobile/Garden/大金币图标.png.meta
  57. 1 1
      Assets/Resource/Sprite/Mobile/Garden/宝箱.png.meta
  58. 1 1
      Assets/Resource/Sprite/Mobile/Garden/技能树1.png.meta
  59. 1 1
      Assets/Resource/Sprite/Mobile/Garden/技能树2.png.meta
  60. 1 1
      Assets/Resource/Sprite/Mobile/Garden/技能添加彩虹.png.meta
  61. 1 1
      Assets/Resource/Sprite/Mobile/Garden/技能黄鹂鸟.png.meta
  62. 1 1
      Assets/Resource/Sprite/Mobile/Garden/描边1.png.meta
  63. 1 1
      Assets/Resource/Sprite/Mobile/Garden/描边2.png.meta
  64. 1 1
      Assets/Resource/Sprite/Mobile/Garden/提示图标底板.png.meta
  65. 1 1
      Assets/Resource/Sprite/Mobile/Garden/未开垦图标.png.meta
  66. 1 1
      Assets/Resource/Sprite/Mobile/Garden/游戏等级评分.png.meta
  67. 1 1
      Assets/Resource/Sprite/Mobile/Garden/花园1号.png.meta
  68. 1 1
      Assets/Resource/Sprite/Mobile/Garden/花园2号.png.meta
  69. 1 1
      Assets/Resource/Sprite/Mobile/Garden/花园3号.png.meta
  70. 1 1
      Assets/Resource/Sprite/Mobile/Garden/花园4号.png.meta
  71. 1 1
      Assets/Resource/Sprite/Mobile/Garden/花园5号.png.meta
  72. 1 1
      Assets/Resource/Sprite/Mobile/Garden/钻石大图标.png.meta
  73. 1 1
      Assets/Resource/Sprite/Mobile/Garden/音符1.png.meta
  74. 1 1
      Assets/Resource/Sprite/Mobile/Garden/音符2.png.meta
  75. 1 1
      Assets/Resource/Sprite/Mobile/Garden/音符3.png.meta
  76. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0001.png.meta
  77. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0003.png.meta
  78. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0004.png.meta
  79. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0005.png.meta
  80. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0006.png.meta
  81. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0007.png.meta
  82. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0008.png.meta
  83. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0009.png.meta
  84. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0010.png.meta
  85. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0011.png.meta
  86. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0012.png.meta
  87. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0013.png.meta
  88. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0028.png.meta
  89. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0029.png.meta
  90. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0030.png.meta
  91. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0031.png.meta
  92. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0032.png.meta
  93. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0033.png.meta
  94. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0034.png.meta
  95. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0035.png.meta
  96. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0036.png.meta
  97. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0037.png.meta
  98. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0038.png.meta
  99. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0039.png.meta
  100. 1 1
      Assets/Resource/Sprite/Mobile/Logo/LOGO0041.png.meta

+ 10 - 18
Assets/AtlasUtility/AtlasReferenceTable.txt

@@ -1,19 +1,11 @@
 fileID: 21300000, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 57729e89d40ed604fbe0a319c5d0e467
-fileID: 21300002, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 191aacffa8ebc9e4996cf2bc23e6dfc7
-fileID: 21300004, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 35b3d802264a08e4a97cf8dfd8f4ce67
-fileID: 21300006, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 155422630b0a1014fb4b37563c4f325e
-fileID: 21300008, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: ce27c24b2b22c954ca2348c4d33f48bb
-fileID: 21300010, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: cd07b03a9c0fa8244a7a5815e044a581
-fileID: 21300012, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 1f1210050a455994aaf12f941c81ee57
-fileID: 21300014, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 19831c53e49f01a419213cdc9fdc769c
-fileID: 21300016, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 923c03b8f4f92f0498652d078f1891a1
-fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19
-fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 2d359cf5b038abd499e278b51e50c35f
-fileID: 21300022, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a
-fileID: 21300024, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 3e572d3038c60b649a77c0eec05e4eef
-fileID: 21300026, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: d1fefade0be446946a32e5ce3b44c788
-fileID: 21300028, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: ebd5f0f0e87a8ff4aa467206b880efbc
-fileID: 21300030, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 9713db053daf72743be0fa799d2e101a
-fileID: 21300032, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a9d1487454f0d1244ab051071480b0de
-fileID: 21300034, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4
-fileID: 21300036, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c
+fileID: 21300002, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19
+fileID: 21300004, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 2d359cf5b038abd499e278b51e50c35f
+fileID: 21300006, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a
+fileID: 21300008, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 3e572d3038c60b649a77c0eec05e4eef
+fileID: 21300010, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: d1fefade0be446946a32e5ce3b44c788
+fileID: 21300012, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: ebd5f0f0e87a8ff4aa467206b880efbc
+fileID: 21300014, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 9713db053daf72743be0fa799d2e101a
+fileID: 21300016, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a9d1487454f0d1244ab051071480b0de
+fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4
+fileID: 21300020, guid: 980c962c52249774e9266e82d2496d13|fileID: 21300000, guid: a4a9714d1600e0f4c968a0140ad64e5c

+ 15 - 4
Assets/AtlasUtility/SerializeObject.prefab

@@ -51,9 +51,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5855deb34ca797c4ab1b14de79906080, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PackAtlasFunction: 0
+  PackAtlasFunction: 1
   SliceAtlasFunction: 0
-  SearchReferenceFunction: 0
+  SearchReferenceFunction: 1
   PlatformControllFunction: 0
   ScaleTextureFunction: 0
   DebugFunction: 0
@@ -63,12 +63,23 @@ MonoBehaviour:
   PackPath: "Assets/Resource/Sprite/Editor/PlazaRoom/\u8868\u60C5"
   PackPlan: 1
   PackAtlas: {fileID: 0}
-  TextureList: []
+  TextureList:
+  - {fileID: 2800000, guid: 57729e89d40ed604fbe0a319c5d0e467, type: 3}
+  - {fileID: 2800000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19, type: 3}
+  - {fileID: 2800000, guid: 2d359cf5b038abd499e278b51e50c35f, type: 3}
+  - {fileID: 2800000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a, type: 3}
+  - {fileID: 2800000, guid: 3e572d3038c60b649a77c0eec05e4eef, type: 3}
+  - {fileID: 2800000, guid: d1fefade0be446946a32e5ce3b44c788, type: 3}
+  - {fileID: 2800000, guid: ebd5f0f0e87a8ff4aa467206b880efbc, type: 3}
+  - {fileID: 2800000, guid: 9713db053daf72743be0fa799d2e101a, type: 3}
+  - {fileID: 2800000, guid: a9d1487454f0d1244ab051071480b0de, type: 3}
+  - {fileID: 2800000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
+  - {fileID: 2800000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
   VirtualTextureList: []
   SlicePadding: 0
   SlicePath: Assets/ZTemp
   SliceAtlas: {fileID: 2800000, guid: a27b5521f1d8a6b40ae582a27ff88ca4, type: 3}
-  SearchTarget: {fileID: 2800000, guid: f6baf652ebcd8ed4093bcf36bbc8a007, type: 3}
+  SearchTarget: {fileID: 2800000, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
   ScalePadding: 1
   ScaleFactor: 0.7
   ScalePath: Assets/Resource/Sprite/Mobile/UI

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


File diff suppressed because it is too large
+ 180 - 164
Assets/Resource/Animations/人物动画/stand_texture.png.meta


+ 10 - 1
Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityFactory.cs

@@ -232,14 +232,21 @@ namespace DragonBones
             if (textureAtlasData.texture == null)
             {
                 //var textureAtlas = Resources.Load<Texture2D>(textureAtlasData.imagePath);
+                Initializer.DebugLab.text = "error : ufr0";
                 var textureAtlas = ManaReso.Load<Texture2D>(BundlePath, Folder.Scene);
+                Initializer.DebugLab.text = "error : ufr1";
                 var shader = Shader.Find(defaultShaderName);
+                Initializer.DebugLab.text = "error : ufr2";
                 var material = new Material(shader);
+                Initializer.DebugLab.text = "error : ufr3";
                 Materials.Add(material);
+                Initializer.DebugLab.text = "error : ufr4";
                 material.mainTexture = textureAtlas;
-                
+
+                Initializer.DebugLab.text = "error : ufr5";
                 AtlasDictionary.Add(textureAtlas.name, textureAtlas);
 
+                Initializer.DebugLab.text = "error : ufr6";
                 textureAtlasData.texture = material;
                 textureAtlasData._disposeTexture = true;
             }
@@ -521,8 +528,10 @@ namespace DragonBones
 
             BundlePath = bundlePath;
 
+            Initializer.DebugLab.text = "error : ufl0";
             var textureAtlasData = ParseTextureAtlasData((Dictionary<string, object>)DragonbonesMiniJSON.Json.Deserialize(textureAtlasJSON.text), null, null, 0.0f) as UnityTextureAtlasData;
 
+            Initializer.DebugLab.text = "error : ufl1";
             _refreshTextureAtlas(textureAtlasData);
 
             return textureAtlasData;

+ 3 - 4
Assets/Resource/Logo.unity

@@ -445,10 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

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

@@ -1127,7 +1127,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1666607326924116}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.1399999, z: 0}
+  m_LocalPosition: {x: 0, y: 2.45, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4801148949892274}

+ 42 - 38
Assets/Resource/Prefab/Object/Player.prefab

@@ -49,9 +49,10 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 4684695634194306}
-  - component: {fileID: 212874557632169304}
+  - component: {fileID: 33230025036727492}
+  - component: {fileID: 23195424186609566}
   m_Layer: 0
-  m_Name: ExpressionSr
+  m_Name: ExpressionMeshFilter
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -364,6 +365,37 @@ Transform:
   m_Father: {fileID: 4007373572171746}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23195424186609566
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1223101333050066}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
 --- !u!23 &23591418107166150
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -395,13 +427,20 @@ MeshRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
+--- !u!33 &33230025036727492
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1223101333050066}
+  m_Mesh: {fileID: 0}
 --- !u!33 &33447780514503414
 MeshFilter:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1497926776519098}
-  m_Mesh: {fileID: 4300000, guid: 46e96b501b810a94f84d68ffd966242e, type: 2}
+  m_Mesh: {fileID: 0}
 --- !u!61 &61000764261009850
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -465,38 +504,3 @@ SpriteRenderer:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!212 &212874557632169304
-SpriteRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1223101333050066}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0

+ 1 - 1
Assets/Resource/Shader/GrayMesh.shader.meta

@@ -5,5 +5,5 @@ licenseType: Pro
 ShaderImporter:
   defaultTextures: []
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Shader/GrayMeshMat.mat.meta

@@ -4,5 +4,5 @@ timeCreated: 1509087926
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png


+ 30 - 166
Assets/Resource/Sprite/Editor/PlazaRoom/表情/Expression.png.meta

@@ -1,28 +1,20 @@
 fileFormatVersion: 2
 guid: 980c962c52249774e9266e82d2496d13
-timeCreated: 1508750058
+timeCreated: 1509116443
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
     21300000: "\u6253\u5B57\u6846"
-    21300002: "\u6C57\u989C"
-    21300004: "\u54ED"
-    21300006: "\u5F00\u5FC3"
-    21300008: "\u59D4\u5C48"
-    21300010: "\u8272\u54AA\u54AA"
-    21300012: "\u90C1\u95F7"
-    21300014: "\u60CA\u8BB6"
-    21300016: "\u671F\u5F85"
-    21300018: "\u6C57\u989C\u6309\u94AE"
-    21300020: "\u671F\u5F85\u6309\u94AE"
-    21300022: "\u5F00\u5FC3\u6309\u94AE"
-    21300024: "\u54ED\u6309\u94AE"
-    21300026: "\u8272\u54AA\u54AA\u6309\u94AE"
-    21300028: "\u90C1\u95F7\u6309\u94AE"
-    21300030: "\u60CA\u8BB6\u6309\u94AE"
-    21300032: "\u59D4\u5C48\u6309\u94AE"
-    21300034: "\u8868\u60C5\u6309\u94AE"
-    21300036: "\u53D1\u9001\u6309\u94AE"
+    21300002: "\u6C57\u989C\u6309\u94AE"
+    21300004: "\u671F\u5F85\u6309\u94AE"
+    21300006: "\u5F00\u5FC3\u6309\u94AE"
+    21300008: "\u54ED\u6309\u94AE"
+    21300010: "\u8272\u54AA\u54AA\u6309\u94AE"
+    21300012: "\u90C1\u95F7\u6309\u94AE"
+    21300014: "\u60CA\u8BB6\u6309\u94AE"
+    21300016: "\u59D4\u5C48\u6309\u94AE"
+    21300018: "\u8868\u60C5\u6309\u94AE"
+    21300020: "\u53D1\u9001\u6309\u94AE"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -77,30 +69,6 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -118,115 +86,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u6C57\u989C"
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 127
-        width: 295
-        height: 328
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u54ED"
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 457
-        width: 287
-        height: 154
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u5F00\u5FC3"
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 613
-        width: 270
-        height: 135
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u59D4\u5C48"
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 750
-        width: 241
-        height: 63
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u8272\u54AA\u54AA"
+      name: "\u6C57\u989C\u6309\u94AE"
       rect:
         serializedVersion: 2
         x: 1
-        y: 815
-        width: 240
-        height: 129
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u90C1\u95F7"
-      rect:
-        serializedVersion: 2
-        x: 298
         y: 127
-        width: 237
-        height: 94
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u60CA\u8BB6"
-      rect:
-        serializedVersion: 2
-        x: 298
-        y: 223
-        width: 235
-        height: 119
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u671F\u5F85"
-      rect:
-        serializedVersion: 2
-        x: 298
-        y: 344
-        width: 235
-        height: 121
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u6C57\u989C\u6309\u94AE"
-      rect:
-        serializedVersion: 2
-        x: 298
-        y: 467
         width: 232
         height: 170
       alignment: 9
@@ -238,8 +102,8 @@ TextureImporter:
       name: "\u671F\u5F85\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 298
-        y: 639
+        x: 1
+        y: 299
         width: 232
         height: 170
       alignment: 9
@@ -251,8 +115,8 @@ TextureImporter:
       name: "\u5F00\u5FC3\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 298
-        y: 811
+        x: 1
+        y: 471
         width: 232
         height: 170
       alignment: 9
@@ -264,8 +128,8 @@ TextureImporter:
       name: "\u54ED\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 537
-        y: 127
+        x: 1
+        y: 643
         width: 232
         height: 188
       alignment: 9
@@ -277,8 +141,8 @@ TextureImporter:
       name: "\u8272\u54AA\u54AA\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 537
-        y: 317
+        x: 1
+        y: 833
         width: 232
         height: 170
       alignment: 9
@@ -290,8 +154,8 @@ TextureImporter:
       name: "\u90C1\u95F7\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 537
-        y: 489
+        x: 235
+        y: 127
         width: 232
         height: 170
       alignment: 9
@@ -303,8 +167,8 @@ TextureImporter:
       name: "\u60CA\u8BB6\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 537
-        y: 661
+        x: 235
+        y: 299
         width: 232
         height: 170
       alignment: 9
@@ -316,8 +180,8 @@ TextureImporter:
       name: "\u59D4\u5C48\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 537
-        y: 833
+        x: 235
+        y: 471
         width: 232
         height: 170
       alignment: 9
@@ -329,8 +193,8 @@ TextureImporter:
       name: "\u8868\u60C5\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 861
-        y: 1
+        x: 235
+        y: 643
         width: 144
         height: 123
       alignment: 9
@@ -342,8 +206,8 @@ TextureImporter:
       name: "\u53D1\u9001\u6309\u94AE"
       rect:
         serializedVersion: 2
-        x: 861
-        y: 126
+        x: 235
+        y: 768
         width: 130
         height: 123
       alignment: 9

+ 1 - 1
Assets/Resource/Sprite/Editor/SpriteUI/领取物品发光转动.png.meta

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

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Fertilize.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: de13cc8dc7ff70c48a185a67454cf967
-timeCreated: 1507623092
+timeCreated: 1509112639
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6a4df3dce104aed4caa0f4bdcea42c30
-timeCreated: 1507623061
+timeCreated: 1509112612
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower10.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b57a6b787deacd54e890295651ddf829
-timeCreated: 1507623068
+timeCreated: 1509112619
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower11.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 89286d41101f36d4390d0f7f6949289a
-timeCreated: 1507623069
+timeCreated: 1509112619
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower12.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ed43073df5abbcc4aa7ddbe5993efd71
-timeCreated: 1507623070
+timeCreated: 1509112620
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower13.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 0637ad7476da5a54d953f5128ba51c32
-timeCreated: 1507623071
+timeCreated: 1509112620
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower14.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a30665cd817da8d4f8307330c431e788
-timeCreated: 1507623071
+timeCreated: 1509112621
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower15.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d2122eb998c3b9c43b0333ca42005dc1
-timeCreated: 1507623072
+timeCreated: 1509112622
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower16.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 93180156d1ff42e4185615dbca3262e0
-timeCreated: 1507623073
+timeCreated: 1509112623
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower17.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: de162285e3966eb4fbd0bbdfc71ab70e
-timeCreated: 1507623074
+timeCreated: 1509112623
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower18.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 7de5720795f29b14cab8d22b0fe92ab9
-timeCreated: 1507623074
+timeCreated: 1509112624
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower19.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: db024e85eb42c6a4c8eb6f472441d095
-timeCreated: 1507623075
+timeCreated: 1509112625
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: aecc474d0dc10ee49a2daf380156a789
-timeCreated: 1507623062
+timeCreated: 1509112612
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower20.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5435d8a89a3d96c4284a5738052a973c
-timeCreated: 1507623076
+timeCreated: 1509112625
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower21.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 49e86b1d997f0934aa975e74e367e790
-timeCreated: 1507623077
+timeCreated: 1509112626
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower22.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b7f075bcc69899347919099d187d7f95
-timeCreated: 1507623078
+timeCreated: 1509112627
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower23.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c632956b442683a4ba6bb29f8ec4de28
-timeCreated: 1507623079
+timeCreated: 1509112627
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower24.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 477506167f9a98840980af0e97ccb6d5
-timeCreated: 1507623079
+timeCreated: 1509112628
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower25.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 7a4a28acb8e19ad4ebb40f5985f192bb
-timeCreated: 1507623080
+timeCreated: 1509112629
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower26.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e20c79501bef5e248a9463c68a26d872
-timeCreated: 1507623081
+timeCreated: 1509112630
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower27.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 505d163bd18b9eb41b61e3c5f24d664e
-timeCreated: 1507623082
+timeCreated: 1509112631
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower28.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 3a2c2544a20c78a4985b9fd5600a5c01
-timeCreated: 1507623083
+timeCreated: 1509112632
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower29.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a1cc564439b8616458fb0aa3ea38d6ef
-timeCreated: 1507623084
+timeCreated: 1509112632
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower3.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a5575b050ebfdc04594c4ee9c711a71a
-timeCreated: 1507623063
+timeCreated: 1509112613
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower30.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c5ef379a56fcd8945870fb9cf703a4a2
-timeCreated: 1507623084
+timeCreated: 1509112633
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower31.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 43cb19b2357c20748ac0b36072d8b0c3
-timeCreated: 1507623085
+timeCreated: 1509112634
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower32.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e6ab759f5f2b69d42b5539b7312cd173
-timeCreated: 1507623086
+timeCreated: 1509112634
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower33.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a6fbaf2257578394b8bf429b2be85bef
-timeCreated: 1507623087
+timeCreated: 1509112635
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower34.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c12f1a1fd54fd9942b5fc84e9cc6d77c
-timeCreated: 1507623088
+timeCreated: 1509112636
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower35.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6602f1f4869c40b48a52f24818f32545
-timeCreated: 1507623089
+timeCreated: 1509112636
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower36.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 39300fd0e860ea143850d7c4ec94625d
-timeCreated: 1507623089
+timeCreated: 1509112637
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower4.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d00431463ebc20b4291e41faac09f40c
-timeCreated: 1507623063
+timeCreated: 1509112614
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower5.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 2fbdd4d5b9f0bba4fafa3556924e6363
-timeCreated: 1507623064
+timeCreated: 1509112615
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower6.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5f6ecfd586818ca43af84656536338f2
-timeCreated: 1507623065
+timeCreated: 1509112616
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower7.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 0294a513dc75273468ab361efe2956c6
-timeCreated: 1507623066
+timeCreated: 1509112617
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower8.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 450af8bf6bbd58549a2c7643364c876f
-timeCreated: 1507623067
+timeCreated: 1509112617
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Flower9.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 3c7e63760cdf9f349a53a9ec9ffb5afa
-timeCreated: 1507623067
+timeCreated: 1509112618
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Rip.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a0c046d8a9cfa5b40937c68b115b53ff
-timeCreated: 1507623093
+timeCreated: 1509112640
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/Water.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: db61df8c64f267140866c44518d76ccb
-timeCreated: 1507623093
+timeCreated: 1509112641
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/云朵.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 70c3c26b0d699b447a93c31f311fc6f0
-timeCreated: 1507623056
+timeCreated: 1509112606
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/大金币图标.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 95463847f23b0ac40a1ad2b0866ab7b1
-timeCreated: 1507623090
+timeCreated: 1509112638
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/宝箱.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1cba5b42a3050e444b67311e94e9d633
-timeCreated: 1507623060
+timeCreated: 1509112610
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/技能树1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4324bacd5b14e004da78e4bc8983d4f9
-timeCreated: 1507623055
+timeCreated: 1509112606
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/技能树2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a32314b9bd4a082478ff8d1ad9a5c0ed
-timeCreated: 1507623055
+timeCreated: 1509112606
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/技能添加彩虹.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 835b8b4c0a7b71a4d9ac0f6aca9fb9f0
-timeCreated: 1507623056
+timeCreated: 1509112607
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/技能黄鹂鸟.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f53fd937a56c897499953ea605e80b40
-timeCreated: 1507623091
+timeCreated: 1509112638
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/描边1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 97ee288b1fdb4824fad04eff2c2fee5d
-timeCreated: 1507623091
+timeCreated: 1509112639
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/描边2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a2625c4ffcfaa9d4d9b5023e19edeabc
-timeCreated: 1507623094
+timeCreated: 1509112641
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/提示图标底板.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 908f67ad02cf09e428e6b12fc3693985
-timeCreated: 1507623091
+timeCreated: 1509112638
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/未开垦图标.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 800334d458bc8994eb9936152a80ef43
-timeCreated: 1507623094
+timeCreated: 1509112641
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/游戏等级评分.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 34ddabbb5c9b26b499804d7411a769fb
-timeCreated: 1507623095
+timeCreated: 1509112643
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/花园1号.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 2f59f860e7fba42448914248807e207d
-timeCreated: 1507623095
+timeCreated: 1509112642
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/花园2号.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 771441d8180f85841913a3e43b69db70
-timeCreated: 1507623059
+timeCreated: 1509112610
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/花园3号.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1fa36d506663581428d79677d65831ba
-timeCreated: 1507623058
+timeCreated: 1509112609
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/花园4号.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 79b5132a50620a84bb48bfe072f3819d
-timeCreated: 1507623057
+timeCreated: 1509112608
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/花园5号.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1d48b7dbff4e9544f8f515b8853663d7
-timeCreated: 1507623057
+timeCreated: 1509112607
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/钻石大图标.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1f8cbb256dd5f524d9b753ffc0982d5f
-timeCreated: 1507623090
+timeCreated: 1509112637
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/音符1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e8b64131e9364da43a1355c81da8ba16
-timeCreated: 1507623060
+timeCreated: 1509112611
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/音符2.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 0f3e3eeea807f624094c4ec12bed1cc7
-timeCreated: 1507623060
+timeCreated: 1509112611
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Garden/音符3.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c7d5126aad641e84c80dcc1465fc8099
-timeCreated: 1507623060
+timeCreated: 1509112611
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0001.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e7385bf81916ffd438b73826f587c7df
-timeCreated: 1507623096
+timeCreated: 1509112643
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0003.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ca0abbadd8274f4409594284ecb18b21
-timeCreated: 1507623096
+timeCreated: 1509112643
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0004.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 95c3e38aa2a9b82468959b1002550160
-timeCreated: 1507623096
+timeCreated: 1509112644
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0005.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 88ba7ab41169d204ca143e4a4b030b09
-timeCreated: 1507623097
+timeCreated: 1509112644
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0006.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5d3177be0f721fa43bb0f6eb7b30da2c
-timeCreated: 1507623097
+timeCreated: 1509112645
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0007.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 2290dc4037d240c428e103c2d9fb8c3f
-timeCreated: 1507623097
+timeCreated: 1509112645
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0008.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5075f32043ca61e499d98aa9e35377f8
-timeCreated: 1507623098
+timeCreated: 1509112646
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0009.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 0ec7a347c762ee74a9d6ffb80faf9a23
-timeCreated: 1507623098
+timeCreated: 1509112646
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0010.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ab87502f15743e3418bb9bdfc974c551
-timeCreated: 1507623098
+timeCreated: 1509112646
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0011.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 6afea2d407f46b04fb386230d13006cd
-timeCreated: 1507623099
+timeCreated: 1509112647
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0012.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 78f3e635ee9e2174498f1248b460dfd1
-timeCreated: 1507623099
+timeCreated: 1509112647
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0013.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 08525888b1aa92a49bed272d07189b81
-timeCreated: 1507623099
+timeCreated: 1509112648
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0028.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: cd94ab7891f8b6848894103fd86d420d
-timeCreated: 1507623100
+timeCreated: 1509112648
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0029.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e2124d7000ca39048ad6d28382f32cc3
-timeCreated: 1507623100
+timeCreated: 1509112648
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0030.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ca105e99ee1de1242bbc03b4ef67397c
-timeCreated: 1507623101
+timeCreated: 1509112649
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0031.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ad7697ccc4a09bd4585ff99b89b20b61
-timeCreated: 1507623101
+timeCreated: 1509112649
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0032.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 89eee4502853d1e4581cd5ff49dea5fe
-timeCreated: 1507623101
+timeCreated: 1509112650
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0033.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: fa8bec6da75b7e249bbc2c5a5ffc8d96
-timeCreated: 1507623102
+timeCreated: 1509112650
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0034.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1a9fec2b26562aa4b85de4a224f49295
-timeCreated: 1507623102
+timeCreated: 1509112651
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0035.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f8ee83447defa4045aff88d346c14ab7
-timeCreated: 1507623102
+timeCreated: 1509112651
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0036.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f51f37b504849ab489d5c9c3b06688d6
-timeCreated: 1507623103
+timeCreated: 1509112652
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0037.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 09aee6fc16945014ba54b47baa8c2a93
-timeCreated: 1507623103
+timeCreated: 1509112652
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0038.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5bd3734b72f70b54a94a6332b9466fa4
-timeCreated: 1507623103
+timeCreated: 1509112653
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0039.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e697d24b21569dd4e9ae3c4f9c5aed03
-timeCreated: 1507623104
+timeCreated: 1509112653
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/Resource/Sprite/Mobile/Logo/LOGO0041.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e581fdda3b139444487da5413a9965ac
-timeCreated: 1507623104
+timeCreated: 1509112653
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

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