LiuQilin 8 年 前
コミット
535fe7ff8a
53 ファイル変更867 行追加8 行削除
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. BIN
      Assets/Resource/Animations/Elf.controller
  3. BIN
      Assets/Resource/Animations/ElfFly.anim
  4. 1 1
      Assets/Resource/Animations/ElfFly.anim.meta
  5. BIN
      Assets/Resource/Prefab/Object/BeeBlue.prefab
  6. 8 0
      Assets/Resource/Prefab/Object/BeeBlue.prefab.meta
  7. BIN
      Assets/Resource/Prefab/Object/BeePurple.prefab
  8. 8 0
      Assets/Resource/Prefab/Object/BeePurple.prefab.meta
  9. BIN
      Assets/Resource/Prefab/Object/BeeRed.prefab
  10. 8 0
      Assets/Resource/Prefab/Object/BeeRed.prefab.meta
  11. BIN
      Assets/Resource/Prefab/Object/BeeWhite.prefab
  12. 8 0
      Assets/Resource/Prefab/Object/BeeWhite.prefab.meta
  13. BIN
      Assets/Resource/Prefab/Object/BeeYellow.prefab
  14. 8 0
      Assets/Resource/Prefab/Object/BeeYellow.prefab.meta
  15. BIN
      Assets/Resource/Prefab/Object/ButterflyBlue.prefab
  16. 8 0
      Assets/Resource/Prefab/Object/ButterflyBlue.prefab.meta
  17. BIN
      Assets/Resource/Prefab/Object/ButterflyPurple.prefab
  18. 8 0
      Assets/Resource/Prefab/Object/ButterflyPurple.prefab.meta
  19. BIN
      Assets/Resource/Prefab/Object/ButterflyRed.prefab
  20. 8 0
      Assets/Resource/Prefab/Object/ButterflyRed.prefab.meta
  21. BIN
      Assets/Resource/Prefab/Object/ButterflyWhite.prefab
  22. 8 0
      Assets/Resource/Prefab/Object/ButterflyWhite.prefab.meta
  23. BIN
      Assets/Resource/Prefab/Object/ButterflyYellow.prefab
  24. 8 0
      Assets/Resource/Prefab/Object/ButterflyYellow.prefab.meta
  25. BIN
      Assets/Resource/Prefab/Object/Flower.prefab
  26. BIN
      Assets/Resource/Sprite/Garden/蜜蜂技能效果.png
  27. BIN
      Assets/Resource/Sprite/Garden/蜜蜂技能效果2.png
  28. 68 0
      Assets/Resource/Sprite/Garden/蜜蜂技能效果2.png.meta
  29. BIN
      Assets/Resource/Sprite/Garden/蜜蜂技能效果3.png
  30. 68 0
      Assets/Resource/Sprite/Garden/蜜蜂技能效果3.png.meta
  31. BIN
      Assets/Resource/Sprite/Garden/蜜蜂技能效果4.png
  32. 68 0
      Assets/Resource/Sprite/Garden/蜜蜂技能效果4.png.meta
  33. BIN
      Assets/Resource/Sprite/Garden/蜜蜂技能效果5.png
  34. 68 0
      Assets/Resource/Sprite/Garden/蜜蜂技能效果5.png.meta
  35. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果.png
  36. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png
  37. 68 0
      Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png.meta
  38. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png
  39. 68 0
      Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png.meta
  40. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png
  41. 68 0
      Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png.meta
  42. BIN
      Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png
  43. 68 0
      Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png.meta
  44. 1 1
      Assets/Resource/Xlsx.meta
  45. BIN
      Assets/Resource/Xlsx/achieve_config.xlsx
  46. 188 0
      Assets/Script/Manage/ManaReso.cs
  47. 12 0
      Assets/Script/Object/AnimationReceiver.cs
  48. 12 0
      Assets/Script/Object/AnimationReceiver.cs.meta
  49. 12 5
      Assets/Script/Object/Flower.cs
  50. 1 1
      Assets/Script/Object/Slot.cs
  51. 5 0
      Assets/Script/Tool/Auxiliary.cs
  52. 9 0
      Assets/XlsxSource.meta
  53. 2 0
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resource/Animations/Elf.controller


BIN
Assets/Resource/Animations/ElfFly.anim


