From 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Wed, 09 Dec 2020 17:14:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Prefabs/UI/PlacementTileMobile.prefab | 241 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 241 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefabs/UI/PlacementTileMobile.prefab b/Assets/Prefabs/UI/PlacementTileMobile.prefab
index 7b8f10f..937d2b1 100644
--- a/Assets/Prefabs/UI/PlacementTileMobile.prefab
+++ b/Assets/Prefabs/UI/PlacementTileMobile.prefab
@@ -32,6 +32,8 @@
- {fileID: 3708897891681601760}
- {fileID: 5551798738058946706}
- {fileID: 7663500724507464268}
+ - {fileID: 7028420458808586989}
+ - {fileID: 3619991940650253911}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -56,6 +58,8 @@
canPlaceRenderer: {fileID: 5722111975221064870}
canPlaceMat: {fileID: 2100000, guid: 434316934db1c90498f004f124d7c733, type: 2}
selectMat: {fileID: 2100000, guid: 3b7aa7626a2d4674ca2aa32958f14ca9, type: 2}
+ myOpenPS: {fileID: 5639653971360257455}
+ myPutPS: {fileID: 5446732126781949981}
towerVSRenderer: {fileID: 2078962303223178405}
towerVSMat: {fileID: 2100000, guid: c40b753d26a2b4a4facef99e60c526d2, type: 2}
fire: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
@@ -304,6 +308,132 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6911264303789898319}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &4874592655082232827
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4376446327882660}
+ m_Modifications:
+ - target: {fileID: 1000392137602960980, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2373142851804910217, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.12647022
+ objectReference: {fileID: 0}
+ - target: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.09259259
+ objectReference: {fileID: 0}
+ - target: {fileID: 3089723185303581080, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4009876035878911429, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4150007995012032024, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6714138952793444077, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7073555894199393551, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Ta_GouMai
+ objectReference: {fileID: 0}
+ - target: {fileID: 7660242434627234081, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: bdadf6527322ae8419ac57e78e81dfc9, type: 3}
+--- !u!4 &7028420458808586989 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2463468008962009366, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ m_PrefabInstance: {fileID: 4874592655082232827}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &5639653971360257455 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 1000392137602960980, guid: bdadf6527322ae8419ac57e78e81dfc9,
+ type: 3}
+ m_PrefabInstance: {fileID: 4874592655082232827}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &5052097780309765736
PrefabInstance:
m_ObjectHideFlags: 0
@@ -404,3 +534,114 @@
type: 3}
m_PrefabInstance: {fileID: 5052097780309765736}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8416641207410710028
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4376446327882660}
+ m_Modifications:
+ - target: {fileID: 3221864332320102725, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Ta_JiaoHuan
+ objectReference: {fileID: 0}
+ - target: {fileID: 4680090318796863769, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.0632351
+ objectReference: {fileID: 0}
+ - target: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.046296295
+ objectReference: {fileID: 0}
+ - target: {fileID: 6253864200620358922, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6722193135400204322, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6788233985068767698, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e, type: 3}
+--- !u!4 &3619991940650253911 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 5111904333056534619, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ m_PrefabInstance: {fileID: 8416641207410710028}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &5446732126781949981 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4565318064113622545, guid: 19e5a86a7c5fc9e4ea8ff8768e0e368e,
+ type: 3}
+ m_PrefabInstance: {fileID: 8416641207410710028}
+ m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1