fenix 8 years ago
parent
commit
aaef202fc9
64 changed files with 144 additions and 36 deletions
  1. BIN
      Assets/Models/Battle/BattleController.prefab
  2. BIN
      Assets/Models/Battle/CraftsNew/Materials/Assassin.mat
  3. BIN
      Assets/Models/Battle/CraftsNew/Materials/Dasher.mat
  4. BIN
      Assets/Models/Battle/CraftsNew/Materials/Dasher1.mat
  5. BIN
      Assets/Models/Battle/CraftsNew/Materials/Flame.mat
  6. BIN
      Assets/Models/Battle/CraftsNew/Materials/Hunter.mat
  7. BIN
      Assets/Models/Battle/CraftsNew/Materials/Ice.mat
  8. BIN
      Assets/Models/Battle/CraftsNew/Materials/Medic.mat
  9. BIN
      Assets/Models/Battle/CraftsNew/Materials/No Name.mat
  10. BIN
      Assets/Models/Battle/CraftsNew/Materials/Spider.mat
  11. BIN
      Assets/Models/Battle/CraftsNew/Materials/Thunder.mat
  12. BIN
      Assets/Resources/Materials/CraftShadow.mat
  13. 8 0
      Assets/Resources/Materials/CraftShadow.mat.meta
  14. BIN
      Assets/Resources/Materials/CraftShadow.png
  15. 92 0
      Assets/Resources/Materials/CraftShadow.png.meta
  16. BIN
      Assets/Resources/Materials/Shadow.mat
  17. BIN
      Assets/Resources/Prefabs/Buildings/DoorModel.prefab
  18. BIN
      Assets/Resources/Prefabs/CraftsNew/Assassin.prefab
  19. BIN
      Assets/Resources/Prefabs/CraftsNew/CraftAgent.prefab
  20. BIN
      Assets/Resources/Prefabs/CraftsNew/Dasher.prefab
  21. BIN
      Assets/Resources/Prefabs/CraftsNew/Flame.prefab
  22. BIN
      Assets/Resources/Prefabs/CraftsNew/Hunter.prefab
  23. BIN
      Assets/Resources/Prefabs/CraftsNew/Ice.prefab
  24. BIN
      Assets/Resources/Prefabs/CraftsNew/Medic.prefab
  25. BIN
      Assets/Resources/Prefabs/CraftsNew/Spider.prefab
  26. BIN
      Assets/Resources/Prefabs/CraftsNew/Thunder.prefab
  27. BIN
      Assets/Resources/Prefabs/CraftsNew/TinySpider.prefab
  28. 13 13
      Assets/Resources/XML/Config/All/power_config.xml
  29. BIN
      Assets/ScenesNew/Base.unity
  30. BIN
      Assets/ScenesNew/Base/LightingData.asset
  31. 1 1
      Assets/ScenesNew/Base/LightingData.asset.meta
  32. BIN
      Assets/ScenesNew/Base/Lightmap-0_comp_dir.png
  33. 1 1
      Assets/ScenesNew/Base/Lightmap-0_comp_dir.png.meta
  34. BIN
      Assets/ScenesNew/Base/Lightmap-0_comp_light.exr
  35. 1 1
      Assets/ScenesNew/Base/Lightmap-0_comp_light.exr.meta
  36. 1 1
      Assets/ScenesNew/Base/ReflectionProbe-0.exr.meta
  37. BIN
      Assets/ScenesNew/Challenge.unity
  38. BIN
      Assets/ScenesNew/Challenge/LightingData.asset
  39. 1 1
      Assets/ScenesNew/Challenge/LightingData.asset.meta
  40. BIN
      Assets/ScenesNew/Challenge/Lightmap-0_comp_dir.png
  41. 1 1
      Assets/ScenesNew/Challenge/Lightmap-0_comp_dir.png.meta
  42. BIN
      Assets/ScenesNew/Challenge/Lightmap-0_comp_light.exr
  43. 1 1
      Assets/ScenesNew/Challenge/Lightmap-0_comp_light.exr.meta
  44. 1 1
      Assets/ScenesNew/Challenge/ReflectionProbe-0.exr.meta
  45. BIN
      Assets/ScenesNew/Defense.unity
  46. BIN
      Assets/ScenesNew/Defense/LightingData.asset
  47. 1 1
      Assets/ScenesNew/Defense/LightingData.asset.meta
  48. BIN
      Assets/ScenesNew/Defense/Lightmap-0_comp_dir.png
  49. 1 1
      Assets/ScenesNew/Defense/Lightmap-0_comp_dir.png.meta
  50. BIN
      Assets/ScenesNew/Defense/Lightmap-0_comp_light.exr
  51. 1 1
      Assets/ScenesNew/Defense/Lightmap-0_comp_light.exr.meta
  52. 1 1
      Assets/ScenesNew/Defense/ReflectionProbe-0.exr.meta
  53. BIN
      Assets/ScenesNew/Flag.unity
  54. BIN
      Assets/ScenesNew/Flag/LightingData.asset
  55. 1 1
      Assets/ScenesNew/Flag/LightingData.asset.meta
  56. BIN
      Assets/ScenesNew/Flag/Lightmap-0_comp_dir.png
  57. 1 1
      Assets/ScenesNew/Flag/Lightmap-0_comp_dir.png.meta
  58. BIN
      Assets/ScenesNew/Flag/Lightmap-0_comp_light.exr
  59. 1 1
      Assets/ScenesNew/Flag/Lightmap-0_comp_light.exr.meta
  60. 1 1
      Assets/ScenesNew/Flag/ReflectionProbe-0.exr.meta
  61. 13 5
      Assets/Scripts/Battle/Map/Craft/Craft.cs
  62. BIN
      Assets/XlsxSource/All/power_config.xlsx
  63. 2 2
      Assets/XlsxSource/All/xlsx_md5.xml
  64. BIN
      ProjectSettings/ProjectSettings.asset

