From ed4fb637a9a0477750d284bf0a42569ed0c0c26a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 08 Dec 2020 15:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/UI/PlacementTileMobile.prefab | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Prefabs/UI/PlacementTileMobile.prefab b/Assets/Prefabs/UI/PlacementTileMobile.prefab
index f0ee271..937d2b1 100644
--- a/Assets/Prefabs/UI/PlacementTileMobile.prefab
+++ b/Assets/Prefabs/UI/PlacementTileMobile.prefab
@@ -59,7 +59,7 @@
canPlaceMat: {fileID: 2100000, guid: 434316934db1c90498f004f124d7c733, type: 2}
selectMat: {fileID: 2100000, guid: 3b7aa7626a2d4674ca2aa32958f14ca9, type: 2}
myOpenPS: {fileID: 5639653971360257455}
- myPutPS: {fileID: 3764710002024050453}
+ myPutPS: {fileID: 5446732126781949981}
towerVSRenderer: {fileID: 2078962303223178405}
towerVSMat: {fileID: 2100000, guid: c40b753d26a2b4a4facef99e60c526d2, type: 2}
fire: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
@@ -639,9 +639,9 @@
type: 3}
m_PrefabInstance: {fileID: 8416641207410710028}
m_PrefabAsset: {fileID: 0}
---- !u!198 &3764710002024050453 stripped
+--- !u!198 &5446732126781949981 stripped
ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 4680090318796863769, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ m_CorrespondingSourceObject: {fileID: 4565318064113622545, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
type: 3}
m_PrefabInstance: {fileID: 8416641207410710028}
m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1