From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scenes/Levels/Battle/Endless2D.unity | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index 24e3c6b..353c1b9 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -2630,11 +2630,11 @@
- {fileID: 618377762}
- {fileID: 167919691}
battleAreaObject: {fileID: 146816451}
- skillFirePrefab: {fileID: 1818709523137058448, guid: b441481b95deede4abb07cbe57813d2e,
+ skillFirePrefab: {fileID: 2502501340343887533, guid: 630574dd14089b04a8c0e1da203667d1,
type: 3}
- skillBombPrefab: {fileID: 5051328804531235491, guid: 1b11cbd1533e0024191ebe6028f8d8db,
+ skillBombPrefab: {fileID: 7723453392366045576, guid: 203ddbafabf3b514695a7113b0939c72,
type: 3}
- bufStopMovePrefab: {fileID: 7371666484774926908, guid: ee054dd88b9be2340a0da4ce80a84f62,
+ bufStopMovePrefab: {fileID: 7677512363771200781, guid: 2acf016d8917a714bbc5a6aa7e43aed6,
type: 3}
--- !u!114 &567180759
MonoBehaviour:
@@ -2704,6 +2704,12 @@
- {fileID: 928059878}
- {fileID: 469016884}
- {fileID: 1618971297}
+ EndNodeList:
+ - {fileID: 11580655}
+ - {fileID: 1899887986}
+ - {fileID: 224247425}
+ - {fileID: 107754327}
+ - {fileID: 1776140745}
--- !u!114 &567180762
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4075,12 +4081,7 @@
- target: {fileID: 4623057512524248738, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.0007324219
- objectReference: {fileID: 0}
- - target: {fileID: 4623057512702542564, guid: 29da21b318f42054db30c52123aa4dbf,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: -0.000091552734
objectReference: {fileID: 0}
- target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
@@ -4197,6 +4198,11 @@
propertyPath: m_Camera
value:
objectReference: {fileID: 1340671930}
+ - target: {fileID: 4623057513073301098, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 92.51001
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 29da21b318f42054db30c52123aa4dbf, type: 3}
--- !u!1 &898016331
@@ -5943,7 +5949,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1308461724}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.9, z: 9.5}
+ m_LocalPosition: {x: 0, y: 0.1, z: 9.5}
m_LocalScale: {x: 5.08, y: 1, z: 3.857}
m_Children: []
m_Father: {fileID: 304173789}
@@ -6352,7 +6358,6 @@
m_Component:
- component: {fileID: 1340671931}
- component: {fileID: 1340671930}
- - component: {fileID: 1340671929}
- component: {fileID: 1340671928}
- component: {fileID: 1340671927}
- component: {fileID: 1340671925}
@@ -6460,19 +6465,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1340671924}
m_Enabled: 1
---- !u!114 &1340671929
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1340671924}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- bAdjViewPort: 0
--- !u!20 &1340671930
Camera:
m_ObjectHideFlags: 0
@@ -6592,6 +6584,7 @@
- component: {fileID: 1361392479}
- component: {fileID: 1361392478}
- component: {fileID: 1361392477}
+ - component: {fileID: 1361392480}
m_Layer: 0
m_Name: SceneCamera3D
m_TagString: Untagged
@@ -6664,6 +6657,19 @@
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
+--- !u!114 &1361392480
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1361392476}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 38f5f2cd2c401054e80686aac9879bb1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ bAdjViewPort: 0
--- !u!1 &1384281165
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1