From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/Scenes/Levels/Battle/GemBattle.unity | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/GemBattle.unity b/Assets/Scenes/Levels/Battle/GemBattle.unity
index 6643eea..895d266 100644
--- a/Assets/Scenes/Levels/Battle/GemBattle.unity
+++ b/Assets/Scenes/Levels/Battle/GemBattle.unity
@@ -5415,9 +5415,9 @@
battleAreaObject: {fileID: 146816451}
skillFirePrefab: {fileID: 3242227498573651035, guid: ac882e0998c69614ab2ee136bb504c8a,
type: 3}
- skillBombPrefab: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174,
+ skillBombPrefab: {fileID: 5051328804531235491, guid: 1b11cbd1533e0024191ebe6028f8d8db,
type: 3}
- bufStopMovePrefab: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174,
+ bufStopMovePrefab: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
type: 3}
--- !u!114 &567180765
MonoBehaviour:
@@ -13718,6 +13718,18 @@
propertyPath: battleAreaMask.m_Bits
value: 65536
objectReference: {fileID: 0}
+ - target: {fileID: 114555595464069464, guid: 28035762430e74813854d9ca46df3ebd,
+ type: 3}
+ propertyPath: TowerUpgradeEffect
+ value:
+ objectReference: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
+ type: 3}
+ - target: {fileID: 114555595464069464, guid: 28035762430e74813854d9ca46df3ebd,
+ type: 3}
+ propertyPath: TowerAppearEffect
+ value:
+ objectReference: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
+ type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 28035762430e74813854d9ca46df3ebd, type: 3}
--- !u!1 &1622783960
--
Gitblit v1.9.1