BIN
Assets/Models/Battle/BattleController.prefab


BIN
Assets/Models/Battle/CraftsNew/Materials/Assassin.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Dasher.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Dasher1.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Flame.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Hunter.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Ice.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Medic.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/No Name.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Spider.mat


BIN
Assets/Models/Battle/CraftsNew/Materials/Thunder.mat


BIN
Assets/Resources/Materials/CraftShadow.mat


+ 8 - 0
Assets/Resources/Materials/CraftShadow.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2699b660587b41449acd2f2d3efc0073
+timeCreated: 1454244558
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resources/Materials/CraftShadow.png


+ 92 - 0
Assets/Resources/Materials/CraftShadow.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 0a371cddf7e840a43b0445292db658a8
+timeCreated: 1495706937
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resources/Materials/Shadow.mat


BIN
Assets/Resources/Prefabs/Buildings/DoorModel.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Assassin.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/CraftAgent.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Dasher.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Flame.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Hunter.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Ice.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Medic.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Spider.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/Thunder.prefab


BIN
Assets/Resources/Prefabs/CraftsNew/TinySpider.prefab


+ 13 - 13
Assets/Resources/XML/Config/All/power_config.xml

@@ -1,28 +1,28 @@
 <data>
   <item id="10" name="铁拳攻击" description="" type="1" effect="" crystal="" distance="3" cd="2" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="Melee" s_effect="bullet_dasher" g_hit="HunterHit" s_hit="" icon="" />
-  <item id="11" name="冲锋" description="快速冲向目标,并对目标造成伤害,并且是目标短时间丧失行动能力" type="8" effect="" crystal="" distance="8" cd="12" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="1" shake="" anim="1" g_effect="" s_effect="" g_hit="" s_hit="" icon="" />
-  <item id="12" name="雷霆一击" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="3" value_type="" decay="" buff="2" shake="1" anim="" g_effect="DashQuakeBullet" s_effect="bullet_dasher_quake" g_hit="" s_hit="" icon="" />
+  <item id="11" name="冲锋" description="快速冲向目标,并对目标造成伤害,并且是目标短时间丧失行动能力" type="8" effect="" crystal="" distance="8" cd="12" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="1" shake="" anim="1" g_effect="" s_effect="" g_hit="" s_hit="" icon="" />
+  <item id="12" name="雷霆一击" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="2" shake="1" anim="" g_effect="DashQuakeBullet" s_effect="bullet_dasher_quake" g_hit="" s_hit="" icon="" />
   <item id="20" name="追猎者攻击" description="" type="" effect="" crystal="" distance="8" cd="1.5" bnum="16" binterval="0.08" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="HunterBullet" s_effect="bullet_hunter" g_hit="HunterHit" s_hit="hit_hunter" icon="" />
