Browse Source

增加花朵

LiuQilin 7 years ago
parent
commit
213913c553
50 changed files with 1640 additions and 142 deletions
  1. 0 32
      Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta
  2. 1 1
      Assets/Resource/Logo.unity
  3. 15 0
      Assets/Resource/Prefab/Object/DebugMode.prefab
  4. 35 35
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  5. 1 1
      Assets/Resource/Shader/GrayMat.mat
  6. 0 10
      Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta
  7. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower51.png
  8. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower51.png.meta
  9. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower52.png
  10. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower52.png.meta
  11. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower53.png
  12. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower53.png.meta
  13. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower54.png
  14. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower54.png.meta
  15. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower55.png
  16. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower55.png.meta
  17. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower56.png
  18. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower56.png.meta
  19. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower57.png
  20. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower57.png.meta
  21. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower58.png
  22. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower58.png.meta
  23. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower59.png
  24. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower59.png.meta
  25. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower60.png
  26. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower60.png.meta
  27. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower61.png
  28. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower61.png.meta
  29. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower62.png
  30. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower62.png.meta
  31. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower63.png
  32. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower63.png.meta
  33. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower64.png
  34. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower64.png.meta
  35. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower65.png
  36. 94 0
      Assets/Resource/Sprite/Mobile/Garden/Flower65.png.meta
  37. 40 25
      Assets/Resource/XML/Config/flower_config.xml
  38. 32 2
      Assets/Resource/XML/lan/ChineseSimplified.xml
  39. 35 5
      Assets/Resource/XML/lan/ChineseTraditional.xml
  40. 35 5
      Assets/Resource/XML/lan/English.xml
  41. BIN
      Assets/Resource/Xlsx/flower_config.xlsx
  42. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  43. 2 0
      Assets/Script/Manage/LeftSidePanel.cs
  44. 0 2
      Assets/Script/Manage/TutorialManager.cs
  45. 24 22
      Assets/Script/Manage/VisitManager.cs
  46. 3 0
      Assets/Script/Object/Player.cs
  47. 1 1
      Assets/Script/Tool/Auxiliary.cs
  48. 2 1
      Assets/Script/Tool/Bundle.cs
  49. BIN
      UpgradeLog.htm
  50. 4 0
      第五期.txt

+ 0 - 32
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Assets/Resource/Logo.unity

@@ -341,7 +341,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 488.5, y: 275, z: 0}
+  m_LocalPosition: {x: 431.5, y: 242.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}

+ 15 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -243,6 +243,21 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 55dd76b953518ac4da7a6cc27e187113, type: 3}
   - {fileID: 21300000, guid: 5999e2d9ba3d4754b9e61d65f9fc9f77, type: 3}
   - {fileID: 21300000, guid: 74f167d3f24d0304ba4695cf5c3ff9e2, type: 3}
+  - {fileID: 21300000, guid: 7e79b693c31b62344806d2d910ab0401, type: 3}
+  - {fileID: 21300000, guid: 1066300c6f171c047bc1b6b361bf8103, type: 3}
+  - {fileID: 21300000, guid: 2712c2c68fed62f43b6c6c226d17956c, type: 3}
+  - {fileID: 21300000, guid: 9e5bc78f2afc543468aa694d0b9c4999, type: 3}
+  - {fileID: 21300000, guid: da082e9dfee038e4b90fe0d91a2b29fe, type: 3}
+  - {fileID: 21300000, guid: 83194c554e63cb14e88e9fdec0b1245e, type: 3}
+  - {fileID: 21300000, guid: ac559584059d62b478444a928ca49f83, type: 3}
+  - {fileID: 21300000, guid: 7105e4bbff9333841b4e758c03b12b45, type: 3}
+  - {fileID: 21300000, guid: 77b04528817149c4bb85693d5679fcf2, type: 3}
+  - {fileID: 21300000, guid: a29d07058b8db8e4b90568d9614f7d80, type: 3}
+  - {fileID: 21300000, guid: e5edfbd609d4f2e4e9ea21d7150ee5ae, type: 3}
+  - {fileID: 21300000, guid: ffcaf8f0dff36884abd5877deaded65d, type: 3}
+  - {fileID: 21300000, guid: 7fac9cb4d4b0356459d110ce1f359454, type: 3}
+  - {fileID: 21300000, guid: 9b2279027d3eb554cb9c56cb9bfd3741, type: 3}
+  - {fileID: 21300000, guid: cd53345895dfefc438c5fb461ff154d6, type: 3}
   EffectList:
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
   - {fileID: 1313425893881752, guid: 57a8b1695aa497442ae16329072ca484, type: 2}

