From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/Towers/Fire/GrowUpTower.prefab | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab b/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
index 6e5976a..9208a7b 100644
--- a/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
+++ b/Assets/Prefabs/Towers/Fire/GrowUpTower.prefab
@@ -110,26 +110,31 @@
poisonTex: {fileID: 0}
frozenTex: {fileID: 0}
commonTex: {fileID: 0}
+ towerName: GrowUpTower
+ dimensions:
+ x: 1
+ y: 1
+ towerFeature: 0
+ materialMonsterSelf: {fileID: 2100000, guid: 65706b9ab6be2dc45bde7720914dd662, type: 2}
+ materialMonsterOppo: {fileID: 2100000, guid: 005b2213e521ef04a9f51bde68b9735f, type: 2}
+ materialTowerAttackSelf: {fileID: 2100000, guid: 56734acd3a9832f458892e0ba6f1901b,
+ type: 2}
+ materialTowerWaitSelf: {fileID: 2100000, guid: 492ec3bf4cc3d7c4ca1649716bf69377,
+ type: 2}
+ eTowerFuntion: 0
+ bulletCtl: {fileID: 0}
levels:
- {fileID: 114779466188146336, guid: 0ead2ba21a4e3e84e9bca834100c4456, type: 3}
- {fileID: 114056922861069036, guid: 538d7be2cf35d90438a4c101023e8839, type: 3}
- {fileID: 114683032773000130, guid: d2b30bda72c5af749b1cd014f1cd871f, type: 3}
- {fileID: 114683032773000130, guid: 54bfb565a1d898c4e9107b949981cc9c, type: 3}
- {fileID: 114683032773000130, guid: 23c8e8148828aba4ca7113aabaf73d20, type: 3}
- towerName: GrowUpTower
- dimensions:
- x: 1
- y: 1
- towerFeature: 0
- eTowerFuntion: 1
- materialMonsterSelf: {fileID: 2100000, guid: e4a344b484251ce4e8b5f18e0618e647, type: 2}
- materialMonsterOppo: {fileID: 2100000, guid: 005b2213e521ef04a9f51bde68b9735f, type: 2}
- bDoubleHitElit: 0
attributeId: 101
uiImage: {fileID: 21300000, guid: 9e3de4693b87558498eceb6c232005e2, type: 3}
enemyLayerMask:
serializedVersion: 2
m_Bits: 4294967295
+ bDoubleHitElit: 0
--- !u!65 &65801875245033440
BoxCollider:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1