+ 1 - 1
Assets/Resource/Animations/ElfFly.anim.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 363f7c2e0f53a7441b79f739e0724561
+guid: 1d59bb6e5f588094fbe0a5ec773d3fc6
 timeCreated: 1491022339
 licenseType: Pro
 NativeFormatImporter:

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


+ 8 - 0
Assets/Resource/Prefab/Object/BeeBlue.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd76b8ae8b2d75e42812830672529b1c
+timeCreated: 1491386523
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/BeePurple.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 105e4314b1f440b4aaef72235c0b8066
+timeCreated: 1491386521
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/BeeRed.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 270e8226cab1ad545a9898511758c577
+timeCreated: 1491386525
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/BeeWhite.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45b26d531a9fd074d99b0366748dd7b7
+timeCreated: 1491386515
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/BeeYellow.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f2ed9de9bf1e7d469431352a9eea14c
+timeCreated: 1491386518
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/ButterflyBlue.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b83568af2a6c2574d9a102a98a611a41
+timeCreated: 1491386536
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/ButterflyPurple.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d3fe64ca1c778247b93e3e24d9ad233
+timeCreated: 1491386538
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/ButterflyRed.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59e4d3b5091a94b42a0e004652ffb582
+timeCreated: 1491386533
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/ButterflyWhite.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b4f5525af1229f74698800a4c561fb0c
+timeCreated: 1491386528
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


+ 8 - 0
Assets/Resource/Prefab/Object/ButterflyYellow.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb50d8cb36258b7459e3f99e896e3304
+timeCreated: 1491386531
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: character
+  assetBundleVariant: 

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


BIN
Assets/Resource/Sprite/Garden/蜜蜂技能效果.png


BIN
Assets/Resource/Sprite/Garden/蜜蜂技能效果2.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蜜蜂技能效果2.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: ebc1119f992e078458ae897199fc3b48
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蜜蜂技能效果3.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蜜蜂技能效果3.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 808053d8bb98d124fac454f652d772d8
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蜜蜂技能效果4.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蜜蜂技能效果4.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 8be90607a97ac7842867d389e30c43ea
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蜜蜂技能效果5.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蜜蜂技能效果5.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: cc8a39bb941f4aa408ef3d942a5b4beb
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果.png


BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蝴蝶技能效果2.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 10e90d3c1c5f0354786bcaebb6746b9f
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蝴蝶技能效果3.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 69598ae5ce2e3c04ba58e6a89ae5fdcb
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蝴蝶技能效果4.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 70cb02380943ab44b9b6c5f6a2425493
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png


+ 68 - 0
Assets/Resource/Sprite/Garden/蝴蝶技能效果5.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 2751e2d88a82ab2459f19d47dcd7c9a9
+timeCreated: 1491381403
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/Xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 50d11f91d6aba8a428d438edad22cadc
+guid: 29435d86f78e9764f9e05b2bf178622f
 folderAsset: yes
 timeCreated: 1487720918
 licenseType: Pro

BIN
Assets/Resource/Xlsx/achieve_config.xlsx


+ 188 - 0
Assets/Script/Manage/ManaReso.cs

@@ -29,8 +29,30 @@ public enum ObjType
     Flower,
     HudText,
     FlowerItem,
+
     DropGold,
     DropDiamond,
+
+    BeeRed,
+    BeeBlue,
+    BeeWhite,
+    BeePurple,
+    BeeYellow,
+
+    ButterflyRed,
+    ButterflyBlue,
+    ButterflyWhite,
+    ButterflyPurple,
+    ButterflyYellow,
+}
+
+public enum AnimColor
+{
+    Red,
+    Blue,
+    White,
+    Purple,
+    Yellow,
 }
 
 public class ManaReso : Regist
@@ -293,6 +315,172 @@ public class ManaReso : Regist
         return hudText;
     }
 