+ 35 - 35
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -19729,7 +19729,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1994725287995210
 GameObject:
   m_ObjectHideFlags: 1
@@ -27117,7 +27117,7 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 100, y: 100}
+  m_CellSize: {x: 110, y: 110}
   m_Spacing: {x: 15, y: 15}
   m_Constraint: 1
   m_ConstraintCount: 3
@@ -32676,7 +32676,7 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 100, y: 100}
+  m_CellSize: {x: 110, y: 110}
   m_Spacing: {x: 15, y: 15}
   m_Constraint: 1
   m_ConstraintCount: 3
@@ -72165,7 +72165,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1271299272083510}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -216.1, y: -111.45, z: 0}
+  m_LocalPosition: {x: -204.5, y: -111.45, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_Children:
   - {fileID: 224882671347435448}
@@ -72175,7 +72175,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -216.1, y: -111.45}
+  m_AnchoredPosition: {x: -204.5, y: -111.45}
   m_SizeDelta: {x: 285, y: 59.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224027466554657894
@@ -73163,7 +73163,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1758300897784240}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -207.10619, y: 117.026276, z: 0}
+  m_LocalPosition: {x: -187.2, y: 114.51453, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224990835730074242}
@@ -73171,7 +73171,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0.093811035, y: 117.02628}
+  m_AnchoredPosition: {x: 20, y: 114.514534}
   m_SizeDelta: {x: 120, y: 278.18}
   m_Pivot: {x: 0, y: 1}
 --- !u!224 &224062398135328068
@@ -73754,7 +73754,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1197503094359484}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -211.08, y: -154.7, z: 0}
+  m_LocalPosition: {x: -204.5, y: -154.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224361720822068232}
@@ -73763,8 +73763,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -211.08, y: -154.7}
-  m_SizeDelta: {x: -609.89, y: -410.92}
+  m_AnchoredPosition: {x: -204.5, y: -154.7}
+  m_SizeDelta: {x: -581.52, y: -410.92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224091659856119902
 RectTransform:
@@ -75846,7 +75846,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1621499627836134}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 66.878784, y: 0.16000366, z: 0}
+  m_LocalPosition: {x: 71.41998, y: -0.1499939, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224990835730074242}
@@ -75855,8 +75855,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 66.878784, y: 0.16000175}
-  m_SizeDelta: {x: 133.56998, y: -0.32000732}
+  m_AnchoredPosition: {x: 71.41998, y: -0.14999}
+  m_SizeDelta: {x: 82.45997, y: -0.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224201318974070842
 RectTransform:
@@ -76440,7 +76440,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1068154299608868}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -207.10625, y: 117.09946, z: 0}
+  m_LocalPosition: {x: -187.2, y: 114.514534, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224238720063078920}
@@ -76448,9 +76448,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0.09375, y: 117.09946}
-  m_SizeDelta: {x: 547.97, y: 234.2}
-  m_Pivot: {x: 0.000000037252903, y: 1.0000001}
+  m_AnchoredPosition: {x: 20, y: 114.514534}
+  m_SizeDelta: {x: 120, y: 234.2}
+  m_Pivot: {x: 0, y: 1}
 --- !u!224 &224228267808525492
 RectTransform:
   m_ObjectHideFlags: 1
@@ -77311,7 +77311,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1179876819904942}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -216.1, y: -69.7, z: 0}
+  m_LocalPosition: {x: -204.5, y: -69.7, z: 0}
   m_LocalScale: {x: 0.42826605, y: 0.42826605, z: 0.42826605}
   m_Children: []
   m_Father: {fileID: 224083969509934846}
