From 9ba26d8f5c0103d9f6bbc15ec76dde8ec935979b Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Thu, 22 Oct 2020 11:08:43 +0800
Subject: [PATCH] 加入对向的玉米动画
---
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 3
Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat.meta | 8
Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png.meta | 118 +++++++++++++
Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat | 81 +++++++++
Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat | 2
Assets/Scripts/ActionGameFramework/Health/Damager.cs | 1
Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png | 0
Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat.meta | 8
Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat | 2
Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab | 7
Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png.meta | 118 +++++++++++++
Assets/Scripts/TowerDefense/Towers/Tower.cs | 63 ++++--
Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat | 81 +++++++++
Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs | 5
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab | 3
Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png | 0
16 files changed, 474 insertions(+), 26 deletions(-)
diff --git a/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat b/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat
new file mode 100644
index 0000000..b86726a
--- /dev/null
+++ b/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat
@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: fire_oppo_attackMat
+ m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 0ac8473d1b445a940a436c53e810d52c, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HorizontalAmount: 4
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _Speed: 10
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _VerticalAmount: 2
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat.meta b/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat.meta
new file mode 100644
index 0000000..3e08d61
--- /dev/null
+++ b/Assets/Materials/PVPTD/Materials/fire_oppo_attackMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b76af36f09691e4786306de51cd3c55
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat b/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat
new file mode 100644
index 0000000..a45e3a0
--- /dev/null
+++ b/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat
@@ -0,0 +1,81 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: fire_oppo_waitMat
+ m_Shader: {fileID: 4800000, guid: c00c30c0ead4b7541b8bd8219a17fcc0, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: be563b91693c0a34da30612dad5f468d, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _HorizontalAmount: 4
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _Speed: 10
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _VerticalAmount: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat.meta b/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat.meta
new file mode 100644
index 0000000..0fb7c7a
--- /dev/null
+++ b/Assets/Materials/PVPTD/Materials/fire_oppo_waitMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: feea27d1dcd3ca243b7114897ae749ae
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat b/Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat
index a96c121..eed7efc 100644
--- a/Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat
+++ b/Assets/Materials/PVPTD/Materials/fire_self_attackMat.mat
@@ -70,7 +70,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 8
+ - _Speed: 10
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 2
diff --git a/Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat b/Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat
index f930bad..d6d5c06 100644
--- a/Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat
+++ b/Assets/Materials/PVPTD/Materials/fire_self_waitMat.mat
@@ -70,7 +70,7 @@
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- - _Speed: 8
+ - _Speed: 10
- _SrcBlend: 1
- _UVSec: 0
- _VerticalAmount: 1
diff --git a/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png
new file mode 100644
index 0000000..6dacc1b
--- /dev/null
+++ b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png
Binary files differ
diff --git a/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png.meta b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png.meta
new file mode 100644
index 0000000..615ef02
--- /dev/null
+++ b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_attack.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 0ac8473d1b445a940a436c53e810d52c
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ 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
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png
new file mode 100644
index 0000000..eb08bf4
--- /dev/null
+++ b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png
Binary files differ
diff --git a/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png.meta b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png.meta
new file mode 100644
index 0000000..63b6629
--- /dev/null
+++ b/Assets/Materials/PVPTD/MonsterMat/oppo_fire_wait.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: be563b91693c0a34da30612dad5f468d
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ 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
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
index 32fa9d0..73a75cf 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
@@ -110,6 +110,8 @@
poisonTex: {fileID: 0}
frozenTex: {fileID: 0}
commonTex: {fileID: 0}
+ PoisonParticle: {fileID: 0}
+ PoisonEndParticle: {fileID: 0}
towerName: BlinkTower
dimensions:
x: 1
@@ -121,7 +123,12 @@
type: 2}
materialTowerWaitSelf: {fileID: 2100000, guid: 492ec3bf4cc3d7c4ca1649716bf69377,
type: 2}
+ materialTowerAttackOppo: {fileID: 2100000, guid: 2b76af36f09691e4786306de51cd3c55,
+ type: 2}
+ materialTowerWaitOppo: {fileID: 2100000, guid: feea27d1dcd3ca243b7114897ae749ae,
+ type: 2}
eTowerFuntion: 1
+ bulletCtl: {fileID: 0}
levels:
- {fileID: 114779466188146336, guid: 59e07ac57b910c8499149567209a3607, type: 3}
- {fileID: 114056922861069036, guid: 07762f03d122d5448b88b833b0b659b6, type: 3}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
index 4233b65..03359b1 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
@@ -43399,8 +43399,7 @@
m_Name:
m_EditorClassIdentifier:
description: Offensive
- projectile: {fileID: 6418646829760599892, guid: 2b15af8f1b3200f4dbb204c5985aa935,
- type: 3}
+ projectile: {fileID: 1304924265953754, guid: d05f550cc0892f94e9bc2ac8a4fd2223, type: 3}
projectilePoints:
- {fileID: 4457715277627928}
epicenter: {fileID: 4795219791600268}
diff --git a/Assets/Scripts/ActionGameFramework/Health/Damager.cs b/Assets/Scripts/ActionGameFramework/Health/Damager.cs
index 585b6d7..1bbfd3c 100644
--- a/Assets/Scripts/ActionGameFramework/Health/Damager.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/Damager.cs
@@ -55,6 +55,7 @@
/// </summary>
public SerializableIAlignmentProvider alignment;
+
/// <summary>
/// Gets the alignment of the damager
/// </summary>
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index c7c1430..48634b4 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -300,8 +300,7 @@
//
if (bnum == 0)
{
- damagerProjectile.damageMulti = 2.0f;
- Debug.Log("设置DamgeMult 2.0");
+ damagerProjectile.damageMulti = 2.0f;
fillBulletTime = 2.0f;
}
}
diff --git a/Assets/Scripts/TowerDefense/Towers/Tower.cs b/Assets/Scripts/TowerDefense/Towers/Tower.cs
index 4aa7604..576c515 100644
--- a/Assets/Scripts/TowerDefense/Towers/Tower.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Tower.cs
@@ -62,6 +62,8 @@
/// </summary>
public Material materialTowerAttackSelf;
public Material materialTowerWaitSelf;
+ public Material materialTowerAttackOppo;
+ public Material materialTowerWaitOppo;
/// <summary>
/// 0 空状态 1 等待状态 2 攻击状态.
@@ -137,16 +139,33 @@
{
if (!materialTowerAttackSelf) return;
- if (attack && (this.curActionState != 2))
+ if( opponentSide)
{
- currentTowerLevel.SetTowerMonsterMat(materialTowerAttackSelf);
- this.curActionState = 2;
- }
+ if (attack && (this.curActionState != 2))
+ {
+ currentTowerLevel.SetTowerMonsterMat(materialTowerAttackOppo);
+ this.curActionState = 2;
+ }
- if ((!attack) && (this.curActionState != 1))
+ if ((!attack) && (this.curActionState != 1))
+ {
+ currentTowerLevel.SetTowerMonsterMat( materialTowerWaitOppo );
+ this.curActionState = 1;
+ }
+ }
+ else
{
- currentTowerLevel.SetTowerMonsterMat(materialTowerWaitSelf);
- this.curActionState = 1;
+ if (attack && (this.curActionState != 2))
+ {
+ currentTowerLevel.SetTowerMonsterMat(materialTowerAttackSelf);
+ this.curActionState = 2;
+ }
+
+ if ((!attack) && (this.curActionState != 1))
+ {
+ currentTowerLevel.SetTowerMonsterMat(materialTowerWaitSelf);
+ this.curActionState = 1;
+ }
}
}
@@ -172,11 +191,11 @@
if (opponentSide)
currentTowerLevel.SetTowerMonsterMat(materialMonsterOppo);
else
- {
currentTowerLevel.SetTowerMonsterMat(materialMonsterSelf);
- this.setTowerState(false);
- }
-
+
+ // 处理Tower
+ this.setTowerState(false);
+
if (opponentSide)
{
@@ -198,17 +217,21 @@
//
// 根据是否是子弹塔防来决定是否显示相应的界面
- if (this.eTowerFuntion == ETowerFuntion.BULLET)
+ BulletUICtl buc = this.placementArea.GetBulletUICtl(gridPosition.x);
+ /*
+ if ( (this.eTowerFuntion == ETowerFuntion.BULLET) && (buc != null ) )
{
- BulletUICtl buc = this.placementArea.GetBulletUICtl(gridPosition.x);
- /*
- if (buc)
- {
- buc.gameObject.SetActive(true);
- this.bulletCtl = buc;
- buc.resetToMaxBullet();
- }*/
+ // 设置数据
+ buc.gameObject.SetActive(true);
+ this.bulletCtl = buc;
+ buc.resetToMaxBullet();
}
+ else
+ {
+ // 清空数据
+ buc.gameObject.SetActive(false);
+ this.bulletCtl = null;
+ }*/
}
}
diff --git a/Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs b/Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs
index 62e5c41..12f26f1 100644
--- a/Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs
+++ b/Assets/Scripts/TowerDefense/Towers/TowerLaunchers/Launcher.cs
@@ -83,6 +83,11 @@
Damager srctm = attack.GetComponent<Damager>();
tm.inSceneUpGradeDamage = srctm.inSceneUpGradeDamage;
tm.doubleHit = srctm.doubleHit;
+
+ //
+ // 最后一颗子弹的多倍伤害.
+ tm.damageMulti = srctm.damageMulti;
+ srctm.damageMulti = 1.0f;
//Debug.Log("源始局内升级数据是:" + srctm.inSceneUpGradeDamage);
}
// WORK START: 从 Pool 内获取数据的时候，就把原来的数据清除掉了.
--
Gitblit v1.9.1