jet 8 years ago
parent
commit
ef93efd49a

BIN
Assets/Resource/Logo.unity


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


BIN
Assets/Resource/Sprite/Garden/FlowerAtlas1.png


+ 445 - 0
Assets/Resource/Sprite/Garden/FlowerAtlas1.png.meta

@@ -0,0 +1,445 @@
+fileFormatVersion: 2
+guid: 92acf314e1ccad54baf2a5aa535b4088
+timeCreated: 1500617834
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: Flower19
+    21300002: Flower20
+    21300004: Flower23
+    21300006: Flower30
+    21300008: Flower31
+    21300010: Flower27
+    21300012: Flower32
+    21300014: Flower33
+    21300016: Flower34
+    21300018: Flower13
+    21300020: Flower14
+    21300022: Flower21
+    21300024: Flower22
+    21300026: Flower3
+    21300028: Flower5
+    21300030: Flower8
+    21300032: Flower24
+    21300034: Flower28
+    21300036: Flower29
+    21300038: Flower15
+    21300040: Flower10
+    21300042: Flower9
+    21300044: Flower35
+    21300046: Flower36
+    21300048: Flower16
+    21300050: Flower25
+    21300052: Flower6
+    21300054: Flower18
+    21300056: Flower4
+    21300058: Flower17
+    21300060: Flower7
+    21300062: Flower12
+    21300064: Flower2
+    21300066: Flower26
+    21300068: Flower1
+    21300070: Flower11
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Flower19
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 424
+        height: 343
+      alignment: 9
+      pivot: {x: 0.4716981, y: 0.5349854}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower20
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 343
+        width: 424
+        height: 342
+      alignment: 9
+      pivot: {x: 0.4716981, y: 0.5349854}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower23
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 685
+        width: 423
+        height: 338
+      alignment: 9
+      pivot: {x: 0.46926713, y: 0.5414201}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower30
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 1023
+        width: 407
+        height: 369
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower31
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 1392
+        width: 407
+        height: 369
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower27
+      rect:
+        serializedVersion: 2
+        x: 424
+        y: 0
+        width: 385
+        height: 389
+      alignment: 9
+      pivot: {x: 0.52597404, y: 0.46915168}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower32
+      rect:
+        serializedVersion: 2
+        x: 424
+        y: 389
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower33
+      rect:
+        serializedVersion: 2
+        x: 424
+        y: 746
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower34
+      rect:
+        serializedVersion: 2
+        x: 424
+        y: 1103
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower13
+      rect:
+        serializedVersion: 2
+        x: 424
+        y: 1460
+        width: 377
+        height: 357
+      alignment: 9
+      pivot: {x: 0.49204245, y: 0.5140056}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower14
+      rect:
+        serializedVersion: 2
+        x: 809
+        y: 0
+        width: 370
+        height: 336
+      alignment: 9
+      pivot: {x: 0.52162164, y: 0.54464287}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower21
+      rect:
+        serializedVersion: 2
+        x: 809
+        y: 336
+        width: 370
+        height: 361
+      alignment: 9
+      pivot: {x: 0.44054055, y: 0.5609418}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower22
+      rect:
+        serializedVersion: 2
+        x: 809
+        y: 697
+        width: 370
+        height: 361
+      alignment: 9
+      pivot: {x: 0.4405406, y: 0.5609418}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower3
+      rect:
+        serializedVersion: 2
+        x: 809
+        y: 1058
+        width: 368
+        height: 376
+      alignment: 9
+      pivot: {x: 0.5, y: 0.48537233}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower5
+      rect:
+        serializedVersion: 2
+        x: 809
+        y: 1434
+        width: 363
+        height: 367
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4972752}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower8
+      rect:
+        serializedVersion: 2
+        x: 1179
+        y: 0
+        width: 361
+        height: 359
+      alignment: 9
+      pivot: {x: 0.5, y: 0.6197772}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower24
+      rect:
+        serializedVersion: 2
+        x: 1179
+        y: 359
+        width: 361
+        height: 359
+      alignment: 9
+      pivot: {x: 0.50277007, y: 0.61977714}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower28
+      rect:
+        serializedVersion: 2
+        x: 1179
+        y: 718
+        width: 360
+        height: 367
+      alignment: 9
+      pivot: {x: 0.55, y: 0.50272477}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower29
+      rect:
+        serializedVersion: 2
+        x: 1179
+        y: 1085
+        width: 360
+        height: 367
+      alignment: 9
+      pivot: {x: 0.5555556, y: 0.50272477}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower15
+      rect:
+        serializedVersion: 2
+        x: 1179
+        y: 1452
+        width: 358
+        height: 339
+      alignment: 9
+      pivot: {x: 0.43435752, y: 0.5418879}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower10
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 0
+        width: 348
+        height: 348
+      alignment: 9
+      pivot: {x: 0.5, y: 0.52442527}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower9
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 348
+        width: 346
+        height: 334
+      alignment: 9
+      pivot: {x: 0.5, y: 0.54640716}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower35
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 682
+        width: 345
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower36
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 1033
+        width: 345
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower16
+      rect:
+        serializedVersion: 2
+        x: 1540
+        y: 1384
+        width: 342
+        height: 350
+      alignment: 9
+      pivot: {x: 0.5292398, y: 0.51714283}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/FlowerAtlas2.png