@@ -77319,7 +77319,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -216.1, y: -69.7}
+  m_AnchoredPosition: {x: -204.5, y: -69.7}
   m_SizeDelta: {x: 210, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224261198272959660
@@ -77515,7 +77515,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1093632609735874}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.0000038146973, y: 17.49999, z: 0}
+  m_LocalPosition: {x: -42.99996, y: 17.500008, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224899672129644080}
@@ -82043,7 +82043,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1278141211137710}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -25.099995, y: 30.19999, z: 0}
+  m_LocalPosition: {x: -68.09996, y: 30.200008, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224899672129644080}
@@ -84398,7 +84398,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 395.99994, y: 48.1791}
-  m_SizeDelta: {x: 215, y: 72}
+  m_SizeDelta: {x: 168.9, y: 56.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224581035863097370
 RectTransform:
@@ -87194,7 +87194,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1323557481282122}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -216.1, y: -1.8899994, z: 0}
+  m_LocalPosition: {x: -204.5, y: -1.8899994, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224083969509934846}
@@ -87202,7 +87202,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -216.1, y: -1.89}
+  m_AnchoredPosition: {x: -204.5, y: -1.89}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224699798254095440
@@ -87724,7 +87724,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1128251421687904}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -25.099998, y: 30.199978, z: 0}
+  m_LocalPosition: {x: -68.099976, y: 30.199997, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224896510247314690}
@@ -91252,7 +91252,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1096681616496836}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 215.4, y: -142.55, z: 0}
+  m_LocalPosition: {x: 249.79993, y: -142.55, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 1}
   m_Children:
   - {fileID: 224721648145971530}
@@ -91262,9 +91262,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 215.4, y: -142.55}
+  m_AnchoredPosition: {x: 249.79994, y: -142.55}
   m_SizeDelta: {x: 86, y: 51}
-  m_Pivot: {x: 0.5, y: 0.00000041350722}
+  m_Pivot: {x: 0.99999976, y: 0.00000006722021}
 --- !u!224 &224896892919303032
 RectTransform:
   m_ObjectHideFlags: 1
@@ -91345,7 +91345,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1784874889865790}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 284, y: -142.73, z: 0}
+  m_LocalPosition: {x: 318.40012, y: -142.73, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 1}
   m_Children:
   - {fileID: 224487451130839378}
@@ -91355,9 +91355,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 284, y: -142.73}
+  m_AnchoredPosition: {x: 318.40012, y: -142.73}
   m_SizeDelta: {x: 86, y: 51}
-  m_Pivot: {x: 0.49999997, y: 0.00000020489097}
+  m_Pivot: {x: 0.9999995, y: -0.00000014139604}
 --- !u!224 &224901528600402664
 RectTransform:
   m_ObjectHideFlags: 1
@@ -91873,7 +91873,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1037619081589770}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 17.499979, z: 0}
+  m_LocalPosition: {x: -42.999977, y: 17.499996, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224896510247314690}
@@ -92698,7 +92698,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1603533986070500}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 66.878784, y: 0.16000366, z: 0}
+  m_LocalPosition: {x: 71.41998, y: -0.1499939, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224238720063078920}
@@ -92707,8 +92707,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 66.878784, y: 0.16000175}
-  m_SizeDelta: {x: 133.56998, y: -0.32000732}
+  m_AnchoredPosition: {x: 71.41998, y: -0.14999}
+  m_SizeDelta: {x: 82.45997, y: -0.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224964317361793810
 RectTransform:

+ 1 - 1
Assets/Resource/Shader/GrayMat.mat

@@ -8,7 +8,7 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: GrayMat
   m_Shader: {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
-  m_ShaderKeywords: _EMISSION
+  m_ShaderKeywords: UNITY_UI_CLIP_RECT _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

+ 0 - 10
Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 46b274c8414a222419da71c9a4da16df
-folderAsset: yes
-timeCreated: 1516869190
-licenseType: Pro
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower51.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower51.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 1066300c6f171c047bc1b6b361bf8103
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower52.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower52.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 2712c2c68fed62f43b6c6c226d17956c
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower53.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower53.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 9e5bc78f2afc543468aa694d0b9c4999
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower54.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower54.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: da082e9dfee038e4b90fe0d91a2b29fe
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower55.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower55.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 7e79b693c31b62344806d2d910ab0401
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower56.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower56.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 83194c554e63cb14e88e9fdec0b1245e
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower57.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower57.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: ac559584059d62b478444a928ca49f83
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower58.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower58.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 7105e4bbff9333841b4e758c03b12b45
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower59.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower59.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 77b04528817149c4bb85693d5679fcf2
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.62}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower60.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower60.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: a29d07058b8db8e4b90568d9614f7d80
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.68}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower61.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower61.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: e5edfbd609d4f2e4e9ea21d7150ee5ae
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.54, y: 0.68}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower62.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower62.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: ffcaf8f0dff36884abd5877deaded65d
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.45, y: 0.64}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower63.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower63.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 7fac9cb4d4b0356459d110ce1f359454
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.45, y: 0.64}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower64.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower64.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: 9b2279027d3eb554cb9c56cb9bfd3741
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.45, y: 0.64}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower65.png


