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/Endless.unity | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index 6d4ff93..feeb40c 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -4201,9 +4201,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 &567180759
MonoBehaviour:
@@ -5153,6 +5153,7 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1447220350}
- {fileID: 1069273691}
m_Father: {fileID: 19764330}
m_RootOrder: 7
@@ -8318,7 +8319,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 654889359}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -10861,6 +10862,10 @@
type: 3}
bloodCrit: {fileID: 8440900062448590821, guid: cab622f1453af2648981d24b37b76ee9,
type: 3}
+ TowerUpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
+ type: 3}
+ TowerAppearEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
+ type: 3}
--- !u!114 &1340671926
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11680,6 +11685,87 @@
area: 0.051776636
completeArea: 0.7071072
outSidePointsParent: {fileID: 1071673243}
+--- !u!1 &1447220349
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1447220350}
+ - component: {fileID: 1447220352}
+ m_Layer: 5
+ m_Name: ParticalMask
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1447220350
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1447220349}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 58, y: 28, z: 0}
+ m_Children: []
+ m_Father: {fileID: 654889359}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &1447220352
+SpriteMask:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1447220349}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: c9633b2aaeee7e540b04803cb6e9cd45, type: 3}
+ m_MaskAlphaCutoff: 0.2
+ m_FrontSortingLayerID: 0
+ m_BackSortingLayerID: 0
+ m_FrontSortingLayer: 0
+ m_BackSortingLayer: 0
+ m_FrontSortingOrder: 0
+ m_BackSortingOrder: 0
+ m_IsCustomRangeActive: 0
+ m_SpriteSortPoint: 0
--- !u!1 &1466089838
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1