From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Prefabs/Towers/Fire/Projectile.prefab | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/Assets/Prefabs/Towers/Fire/Projectile.prefab b/Assets/Prefabs/Towers/Fire/Projectile.prefab
index 4499801..11d2079 100644
--- a/Assets/Prefabs/Towers/Fire/Projectile.prefab
+++ b/Assets/Prefabs/Towers/Fire/Projectile.prefab
@@ -35,7 +35,7 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 3148708657444189677}
+ - {fileID: 3740396075515245741}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -165,18 +165,13 @@
firingAngle: 0
startSpeed: 100
collisionIgnoreTime: 0.35
---- !u!1001 &6658554031458496420
+--- !u!1001 &4917108506007809764
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2369440489128176087}
m_Modifications:
- - target: {fileID: 8634977509999139400, guid: c54a62cb621579a44b49984aee44791f,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
propertyPath: m_LocalPosition.x
@@ -195,7 +190,7 @@
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
@@ -210,7 +205,7 @@
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
@@ -220,7 +215,7 @@
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0
+ value: 180
objectReference: {fileID: 0}
- target: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
@@ -232,11 +227,6 @@
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 8634977509999139403, guid: c54a62cb621579a44b49984aee44791f,
- type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 8634977509999139406, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
propertyPath: m_Name
@@ -244,9 +234,9 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c54a62cb621579a44b49984aee44791f, type: 3}
---- !u!4 &3148708657444189677 stripped
+--- !u!4 &3740396075515245741 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8634977509999139401, guid: c54a62cb621579a44b49984aee44791f,
type: 3}
- m_PrefabInstance: {fileID: 6658554031458496420}
+ m_PrefabInstance: {fileID: 4917108506007809764}
m_PrefabAsset: {fileID: 0}
--
Gitblit v1.9.1