+ 222 - 0
Assets/Resource/Sprite/Garden/FlowerAtlas2.png.meta

@@ -0,0 +1,222 @@
+fileFormatVersion: 2
+guid: 4d94f1705aa0577458695d3bcf244e65
+timeCreated: 1500617839
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: Flower25
+    21300002: Flower6
+    21300004: Flower18
+    21300006: Flower4
+    21300008: Flower17
+    21300010: Flower7
+    21300012: Flower12
+    21300014: Flower26
+    21300016: Flower2
+    21300018: Flower1
+    21300020: Flower11
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Flower25
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 340
+        height: 352
+      alignment: 9
+      pivot: {x: 0.4852941, y: 0.54545456}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower6
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 352
+        width: 336
+        height: 376
+      alignment: 9
+      pivot: {x: 0.5, y: 0.48537233}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower18
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 728
+        width: 336
+        height: 375
+      alignment: 9
+      pivot: {x: 0.51785713, y: 0.48666668}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower4
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 1103
+        width: 329
+        height: 393
+      alignment: 9
+      pivot: {x: 0.5, y: 0.4643766}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower17
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 1496
+        width: 329
+        height: 393
+      alignment: 9
+      pivot: {x: 0.5334346, y: 0.46692112}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower7
+      rect:
+        serializedVersion: 2
+        x: 340
+        y: 0
+        width: 320
+        height: 400
+      alignment: 9
+      pivot: {x: 0.5, y: 0.45625}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower12
+      rect:
+        serializedVersion: 2
+        x: 340
+        y: 400
+        width: 308
+        height: 386
+      alignment: 9
+      pivot: {x: 0.5, y: 0.47279793}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower26
+      rect:
+        serializedVersion: 2
+        x: 340
+        y: 786
+        width: 308
+        height: 386
+      alignment: 9
+      pivot: {x: 0.49675325, y: 0.4611399}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower2
+      rect:
+        serializedVersion: 2
+        x: 340
+        y: 1172
+        width: 256
+        height: 365
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower1
+      rect:
+        serializedVersion: 2
+        x: 340
+        y: 1537
+        width: 241
+        height: 365
+      alignment: 9
+      pivot: {x: 0.58298755, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower11
+      rect:
+        serializedVersion: 2
+        x: 660
+        y: 0
+        width: 194
+        height: 356
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5126405}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 18 - 9
Assets/Resource/XML/Config/flower_config.xml

@@ -18,14 +18,23 @@
   <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower17" anim="" />
   <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower18" anim="" />
   <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower19" anim="" />