-  <item id="21" name="乱射" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="0.1" target="3" target_type="" target_lim="4" target_sort="1" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="HunterSnap" s_effect="bullet_huntersnap" g_hit="HunterSnapHit" s_hit="hit_huntersnap" icon="" />
+  <item id="21" name="乱射" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="0.1" target="3" target_type="" target_lim="4" target_sort="1" value="2" value_type="" decay="" buff="" shake="" anim="" g_effect="HunterSnap" s_effect="bullet_huntersnap" g_hit="HunterSnapHit" s_hit="hit_huntersnap" icon="" />
   <item id="22" name="闪烁" description="瞬间移动一段距离" type="4" effect="2" crystal="" distance="8" cd="5" bnum="" binterval="" target="1" target_type="" target_lim="" target_sort="" value="" value_type="" decay="" buff="" shake="" anim="" g_effect="" s_effect="effect_teleport_appear" g_hit="" s_hit="" icon="" />
   <item id="30" name="雷神攻击" description="" type="2" effect="" crystal="" distance="8" cd="2" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="ThunderBullet" s_effect="bullet_thunder_chain_lightning" g_hit="" s_hit="" icon="" />
-  <item id="31" name="闪电重击" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="3" shake="" anim="" g_effect="ThunderThump" s_effect="bullet_thunder_thump" g_hit="" s_hit="" icon="" />
-  <item id="32" name="连锁闪电" description="" type="2" effect="" crystal="" distance="8" cd="10" bnum="" binterval="" target="2" target_type="" target_lim="4" target_sort="1" value="3" value_type="" decay="30" buff="" shake="" anim="" g_effect="ThunderBullet" s_effect="bullet_thunder_chain_lightning" g_hit="" s_hit="" icon="" />
+  <item id="31" name="闪电重击" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="3" shake="" anim="" g_effect="ThunderThump" s_effect="bullet_thunder_thump" g_hit="" s_hit="" icon="" />
+  <item id="32" name="连锁闪电" description="" type="2" effect="" crystal="" distance="8" cd="10" bnum="" binterval="" target="2" target_type="" target_lim="4" target_sort="1" value="4" value_type="" decay="30" buff="" shake="" anim="" g_effect="ThunderBullet" s_effect="bullet_thunder_chain_lightning" g_hit="" s_hit="" icon="" />
   <item id="40" name="刺客攻击" description="" type="1" effect="" crystal="" distance="3" cd="2" bnum="2" binterval="0.1" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="Melee" s_effect="bullet_blade" g_hit="AssassinHit" s_hit="" icon="" />
-  <item id="41" name="背刺" description="隐形,敌人无法发现你" type="1" effect="2" crystal="" distance="3" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="3" shake="" anim="" g_effect="Melee" s_effect="bullet_blade" g_hit="AssassinHit" s_hit="" icon="" />
-  <item id="42" name="突袭" description="瞬间移动到敌人旁边并对其造成伤害" type="4" effect="" crystal="" distance="8" cd="5" bnum="2" binterval="0.1" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="" shake="" anim="" g_effect="Melee" s_effect="bullet_blade" g_hit="AssassinHit" s_hit="" icon="" />
+  <item id="41" name="背刺" description="隐形,敌人无法发现你" type="1" effect="2" crystal="" distance="3" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="3" shake="" anim="" g_effect="Melee" s_effect="bullet_blade" g_hit="AssassinHit" s_hit="" icon="" />
+  <item id="42" name="突袭" description="瞬间移动到敌人旁边并对其造成伤害" type="4" effect="" crystal="" distance="8" cd="5" bnum="2" binterval="0.1" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="" shake="" anim="" g_effect="Melee" s_effect="bullet_blade" g_hit="AssassinHit" s_hit="" icon="" />
   <item id="50" name="庇护者攻击" description="" type="" effect="" crystal="" distance="8" cd="2" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="bullet_medic" g_hit="MedicHit" s_hit="hit_medic" icon="" />
