From 9ecea6fd1dc5c53d670f7e0400210522bda5586d Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Wed, 21 Oct 2020 16:02:55 +0800
Subject: [PATCH] 修改为绿色塔是玉米
---
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab | 2 +-
Assets/Prefabs/Towers/Fire/GrowUpTower.prefab | 2 +-
Assets/Scripts/TowerDefense/Towers/Tower.cs | 2 +-
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab | 2 +-
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab | 2 +-
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab | 2 +-
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab | 2 +-
Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab | 21 ++++++++++++++-------
8 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab b/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
index acb67b2..9208a7b 100644
--- a/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
+++ b/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
@@ -121,7 +121,7 @@
type: 2}
materialTowerWaitSelf: {fileID: 2100000, guid: 492ec3bf4cc3d7c4ca1649716bf69377,
type: 2}
- eTowerFuntion: 1
+ eTowerFuntion: 0
bulletCtl: {fileID: 0}
levels:
- {fileID: 114779466188146336, guid: 0ead2ba21a4e3e84e9bca834100c4456, type: 3}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
index c6ac136..32fa9d0 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower.prefab
@@ -110,12 +110,6 @@
poisonTex: {fileID: 0}
frozenTex: {fileID: 0}
commonTex: {fileID: 0}
- levels:
- - {fileID: 114779466188146336, guid: 59e07ac57b910c8499149567209a3607, type: 3}
- - {fileID: 114056922861069036, guid: 07762f03d122d5448b88b833b0b659b6, type: 3}
- - {fileID: 114683032773000130, guid: 514bbe0fa9244574a92e033bac5dfe31, type: 3}
- - {fileID: 114683032773000130, guid: 04a4b557fefbfc840a6a5dbcc2fb11b4, type: 3}
- - {fileID: 114683032773000130, guid: 0bc3790a03f518f45b10851f5a3b2e30, type: 3}
towerName: BlinkTower
dimensions:
x: 1
@@ -123,12 +117,23 @@
towerFeature: 0
materialMonsterSelf: {fileID: 2100000, guid: 55a208306bc8fd64396cc539286e2961, type: 2}
materialMonsterOppo: {fileID: 2100000, guid: 7ecca3d2bef32794e9d49526593c22ef, type: 2}
- bDoubleHitElit: 0
+ materialTowerAttackSelf: {fileID: 2100000, guid: 56734acd3a9832f458892e0ba6f1901b,
+ type: 2}
+ materialTowerWaitSelf: {fileID: 2100000, guid: 492ec3bf4cc3d7c4ca1649716bf69377,
+ type: 2}
+ eTowerFuntion: 1
+ levels:
+ - {fileID: 114779466188146336, guid: 59e07ac57b910c8499149567209a3607, type: 3}
+ - {fileID: 114056922861069036, guid: 07762f03d122d5448b88b833b0b659b6, type: 3}
+ - {fileID: 114683032773000130, guid: 514bbe0fa9244574a92e033bac5dfe31, type: 3}
+ - {fileID: 114683032773000130, guid: 04a4b557fefbfc840a6a5dbcc2fb11b4, type: 3}
+ - {fileID: 114683032773000130, guid: 0bc3790a03f518f45b10851f5a3b2e30, type: 3}
attributeId: 109
uiImage: {fileID: 21300000, guid: 7421dffecb7e7d644b4ce0980c1f75da, type: 3}
enemyLayerMask:
serializedVersion: 2
m_Bits: 4294967295
+ bDoubleHitElit: 0
--- !u!65 &65801875245033440
BoxCollider:
m_ObjectHideFlags: 0
@@ -577,4 +582,6 @@
healthBar: {fileID: 4491171297730104}
backgroundBar: {fileID: 4099818628537976}
textMesh: {fileID: 0}
+ levelQuad: {fileID: 0}
+ levelMaterial: []
showWhenFull: 0
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
index c31b029..03359b1 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
@@ -28709,7 +28709,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1430798241748466}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0.1538, z: 0}
+ m_LocalPosition: {x: 0, y: 0.15, z: 0.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4877050138446582}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
index b375c7c..a81bfca 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
@@ -9612,7 +9612,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1373619305943026}
m_LocalRotation: {x: 0.0009147092, y: 0.0016288152, z: -0.0014009047, w: 0.9999973}
- m_LocalPosition: {x: 0, y: -0, z: 0}
+ m_LocalPosition: {x: 0, y: 0.15, z: 0.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4861835295132458}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
index cd857d2..7badb37 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
@@ -28942,7 +28942,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1788557851062624}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0.15, z: 0.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4221898185616454}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
index dcafee5..e371d8f 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
@@ -28942,7 +28942,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1788557851062624}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0.15, z: 0.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4221898185616454}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
index bd64dce..ff3cd3a 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
@@ -28942,7 +28942,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1788557851062624}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0.15, z: 0.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4221898185616454}
diff --git a/Assets/Scripts/TowerDefense/Towers/Tower.cs b/Assets/Scripts/TowerDefense/Towers/Tower.cs
index d354c9a..8e07dbb 100644
--- a/Assets/Scripts/TowerDefense/Towers/Tower.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Tower.cs
@@ -72,7 +72,7 @@
/// 塔防对应的充能状态.
/// </summary>
public ETowerFuntion eTowerFuntion = ETowerFuntion.NULL;
- public BulletUICtl bulletCtl = null;
+ protected BulletUICtl bulletCtl = null;
/// <summary>
/// The tower levels associated with this tower
--
Gitblit v1.9.1