-  <item id="20" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower20" anim="" />
-  <item id="21" name="茑萝" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower21" anim="" />
-  <item id="22" name="牵牛花(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower22" anim="" />
-  <item id="23" name="虞美人(红)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower23" anim="" />
-  <item id="24" name="郁金香(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower24" anim="" />
-  <item id="25" name="鸢尾(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower25" anim="" />
-  <item id="26" name="朱槿(粉)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower26" anim="" />
-  <item id="27" name="朱槿(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower27" anim="" />
+  <item id="20" name="曼陀罗(粉)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower20" anim="" />
+  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower21" anim="" />
+  <item id="22" name="玫瑰花(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower22" anim="" />
+  <item id="23" name="茑萝" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower23" anim="" />
+  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower24" anim="" />
+  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower25" anim="" />
+  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower26" anim="" />
+  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower27" anim="" />
+  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower28" anim="" />
+  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower29" anim="" />
+  <item id="30" name="满天星(白)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower30" anim="" />
+  <item id="31" name="满天星(粉)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower31" anim="" />
+  <item id="32" name="紫罗兰(白)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower32" anim="" />
+  <item id="33" name="紫罗兰(紫)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower33" anim="" />
+  <item id="34" name="紫罗兰(蓝)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower34" anim="" />
+  <item id="35" name="鸡冠花(红)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower35" anim="" />
+  <item id="36" name="鸡冠花(黄)" desc="" unlock_ahead_cur="" unlock_ahead="" icon="Flower36" anim="" />
   <comment>
     <id>
 id
@@ -41,7 +50,7 @@ id
 消耗货币
 </unlock_ahead_cur>
     <unlock_ahead>
-提前解锁消耗的货币xiao'haodehuo'bi
+提前解锁消耗的货币
 </unlock_ahead>
     <icon>
 图标

+ 17 - 8
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -116,14 +116,23 @@
     <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
     <Flower18 desc=""><![CDATA[铃兰(粉)]]></Flower18>
     <Flower19 desc=""><![CDATA[曼陀罗(橘)]]></Flower19>
-    <Flower20 desc=""><![CDATA[玫瑰花(红)]]></Flower20>
-    <Flower21 desc=""><![CDATA[茑萝]]></Flower21>
-    <Flower22 desc=""><![CDATA[牵牛花(紫)]]></Flower22>
-    <Flower23 desc=""><![CDATA[虞美人(红)]]></Flower23>
-    <Flower24 desc=""><![CDATA[郁金香(黄)]]></Flower24>
-    <Flower25 desc=""><![CDATA[鸢尾(紫)]]></Flower25>
-    <Flower26 desc=""><![CDATA[朱槿(粉)]]></Flower26>
-    <Flower27 desc=""><![CDATA[朱槿(黄)]]></Flower27>
+    <Flower20 desc=""><![CDATA[曼陀罗(粉)]]></Flower20>
+    <Flower21 desc=""><![CDATA[玫瑰花(红)]]></Flower21>
+    <Flower22 desc=""><![CDATA[玫瑰花(黄)]]></Flower22>
+    <Flower23 desc=""><![CDATA[茑萝]]></Flower23>
+    <Flower24 desc=""><![CDATA[牵牛花(紫)]]></Flower24>
+    <Flower25 desc=""><![CDATA[虞美人(红)]]></Flower25>
+    <Flower26 desc=""><![CDATA[郁金香(黄)]]></Flower26>
+    <Flower27 desc=""><![CDATA[鸢尾(紫)]]></Flower27>
+    <Flower28 desc=""><![CDATA[朱槿(粉)]]></Flower28>
+    <Flower29 desc=""><![CDATA[朱槿(黄)]]></Flower29>
+    <Flower30 desc=""><![CDATA[满天星(白)]]></Flower30>
+    <Flower31 desc=""><![CDATA[满天星(粉)]]></Flower31>
+    <Flower32 desc=""><![CDATA[紫罗兰(白)]]></Flower32>
+    <Flower33 desc=""><![CDATA[紫罗兰(紫)]]></Flower33>
+    <Flower34 desc=""><![CDATA[紫罗兰(蓝)]]></Flower34>
+    <Flower35 desc=""><![CDATA[鸡冠花(红)]]></Flower35>
+    <Flower36 desc=""><![CDATA[鸡冠花(黄)]]></Flower36>
   </FlowerName>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>

+ 17 - 8
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -116,14 +116,23 @@
     <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
     <Flower18 desc=""><![CDATA[鈴蘭(粉)]]></Flower18>
     <Flower19 desc=""><![CDATA[曼陀羅(橘)]]></Flower19>
