From 2fc3753ac9c591a01f0d966984abe659113fe57f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 24 Oct 2020 15:57:04 +0800
Subject: [PATCH] 无尽模式加了法阵和掉落的特效，改了场景canvas渲染模式
---
Assets/Scenes/Levels/Battle/Endless.unity | 191 ++++++++++++++++++++++++++++++++---------------
1 files changed, 130 insertions(+), 61 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index de7fa4e..cc0fa9b 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -1436,13 +1436,14 @@
- {fileID: 1486810257}
- {fileID: 44403929}
- {fileID: 203833506}
+ - {fileID: 386100046}
m_Father: {fileID: 849284131}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 855}
- m_SizeDelta: {x: 1000, y: 200}
+ m_SizeDelta: {x: 1000, y: 400}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &181323910
MonoBehaviour:
@@ -1458,6 +1459,7 @@
m_EditorClassIdentifier:
HPImage1: {fileID: 2044565606}
HPImage2: {fileID: 1486810258}
+ BossImage: {fileID: 853139038}
BaseBlood: {fileID: 21300000, guid: f9a15ea7a2090444e88b74ec5ec9a825, type: 3}
Speed: 0.3
WaveNumText: {fileID: 203833507}
@@ -2953,8 +2955,6 @@
serializedVersion: 6
m_Component:
- component: {fileID: 386100046}
- - component: {fileID: 386100048}
- - component: {fileID: 386100047}
m_Layer: 5
m_Name: Boss
m_TagString: Untagged
@@ -2969,56 +2969,19 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 386100045}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
- m_Children: []
- m_Father: {fileID: 849284131}
- m_RootOrder: 5
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 853139037}
+ m_Father: {fileID: 181323909}
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 2, y: 613}
+ m_AnchoredPosition: {x: 2, y: -242.0003}
m_SizeDelta: {x: 411, y: 438}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &386100047
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386100045}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 17b9688387ebcc94594025068ed72adb, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &386100048
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386100045}
- m_CullTransparentMesh: 0
--- !u!1 &392880631
GameObject:
m_ObjectHideFlags: 0
@@ -3973,7 +3936,7 @@
- {fileID: 1976804302}
- {fileID: 471268011}
m_Father: {fileID: 849284131}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4370,12 +4333,8 @@
m_Script: {fileID: 11500000, guid: 2739028eff58f874cb8a28112fe08545, type: 3}
m_Name:
m_EditorClassIdentifier:
- PropList:
- - {fileID: 4719430855819224627, guid: 2b602abab799e804a91cf5dedb4cf239, type: 3}
- - {fileID: 6398087328225072327, guid: c84cc9b73dfbd9d40ab3540d82d17643, type: 3}
- - {fileID: 6421580822896475683, guid: 37f3cf3f6391c564687f6800471d827a, type: 3}
- - {fileID: 6052997991039108785, guid: f352933946a0b7f4f83a3578feab2b5b, type: 3}
- - {fileID: 1219444306348366272, guid: f641fe6e6a3810b4d8846b021e8b9f49, type: 3}
+ AutoPickupTime: 5
+ canvas: {fileID: 849284130}
--- !u!114 &567180766
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6224,9 +6183,9 @@
m_GameObject: {fileID: 849284126}
m_Enabled: 1
serializedVersion: 3
- m_RenderMode: 0
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
+ m_RenderMode: 1
+ m_Camera: {fileID: 1340671930}
+ m_PlaneDistance: 18
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
@@ -6248,11 +6207,11 @@
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1953656506}
+ - {fileID: 1010410266}
- {fileID: 1172214030}
- {fileID: 526512787}
- {fileID: 1747414114}
- {fileID: 181323909}
- - {fileID: 386100046}
- {fileID: 1570259601}
- {fileID: 559457822}
- {fileID: 306286610}
@@ -6266,6 +6225,81 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &853139036
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 853139037}
+ - component: {fileID: 853139039}
+ - component: {fileID: 853139038}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &853139037
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 853139036}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+ m_Children: []
+ m_Father: {fileID: 386100046}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1954, y: 1613}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &853139038
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 853139036}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 075c38bb7e6a0a941ad9dcdf00975081, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &853139039
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 853139036}
+ m_CullTransparentMesh: 0
--- !u!1 &861002745
GameObject:
m_ObjectHideFlags: 0
@@ -7618,6 +7652,41 @@
m_Father: {fileID: 464175828}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1010410265
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1010410266}
+ m_Layer: 5
+ m_Name: BuyButtonContainer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1010410266
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1010410265}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 849284131}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1080, y: 1920}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1011378015
GameObject:
m_ObjectHideFlags: 0
@@ -9376,7 +9445,7 @@
- {fileID: 1108718555}
- {fileID: 1387193656}
m_Father: {fileID: 849284131}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13960,7 +14029,7 @@
- {fileID: 1646752539}
- {fileID: 1992794823}
m_Father: {fileID: 849284131}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
--
Gitblit v1.9.1