+    public static Transform GetBee(AnimColor color, Transform parTra, Transform posTra)
+    {
+        if (color == AnimColor.Red)
+        {
+            Transform tra = Get("BeeRed", Folder.Character, false, parTra, posTra.position, ObjType.BeeRed);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeRed;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Blue)
+        {
+            Transform tra = Get("BeeBlue", Folder.Character, false, parTra, posTra.position, ObjType.BeeBlue);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeBlue;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.White)
+        {
+            Transform tra = Get("BeeWhite", Folder.Character, false, parTra, posTra.position, ObjType.BeeWhite);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeWhite;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Purple)
+        {
+            Transform tra = Get("BeePurple", Folder.Character, false, parTra, posTra.position, ObjType.BeePurple);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeePurple;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Yellow)
+        {
+            Transform tra = Get("BeeYellow", Folder.Character, false, parTra, posTra.position, ObjType.BeeYellow);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeYellow;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
+    public static Transform GetButterfly(AnimColor color, Transform parTra, Transform posTra)
+    {
+        if (color == AnimColor.Red)
+        {
+            Transform tra = Get("ButterflyRed", Folder.Character, false, parTra, posTra.position, ObjType.BeeRed);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.BeeRed;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Blue)
+        {
+            Transform tra = Get("ButterflyBlue", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyBlue);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyBlue;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.White)
+        {
+            Transform tra = Get("ButterflyWhite", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyWhite);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyWhite;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Purple)
+        {
+            Transform tra = Get("ButterflyPurple", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyPurple);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyPurple;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else if (color == AnimColor.Yellow)
+        {
+            Transform tra = Get("ButterflyYellow", Folder.Character, false, parTra, posTra.position, ObjType.ButterflyYellow);
+
+            ObjRoot objRoot = tra.GetComponent<ObjRoot>();
+
+            if (objRoot == null)
+            {
+                tra.AddComponent<ObjRoot>().ObjType = ObjType.ButterflyYellow;
+
+                tra.GetChild(0).AddComponent<AnimationReceiver>();
+            }
+
+            return tra;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     public static Transform GetSkillItem(SkillRoot skillRoot)
     {
         Transform tra;

+ 12 - 0
Assets/Script/Object/AnimationReceiver.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class AnimationReceiver : MonoBehaviour
+{
+    public void SaveAnim()
+    {
+        ManaReso.Save(transform.parent);
+    }
+}

+ 12 - 0
Assets/Script/Object/AnimationReceiver.cs.meta

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

+ 12 - 5
Assets/Script/Object/Flower.cs

@@ -210,7 +210,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     public int Id;
     public Slot Slot;
     public Vector3 LocalPos;
-    public Animator Animator;
+    public Animator ParticleAC;
     public Transform GoldBk;
     public Transform GoldIcon;
 
@@ -226,7 +226,7 @@ public class Flower : ObjRoot, IPointerClickHandler
 
         GoldBk = ChildDic["GoldBk"];
         GoldIcon = ChildDic["GoldIcon"];
-        Animator = ChildDic["FlashLight"].GetComponent<Animator>();
+        ParticleAC = ChildDic["FlashLight"].GetComponent<Animator>();
         FlowerIcon = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
         OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
@@ -353,7 +353,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         {
             Phase++;
 
-            PlayAnim();
+            PlayParticle();
 
             OperateBk.TweenBacScale();
 
@@ -366,13 +366,20 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     public void PlayAnim()
     {
-        Animator.SetTrigger("Play");
+        Animator animator = ManaReso.GetBee(AnimColor.Purple, transform, ChildDic["OperateBk"]).GetComponentInChildren<Animator>();
+
+        animator.SetTrigger("Play");
+    }
+
+    public void PlayParticle()
+    {
+        ParticleAC.SetTrigger("Play");
     }
 
 
     public void GetAward()
     {
-        PlayAnim();
+        PlayParticle();
 
         ManaGarden.Award = true;
 

+ 1 - 1
Assets/Script/Object/Slot.cs

@@ -65,7 +65,7 @@ public class Slot : MonoBehaviour
 
         if (anim)
         {
-            Flower.PlayAnim();
+            Flower.PlayParticle();
         }
 
         ManaGarden.Award = true;

+ 5 - 0
Assets/Script/Tool/Auxiliary.cs

@@ -71,6 +71,11 @@ public class Auxiliary : MonoBehaviour
     {
         #region 调试
 
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            ManaGarden.PlantList[5].Flower.PlayAnim();
+        }
+
         if (Input.GetKeyDown(KeyCode.P))
         {
             ManaData.Level += 20;

+ 9 - 0
Assets/XlsxSource.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 50d11f91d6aba8a428d438edad22cadc
+folderAsset: yes
+timeCreated: 1487720918
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
ToList.txt

@@ -1,3 +1,5 @@
+蜜蜂蝴蝶(位置偏移 翻转)
+
 成就
 
 切换后台