-  <item id="51" name="修复" description="" type="" effect="1" crystal="" distance="8" cd="5" bnum="" binterval="" target="3" target_type="2" target_lim="1" target_sort="1" value="4" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="" g_hit="MedicHealHit" s_hit="bullet_heal" icon="" />
-  <item id="52" name="群体修复" description="" type="" effect="1" crystal="" distance="8" cd="10" bnum="" binterval="0.05" target="3" target_type="2" target_lim="4" target_sort="1" value="3" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="" g_hit="MedicHealHit" s_hit="bullet_heal" icon="" />
+  <item id="51" name="修复" description="" type="" effect="1" crystal="" distance="8" cd="5" bnum="" binterval="" target="3" target_type="2" target_lim="1" target_sort="1" value="5" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="" g_hit="MedicHealHit" s_hit="bullet_heal" icon="" />
+  <item id="52" name="群体修复" description="" type="" effect="1" crystal="" distance="8" cd="10" bnum="" binterval="0.05" target="3" target_type="2" target_lim="4" target_sort="1" value="2" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="" g_hit="MedicHealHit" s_hit="bullet_heal" icon="" />
   <item id="60" name="蜘蛛攻击" description="" type="" effect="" crystal="" distance="6" cd="2" bnum="2" binterval="0.05" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="SpiderBullet" s_effect="bullet_spider" g_hit="SpiderHit" s_hit=" hit_spider" icon="" />
   <item id="61" name="蜘蛛网" description="" type="" effect="2" crystal="" distance="8" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="" value_type="" decay="" buff="5" shake="" anim="" g_effect="SpiderNet" s_effect="bullet_normal" g_hit="" s_hit="" icon="" />
   <item id="62" name="小蜘蛛" description="制造一个小蜘蛛来为你战斗" type="5" effect="2" crystal="" distance="" cd="10" bnum="" binterval="" target="" target_type="2" target_lim="2" target_sort="" value="1001" value_type="2" decay="" buff="" shake="" anim="" g_effect="" s_effect="effect_teleport_appear" g_hit="" s_hit="" icon="" />
   <item id="70" name="冰霜攻击" description="" type="" effect="" crystal="" distance="8" cd="1.5" bnum="12" binterval="0.1" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="HunterBullet" s_effect="bullet_hunter" g_hit="HunterHit" s_hit="hit_hunter" icon="" />
-  <item id="71" name="冰霜之箭" description="" type="" effect="" crystal="" distance="8" cd="5" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="6" shake="" anim="" g_effect="IceArrow" s_effect="bullet_ice" g_hit="MedicHit" s_hit="" icon="" />
-  <item id="72" name="霜之新星" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="3" value_type="" decay="" buff="7" shake="" anim="" g_effect="IceNova" s_effect="bullet_ice" g_hit="" s_hit="" icon="" />
+  <item id="71" name="冰霜之箭" description="" type="" effect="" crystal="" distance="8" cd="5" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="6" shake="" anim="" g_effect="IceArrow" s_effect="bullet_ice" g_hit="MedicHit" s_hit="" icon="" />
+  <item id="72" name="霜之新星" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="7" shake="" anim="" g_effect="IceNova" s_effect="bullet_ice" g_hit="" s_hit="" icon="" />
   <item id="80" name="烈焰攻击" description="" type="" effect="" crystal="" distance="4" cd="1.5" bnum="2" binterval="" target="5" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="Flame" s_effect="bullet_flame" g_hit="" s_hit="" icon="" />