-    <Flower20 desc=""><![CDATA[玫瑰花(紅)]]></Flower20>
-    <Flower21 desc=""><![CDATA[蔦蘿]]></Flower21>
-    <Flower22 desc=""><![CDATA[牽牛花(紫)]]></Flower22>
-    <Flower23 desc=""><![CDATA[虞美人(紅)]]></Flower23>
-    <Flower24 desc=""><![CDATA[鬱金香(黃)]]></Flower24>
-    <Flower25 desc=""><![CDATA[鳶尾(紫)]]></Flower25>
-    <Flower26 desc=""><![CDATA[朱槿(粉)]]></Flower26>
-    <Flower27 desc=""><![CDATA[朱槿(黃)]]></Flower27>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[玫瑰花(紅)]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[蔦蘿]]></Flower23>
+    <Flower24 desc=""><![CDATA[牽牛花(紫)]]></Flower24>
+    <Flower25 desc=""><![CDATA[虞美人(紅)]]></Flower25>
+    <Flower26 desc=""><![CDATA[鬱金香(黃)]]></Flower26>
+    <Flower27 desc=""><![CDATA[鳶尾(紫)]]></Flower27>
+    <Flower28 desc=""><![CDATA[朱槿(粉)]]></Flower28>
+    <Flower29 desc=""><![CDATA[朱槿(黃)]]></Flower29>
+    <Flower30 desc=""><![CDATA[]]></Flower30>
+    <Flower31 desc=""><![CDATA[]]></Flower31>
+    <Flower32 desc=""><![CDATA[]]></Flower32>
+    <Flower33 desc=""><![CDATA[]]></Flower33>
+    <Flower34 desc=""><![CDATA[]]></Flower34>
+    <Flower35 desc=""><![CDATA[]]></Flower35>
+    <Flower36 desc=""><![CDATA[]]></Flower36>
   </FlowerName>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>

+ 17 - 8
Assets/Resource/XML/lan/English.xml

@@ -116,14 +116,23 @@
     <Flower17 desc=""><![CDATA[Carnation(White)]]></Flower17>
     <Flower18 desc=""><![CDATA[Lily of the Valley(Pink)]]></Flower18>
     <Flower19 desc=""><![CDATA[Datura(Orange)]]></Flower19>
-    <Flower20 desc=""><![CDATA[Rose(Red)]]></Flower20>
-    <Flower21 desc=""><![CDATA[Crpress Vine]]></Flower21>
-    <Flower22 desc=""><![CDATA[Morning Glory(Purple)]]></Flower22>
-    <Flower23 desc=""><![CDATA[Corn Poppy(Red)]]></Flower23>
-    <Flower24 desc=""><![CDATA[Tulip(Yellow)]]></Flower24>
-    <Flower25 desc=""><![CDATA[Iris(Purple)]]></Flower25>
-    <Flower26 desc=""><![CDATA[China Rose(Pink)]]></Flower26>
-    <Flower27 desc=""><![CDATA[China Rose(Yellow)]]></Flower27>
+    <Flower20 desc=""><![CDATA[]]></Flower20>
+    <Flower21 desc=""><![CDATA[Rose(Red)]]></Flower21>
+    <Flower22 desc=""><![CDATA[]]></Flower22>
+    <Flower23 desc=""><![CDATA[Crpress Vine]]></Flower23>
+    <Flower24 desc=""><![CDATA[Morning Glory(Purple)]]></Flower24>
+    <Flower25 desc=""><![CDATA[Corn Poppy(Red)]]></Flower25>
+    <Flower26 desc=""><![CDATA[Tulip(Yellow)]]></Flower26>
+    <Flower27 desc=""><![CDATA[Iris(Purple)]]></Flower27>
+    <Flower28 desc=""><![CDATA[China Rose(Pink)]]></Flower28>
+    <Flower29 desc=""><![CDATA[China Rose(Yellow)]]></Flower29>
+    <Flower30 desc=""><![CDATA[]]></Flower30>
+    <Flower31 desc=""><![CDATA[]]></Flower31>
+    <Flower32 desc=""><![CDATA[]]></Flower32>
+    <Flower33 desc=""><![CDATA[]]></Flower33>
+    <Flower34 desc=""><![CDATA[]]></Flower34>
+    <Flower35 desc=""><![CDATA[]]></Flower35>
+    <Flower36 desc=""><![CDATA[]]></Flower36>
   </FlowerName>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 5 - 1
ToList.txt

@@ -1,7 +1,11 @@
-新花(语言文档 配置 DebugMode)
+新花(语言文档 配置 DebugMode FlowerAtlas的Bundle)
 
 广告的投放对象
 
+DebugInfo要收集Unity版本信息
+
+36朵花2048打包时卡死过一次
+
 
 还原PlayerConfig