From 18ce923e39033c39c4cab84581d03a492cb730f4 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 20:20:39 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab | 15 +++++++++++++++
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab | 6 +++---
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab | 6 +++---
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab | 6 +++---
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab | 6 +++---
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 6 +++---
6 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
index 77e1e47..b492682 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
@@ -43961,17 +43961,17 @@
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.x
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.y
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
index 389e972..8f36aac 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
@@ -86976,17 +86976,17 @@
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.x
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.y
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
index b770a89..234275d 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
@@ -129991,17 +129991,17 @@
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.x
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.y
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
index 7eb408a..e105fcd 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
@@ -130194,6 +130194,21 @@
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
+ - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3206268221595814420, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.3
+ objectReference: {fileID: 0}
- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_Name
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
index defa4d8..8d8f18c 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
@@ -130167,17 +130167,17 @@
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.x
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.y
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
propertyPath: m_LocalScale.z
- value: 0.5
+ value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
type: 3}
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index d2485f6..9083b41 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -6221,12 +6221,12 @@
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 144
+ value: 992
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 553
+ value: 502
objectReference: {fileID: 0}
- target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
@@ -7243,7 +7243,7 @@
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 436
+ value: 502
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
--
Gitblit v1.9.1