-  <item id="81" name="大火球" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="" shake="" anim="" g_effect="FlameBall" s_effect="bullet_flame_ball" g_hit="HunterSnapHit" s_hit="hit_huntersnap" icon="" />
-  <item id="82" name="烈焰新星" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="3" value_type="" decay="" buff="" shake="" anim="" g_effect="FlameNova" s_effect="bullet_flame_breath" g_hit="" s_hit="" icon="" />
+  <item id="81" name="大火球" description="" type="" effect="" crystal="" distance="8" cd="8" bnum="" binterval="" target="" target_type="" target_lim="" target_sort="" value="5" value_type="" decay="" buff="" shake="" anim="" g_effect="FlameBall" s_effect="bullet_flame_ball" g_hit="HunterSnapHit" s_hit="hit_huntersnap" icon="" />
+  <item id="82" name="烈焰新星" description="" type="6" effect="" crystal="" distance="5" cd="10" bnum="" binterval="" target="3" target_type="" target_lim="" target_sort="" value="4" value_type="" decay="" buff="" shake="" anim="" g_effect="FlameNova" s_effect="bullet_flame_breath" g_hit="" s_hit="" icon="" />
   <item id="1001" name="小蜘蛛攻击" description="" type="" effect="" crystal="" distance="6" cd="2" bnum="2" binterval="0.05" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="SpiderBulletTiny" s_effect="bullet_spider" g_hit="SpiderHitTiny" s_hit=" hit_spider" icon="" />
   <item id="1002" name="防御塔攻击" description="" type="" effect="" crystal="" distance="8" cd="2" bnum="2" binterval="" target="" target_type="" target_lim="" target_sort="" value="1" value_type="" decay="" buff="" shake="" anim="" g_effect="HunterSnap" s_effect="bullet_huntersnap" g_hit="HunterSnapHit" s_hit="hit_huntersnap" icon="" />
   <item id="2001" name="加血无人机攻击" description="" type="" effect="1" crystal="" distance="3" cd="5" bnum="" binterval="" target="" target_type="2" target_lim="" target_sort="" value="5" value_type="" decay="" buff="" shake="" anim="" g_effect="MedicBullet" s_effect="bullet_medic" g_hit="MedicHealHit" s_hit="bullet_heal" icon="" />

BIN
Assets/ScenesNew/Base.unity


BIN
Assets/ScenesNew/Base/LightingData.asset


+ 1 - 1
Assets/ScenesNew/Base/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c5fbe7827d4169647a801ec8be07861d
-timeCreated: 1494412716
+timeCreated: 1495713299
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/ScenesNew/Base/Lightmap-0_comp_dir.png


+ 1 - 1
Assets/ScenesNew/Base/Lightmap-0_comp_dir.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 284a00f120507314d88d5d544fcbd082
-timeCreated: 1494412675
+timeCreated: 1495713259
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

BIN
Assets/ScenesNew/Base/Lightmap-0_comp_light.exr


+ 1 - 1
Assets/ScenesNew/Base/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e66f723ca1782bb428288896f414a62e
-timeCreated: 1494412675
+timeCreated: 1495713259
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/ScenesNew/Base/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b369976f54e0e144b87349a20fe1dd19
-timeCreated: 1494412715
+timeCreated: 1495713299
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

BIN
Assets/ScenesNew/Challenge.unity


BIN
Assets/ScenesNew/Challenge/LightingData.asset


+ 1 - 1
Assets/ScenesNew/Challenge/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 9b69c098db4b9384b8fe2db0e389dd9d
-timeCreated: 1494414277
+timeCreated: 1495713776
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/ScenesNew/Challenge/Lightmap-0_comp_dir.png


+ 1 - 1
Assets/ScenesNew/Challenge/Lightmap-0_comp_dir.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b6a3cc377fffbc54b9d0be178084b3f6
-timeCreated: 1494414235
+timeCreated: 1495713738
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

BIN
Assets/ScenesNew/Challenge/Lightmap-0_comp_light.exr


+ 1 - 1
Assets/ScenesNew/Challenge/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4058dbe856bb9304a8b45ef2843780db
-timeCreated: 1494414235
+timeCreated: 1495713738
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/ScenesNew/Challenge/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a98cb6e661e41f544903026d95686c7e
-timeCreated: 1494414276
+timeCreated: 1495713775
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

BIN
Assets/ScenesNew/Defense.unity


BIN
Assets/ScenesNew/Defense/LightingData.asset


+ 1 - 1
Assets/ScenesNew/Defense/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a127b7a09ec08804bb6d8d8745efedd9
-timeCreated: 1494414402
+timeCreated: 1495713972
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/ScenesNew/Defense/Lightmap-0_comp_dir.png


+ 1 - 1
Assets/ScenesNew/Defense/Lightmap-0_comp_dir.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1c8662bc757ad8f4ca7ce5bcb71e88aa
-timeCreated: 1494414362
+timeCreated: 1495713932
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

BIN
Assets/ScenesNew/Defense/Lightmap-0_comp_light.exr