+ 94 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower65.png.meta

@@ -0,0 +1,94 @@
+fileFormatVersion: 2
+guid: cd53345895dfefc438c5fb461ff154d6
+timeCreated: 1525845621
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.45, y: 0.64}
+  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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: new_flower_tex
+  assetBundleVariant: 

+ 40 - 25
Assets/Resource/XML/Config/flower_config.xml

@@ -50,43 +50,58 @@
   <item id="48" name="花烟草(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower48" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
   <item id="49" name="花烟草(粉色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower49" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
   <item id="50" name="花烟草(红色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower50" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
+  <item id="51" name="雏菊(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower51" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="52" name="雏菊(粉色) " desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower52" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="53" name="雏菊(红色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower53" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="54" name="雏菊(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower54" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="55" name="令剑荷花(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower55" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="56" name="令箭荷花(橙色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower56" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="57" name="令箭荷花(红色) " desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower57" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="58" name="令箭荷花(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower58" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="59" name="令箭荷花(紫色) " desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower59" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="60" name="五爪金龙(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower60" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="61" name="五爪金龙(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower61" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="62" name="月见草(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower62" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="63" name="月见草(粉色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower63" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="64" name="月见草(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower64" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="65" name="月见草(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower65" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
   <comment>
-    <id>
-id
+    <id>
+id
 </id>
-    <name>
-名称
+    <name>
+名称
 </name>
-    <desc>
-描述
+    <desc>
+描述
 </desc>
-    <unlock_ahead_cur>
-提前解锁
-消耗货币
+    <unlock_ahead_cur>
+提前解锁
+消耗货币
 </unlock_ahead_cur>
-    <unlock_ahead>
-提前解锁消耗的货币
+    <unlock_ahead>
+提前解锁消耗的货币
 </unlock_ahead>
-    <icon>
-图标
+    <icon>
+图标
 </icon>
-    <anim>
-场景物件
+    <anim>
+场景物件
 </anim>
-    <flower_coin_buff>
-种花金币加成
+    <flower_coin_buff>
+种花金币加成
 </flower_coin_buff>
-    <itemSize>
-
+    <itemSize>
+
 </itemSize>
-    <flowerCardSize>
-
+    <flowerCardSize>
+
 </flowerCardSize>
-    <minigameSize>
-
+    <minigameSize>
+
 </minigameSize>
-    <show>
-显示在花朵管理界面
+    <show>
+显示在花朵管理界面
 </show>
   </comment>
 </data>

+ 32 - 2
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -300,11 +300,11 @@
     <AH_SendPrivateMessageFailed desc=""><![CDATA[发送失败]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[刚刚]]></AH_Current>
     <AK_Desc desc=""><![CDATA[请选择支付方式]]></AK_Desc>
-    <AL_Title desc=""><![CDATA[换装]]></AL_Title>
+    <AL_Title desc=""><![CDATA[试妆]]></AL_Title>
     <AL_Cost desc=""><![CDATA[需要花费]]></AL_Cost>
     <AL_Close desc=""><![CDATA[关闭]]></AL_Close>
     <AL_Eye desc=""><![CDATA[眼睛]]></AL_Eye>
-    <AL_Mouse desc=""><![CDATA[嘴]]></AL_Mouse>
+    <AL_Mouse desc=""><![CDATA[嘴]]></AL_Mouse>
     <AL_Tip desc=""><![CDATA[更改形象需要花费]]></AL_Tip>
   </UI>
   <FriendItem>
@@ -389,6 +389,21 @@
     <Flower48 desc=""><![CDATA[花烟草(白) ]]></Flower48>
     <Flower49 desc=""><![CDATA[花烟草(粉) ]]></Flower49>
     <Flower50 desc=""><![CDATA[花烟草(红) ]]></Flower50>
+    <Flower51 desc=""><![CDATA[雏菊(白色)]]></Flower51>
+    <Flower52 desc=""><![CDATA[雏菊(粉色) ]]></Flower52>
+    <Flower53 desc=""><![CDATA[雏菊(红色)]]></Flower53>
+    <Flower54 desc=""><![CDATA[雏菊(黄色)]]></Flower54>
+    <Flower55 desc=""><![CDATA[令剑荷花(白色)]]></Flower55>
+    <Flower56 desc=""><![CDATA[令箭荷花(橙色)]]></Flower56>
+    <Flower57 desc=""><![CDATA[令箭荷花(红色) ]]></Flower57>
+    <Flower58 desc=""><![CDATA[令箭荷花(黄色)]]></Flower58>
+    <Flower59 desc=""><![CDATA[令箭荷花(紫色) ]]></Flower59>
+    <Flower60 desc=""><![CDATA[五爪金龙(白色)]]></Flower60>
+    <Flower61 desc=""><![CDATA[五爪金龙(紫色)]]></Flower61>
+    <Flower62 desc=""><![CDATA[月见草(白色)]]></Flower62>
+    <Flower63 desc=""><![CDATA[月见草(粉色)]]></Flower63>
+    <Flower64 desc=""><![CDATA[月见草(黄色)]]></Flower64>
+    <Flower65 desc=""><![CDATA[月见草(紫色)]]></Flower65>
   </FlowerName>
   <FlowerColor>
     <Flower0 desc=""><![CDATA[粉]]></Flower0>
@@ -442,6 +457,21 @@
     <Flower48 desc=""><![CDATA[白]]></Flower48>
     <Flower49 desc=""><![CDATA[粉]]></Flower49>
     <Flower50 desc=""><![CDATA[红]]></Flower50>
+    <Flower51 desc=""><![CDATA[红]]></Flower51>
+    <Flower52 desc=""><![CDATA[红]]></Flower52>
+    <Flower53 desc=""><![CDATA[红]]></Flower53>
+    <Flower54 desc=""><![CDATA[红]]></Flower54>
+    <Flower55 desc=""><![CDATA[红]]></Flower55>
+    <Flower56 desc=""><![CDATA[红]]></Flower56>
+    <Flower57 desc=""><![CDATA[红]]></Flower57>
+    <Flower58 desc=""><![CDATA[红]]></Flower58>
+    <Flower59 desc=""><![CDATA[红]]></Flower59>
+    <Flower60 desc=""><![CDATA[红]]></Flower60>
+    <Flower61 desc=""><![CDATA[红]]></Flower61>
+    <Flower62 desc=""><![CDATA[红]]></Flower62>
+    <Flower63 desc=""><![CDATA[红]]></Flower63>
+    <Flower64 desc=""><![CDATA[红]]></Flower64>
+    <Flower65 desc=""><![CDATA[红]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>

+ 35 - 5
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -300,11 +300,11 @@
     <AH_SendPrivateMessageFailed desc=""><![CDATA[發送失敗]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[剛剛]]></AH_Current>
     <AK_Desc desc=""><![CDATA[請選擇支付方式]]></AK_Desc>
-    <AL_Title desc=""><![CDATA[]]></AL_Title>
-    <AL_Cost desc=""><![CDATA[]]></AL_Cost>
-    <AL_Close desc=""><![CDATA[]]></AL_Close>
-    <AL_Eye desc=""><![CDATA[]]></AL_Eye>
-    <AL_Mouse desc=""><![CDATA[]]></AL_Mouse>
+    <AL_Title desc=""><![CDATA[試妝]]></AL_Title>
+    <AL_Cost desc=""><![CDATA[需要花費]]></AL_Cost>
+    <AL_Close desc=""><![CDATA[關閉]]></AL_Close>
+    <AL_Eye desc=""><![CDATA[眼睛]]></AL_Eye>
+    <AL_Mouse desc=""><![CDATA[]]></AL_Mouse>
     <AL_Tip desc=""><![CDATA[更改形象需要花費]]></AL_Tip>
   </UI>
   <FriendItem>
@@ -389,6 +389,21 @@
     <Flower48 desc=""><![CDATA[花煙草(白) ]]></Flower48>
     <Flower49 desc=""><![CDATA[花煙草(粉) ]]></Flower49>
     <Flower50 desc=""><![CDATA[花煙草(紅) ]]></Flower50>
+    <Flower51 desc=""><![CDATA[]]></Flower51>
+    <Flower52 desc=""><![CDATA[]]></Flower52>
+    <Flower53 desc=""><![CDATA[]]></Flower53>
+    <Flower54 desc=""><![CDATA[]]></Flower54>
+    <Flower55 desc=""><![CDATA[]]></Flower55>
+    <Flower56 desc=""><![CDATA[]]></Flower56>
+    <Flower57 desc=""><![CDATA[]]></Flower57>
+    <Flower58 desc=""><![CDATA[]]></Flower58>
+    <Flower59 desc=""><![CDATA[]]></Flower59>
+    <Flower60 desc=""><![CDATA[]]></Flower60>
+    <Flower61 desc=""><![CDATA[]]></Flower61>
+    <Flower62 desc=""><![CDATA[]]></Flower62>
+    <Flower63 desc=""><![CDATA[]]></Flower63>
+    <Flower64 desc=""><![CDATA[]]></Flower64>
+    <Flower65 desc=""><![CDATA[]]></Flower65>
   </FlowerName>
   <FlowerColor>
     <Flower0 desc=""><![CDATA[粉]]></Flower0>
@@ -442,6 +457,21 @@
     <Flower48 desc=""><![CDATA[白]]></Flower48>
     <Flower49 desc=""><![CDATA[粉]]></Flower49>
     <Flower50 desc=""><![CDATA[紅]]></Flower50>
+    <Flower51 desc=""><![CDATA[紅]]></Flower51>
+    <Flower52 desc=""><![CDATA[紅]]></Flower52>
+    <Flower53 desc=""><![CDATA[紅]]></Flower53>
+    <Flower54 desc=""><![CDATA[紅]]></Flower54>
+    <Flower55 desc=""><![CDATA[紅]]></Flower55>
+    <Flower56 desc=""><![CDATA[紅]]></Flower56>
+    <Flower57 desc=""><![CDATA[紅]]></Flower57>
+    <Flower58 desc=""><![CDATA[紅]]></Flower58>
+    <Flower59 desc=""><![CDATA[紅]]></Flower59>
+    <Flower60 desc=""><![CDATA[紅]]></Flower60>
+    <Flower61 desc=""><![CDATA[紅]]></Flower61>
+    <Flower62 desc=""><![CDATA[紅]]></Flower62>
+    <Flower63 desc=""><![CDATA[紅]]></Flower63>
+    <Flower64 desc=""><![CDATA[紅]]></Flower64>
+    <Flower65 desc=""><![CDATA[紅]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>

+ 35 - 5
Assets/Resource/XML/lan/English.xml

@@ -300,11 +300,11 @@ Program 水怪
     <AH_SendPrivateMessageFailed desc=""><![CDATA[Failed]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[Just now]]></AH_Current>
     <AK_Desc desc=""><![CDATA[Please choose a payment method]]></AK_Desc>
-    <AL_Title desc=""><![CDATA[]]></AL_Title>
-    <AL_Cost desc=""><![CDATA[]]></AL_Cost>
-    <AL_Close desc=""><![CDATA[]]></AL_Close>
-    <AL_Eye desc=""><![CDATA[]]></AL_Eye>
-    <AL_Mouse desc=""><![CDATA[]]></AL_Mouse>
+    <AL_Title desc=""><![CDATA[Makeup]]></AL_Title>
+    <AL_Cost desc=""><![CDATA[Cost]]></AL_Cost>
+    <AL_Close desc=""><![CDATA[Close]]></AL_Close>
+    <AL_Eye desc=""><![CDATA[Eyes]]></AL_Eye>
+    <AL_Mouse desc=""><![CDATA[Mouth]]></AL_Mouse>
     <AL_Tip desc=""><![CDATA[Changing character styling costs]]></AL_Tip>
   </UI>
   <FriendItem>
@@ -389,6 +389,21 @@ Program 水怪
     <Flower48 desc=""><![CDATA[Henbane(White)]]></Flower48>
     <Flower49 desc=""><![CDATA[Henbane(Pink)]]></Flower49>
     <Flower50 desc=""><![CDATA[Henbane(Red)]]></Flower50>
+    <Flower51 desc=""><![CDATA[]]></Flower51>
+    <Flower52 desc=""><![CDATA[]]></Flower52>
+    <Flower53 desc=""><![CDATA[]]></Flower53>
+    <Flower54 desc=""><![CDATA[]]></Flower54>
+    <Flower55 desc=""><![CDATA[]]></Flower55>
+    <Flower56 desc=""><![CDATA[]]></Flower56>
+    <Flower57 desc=""><![CDATA[]]></Flower57>
+    <Flower58 desc=""><![CDATA[]]></Flower58>
+    <Flower59 desc=""><![CDATA[]]></Flower59>
+    <Flower60 desc=""><![CDATA[]]></Flower60>
+    <Flower61 desc=""><![CDATA[]]></Flower61>
+    <Flower62 desc=""><![CDATA[]]></Flower62>
+    <Flower63 desc=""><![CDATA[]]></Flower63>
+    <Flower64 desc=""><![CDATA[]]></Flower64>
+    <Flower65 desc=""><![CDATA[]]></Flower65>
   </FlowerName>
   <FlowerColor>
     <Flower0 desc=""><![CDATA[Pink]]></Flower0>
@@ -442,6 +457,21 @@ Program 水怪
     <Flower48 desc=""><![CDATA[White]]></Flower48>
     <Flower49 desc=""><![CDATA[Pink]]></Flower49>
     <Flower50 desc=""><![CDATA[Red]]></Flower50>
+    <Flower51 desc=""><![CDATA[Red]]></Flower51>
+    <Flower52 desc=""><![CDATA[Red]]></Flower52>
+    <Flower53 desc=""><![CDATA[Red]]></Flower53>
+    <Flower54 desc=""><![CDATA[Red]]></Flower54>
+    <Flower55 desc=""><![CDATA[Red]]></Flower55>
+    <Flower56 desc=""><![CDATA[Red]]></Flower56>
+    <Flower57 desc=""><![CDATA[Red]]></Flower57>
+    <Flower58 desc=""><![CDATA[Red]]></Flower58>
+    <Flower59 desc=""><![CDATA[Red]]></Flower59>
+    <Flower60 desc=""><![CDATA[Red]]></Flower60>
+    <Flower61 desc=""><![CDATA[Red]]></Flower61>
+    <Flower62 desc=""><![CDATA[Red]]></Flower62>
+    <Flower63 desc=""><![CDATA[Red]]></Flower63>
+    <Flower64 desc=""><![CDATA[Red]]></Flower64>
+    <Flower65 desc=""><![CDATA[Red]]></Flower65>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>

BIN
Assets/Resource/Xlsx/flower_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 0
Assets/Script/Manage/LeftSidePanel.cs

@@ -37,6 +37,7 @@ public class LeftSidePanel
         offset.y = 0;
         panel.CreateTweenVecOffset2D(offset, 0.25f, false, true, true, Curve.EaseOutQuad, true);
         panel.TweenForVec();
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
     }
 
     public static void Hide()
@@ -49,6 +50,7 @@ public class LeftSidePanel
         offset.y = 0;
         panel.CreateTweenVecOffset2D(offset, 0.25f, false, true, true, Curve.EaseOutQuad, true);
         panel.TweenForVec();
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
     }
 
     public static void Refresh()

+ 0 - 2
Assets/Script/Manage/TutorialManager.cs

@@ -1659,8 +1659,6 @@ public class TutorialManager : Regist
 
     public static void BeginChangeMouseTutorial()
     {
-        UIManager.BlockOfflinePanel();
-
         TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.F_Manage0).GetTweenVec();
 
         if (tweenRoot.InDestination)

+ 24 - 22
Assets/Script/Manage/VisitManager.cs

@@ -97,6 +97,29 @@ public class VisitManager : Regist
 
     public void Update()
     {
+        if (UnusedDataList.Count > MaxStachConfigAmt)
+        {
+            return;
+        }
+
+        PullConfigTimer += Time.deltaTime;
+
+        if (PullConfigTimer >= PullArchiveTime)
+        {
+            PullConfigTimer = 0;
+
+            HttpManager.GetRandomConfig
+            (
+                data =>
+                {
+                    PullConfigCallback(data, null, SavePulledConfig);
+                }
+            );
+        }
+    }
+
+    public void LateUpdate()
+    {
         if (selfPlayer != null)
         {
             moveTimer += Time.deltaTime;
@@ -125,27 +148,6 @@ public class VisitManager : Regist
             }
             selfPlayer.ResetDepth();
         }
-
-
-        if (UnusedDataList.Count > MaxStachConfigAmt)
-        {
-            return;
-        }
-
-        PullConfigTimer += Time.deltaTime;
-
-        if (PullConfigTimer >= PullArchiveTime)
-        {
-            PullConfigTimer = 0;
-
-            HttpManager.GetRandomConfig
-            (
-                data =>
-                {
-                    PullConfigCallback(data, null, SavePulledConfig);
-                }
-            );
-        }
     }
 
 
@@ -750,7 +752,7 @@ public class VisitManager : Regist
         if (selfPlayer == null)
         {
             selfPlayer = PlayerManager.Player;
-            selfPlayer.transform.position += new Vector3(Random.Range(-2.5f, 2.5f), 0, -0.01f);
+            selfPlayer.transform.position += new Vector3(Random.Range(-2, 2), 0, 0.01f);
             selfPlayer.SetAllCollider(false);
         }
         else

+ 3 - 0
Assets/Script/Object/Player.cs

@@ -1722,6 +1722,9 @@ public class Player : Regist , IPointerClickHandler
         SetSlotLocalZ(LeftShortSleeveSlot, -0.000015f);
         SetSlotLocalZ(RightShortSleeveSlot, -0.000015f);
 
+        //Debug.Log("reset depth");
+        //Debug.Log(WingSlot.UnityTransform.localPosition.z, WingSlot.UnityTransform);
+
         SetSlotLocalZ(HeadSlot, 0);
         if (HeadSlot.UnityTransform != null && HeadSlot.UnityTransform.childCount > 1)
         {

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

@@ -163,7 +163,7 @@ public class Auxiliary : Regist
             //Manager.Diamond = 0;
             //CommentRewardManager.GetReward();
             //Manager.AddCoin(1000000000000, StaticsManager.ItemID.None, StaticsManager.ConsumeModule.None);
-            //DebugManager.ResetGardenLevel(50);
+            DebugManager.ResetGardenLevel(38);
             //HttpManager.GetTargetConfig
             //(
             //    "1801134288353834791",

+ 2 - 1
Assets/Script/Tool/Bundle.cs

@@ -864,9 +864,10 @@ public class Bundle : MonoBehaviour
             }
             return false;
         }
-        catch (Exception)
+        catch (Exception e)
         {
             Initializer.EnableDebugLab();
+            Initializer.DebugText.text = e.ToString();
             return true;
         }
     }

BIN
UpgradeLog.htm


+ 4 - 0
第五期.txt

@@ -1,3 +1,7 @@
+换嘴巴教程似乎有Bug
+
+
+
 增加服装流程 骨骼位置 UI上的位置 语言文档 存档