+ 1 - 1
Assets/ScenesNew/Defense/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 60177a6c7d839d6458cea9ed69c69ff1
-timeCreated: 1494414362
+timeCreated: 1495713932
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/ScenesNew/Defense/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 967e0aaef7b1bbc4d993f18b138c8c12
-timeCreated: 1494414401
+timeCreated: 1495713972
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

BIN
Assets/ScenesNew/Flag.unity


BIN
Assets/ScenesNew/Flag/LightingData.asset


+ 1 - 1
Assets/ScenesNew/Flag/LightingData.asset.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: cbf77ea95fb8ff849a15b4ae5bcbf286
-timeCreated: 1494414483
+timeCreated: 1495714060
 licenseType: Pro
 NativeFormatImporter:
   userData: 

BIN
Assets/ScenesNew/Flag/Lightmap-0_comp_dir.png


+ 1 - 1
Assets/ScenesNew/Flag/Lightmap-0_comp_dir.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5bc84043d8a65b74f8d8bc6cf0db31c9
-timeCreated: 1494414441
+timeCreated: 1495714019
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

BIN
Assets/ScenesNew/Flag/Lightmap-0_comp_light.exr


+ 1 - 1
Assets/ScenesNew/Flag/Lightmap-0_comp_light.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e48fe2be4ee8ada4e94453b0e7160c7a
-timeCreated: 1494414441
+timeCreated: 1495714019
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

+ 1 - 1
Assets/ScenesNew/Flag/ReflectionProbe-0.exr.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5f7525a9e720d64438703c84753ee52f
-timeCreated: 1494414482
+timeCreated: 1495714059
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:

+ 13 - 5
Assets/Scripts/Battle/Map/Craft/Craft.cs

@@ -321,7 +321,8 @@ public class Craft : BattleObject, IPowerOwner
 
 	private void UpdateMoveSpeed()
 	{
-		meshAgent.speed = moveSpeed;
+		if(meshAgent != null)
+			meshAgent.speed = moveSpeed;
 	}
 
 	public void MoveTo(int col, int row)
@@ -351,10 +352,12 @@ public class Craft : BattleObject, IPowerOwner
 	{
 		m_Moving = value;
 		craftModel.moving = value;
-		if(value)
-			meshAgent.Resume ();
-		else
-			meshAgent.Stop ();
+		if (meshAgent != null) {
+			if (value)
+				meshAgent.Resume ();
+			else
+				meshAgent.Stop ();
+		}
 	}
 
 	public void StopMove()
@@ -415,6 +418,11 @@ public class Craft : BattleObject, IPowerOwner
 
 	private void moving()
 	{
+		if (meshAgent == null) {
+			StopMove ();
+			return;
+		}
+		
 		meshAgent.SetDestination (moveDestination);
 
 		if (_teleportStep > 0) {

BIN
Assets/XlsxSource/All/power_config.xlsx


+ 2 - 2
Assets/XlsxSource/All/xlsx_md5.xml

@@ -3,10 +3,10 @@
   <a p="craft_config.xlsx" m="ee146d02fce5314bcb7265aabda2589" />
   <a p="equip_config.xlsx" m="90c4c38b3e7247e166f20e5addbc0a5" />
   <a p="halo_config.xlsx" m="94d38fe33310a5bbee5567e854a6c62" />
-  <a p="power_config.xlsx" m="46db6766729f54af18f9f79cf17ca73" />
+  <a p="power_config.xlsx" m="cf667f76a06f5e3e627db144b963573" />
   <a p="shop_config.xlsx" m="6cb07440e569e46bab9271ac43f7e84" />
   <a p="skin_config.xlsx" m="789f4f375c2a74b6364d92515a7bc35" />
   <a p="uav_config.xlsx" m="2b63e78ee3976e9c547a2829ea9a9bc" />
   <a p="word_config.xlsx" m="87f594888e8ad43612bbf266dc69d8f" />
-  <a p="xlsx_md5.xml" m="efb45f2fddef159878b8d1589d1e8b4e" />
+  <a p="xlsx_md5.xml" m="5d75590498f947fb5993866bf87971a" />
 </xlsx>

BIN
ProjectSettings/ProjectSettings.asset