From 146e39c5ef6bb29927cb7c00d7708fceab30a724 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 21 Oct 2020 10:01:40 +0800
Subject: [PATCH] 无尽模式奖励和掉落逻辑基本完成
---
Assets/Scenes/Levels/Battle/Endless.unity | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index edce625..8eff8c1 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -291,7 +291,7 @@
- {fileID: 39084533}
- {fileID: 1846348240}
m_Father: {fileID: 849284131}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -848,7 +848,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 49423732}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 0.47000003, y: 1.36, z: 19.77}
+ m_LocalPosition: {x: 0.47000003, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 304173789}
@@ -917,6 +917,41 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 49423732}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &76143238
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 76143239}
+ m_Layer: 5
+ m_Name: DropLayer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &76143239
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 76143238}
+ 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: 7
+ 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 &96670465
GameObject:
m_ObjectHideFlags: 0
@@ -1547,7 +1582,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 167919691}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 20.36, y: 0.98, z: 3.67}
+ m_LocalPosition: {x: 20.6, y: 0.98, z: 8.85}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -2664,7 +2699,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 284948256}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: -9.47, y: 1.36, z: 19.7}
+ m_LocalPosition: {x: -9.47, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1998565447}
@@ -2834,7 +2869,7 @@
- {fileID: 767174507}
- {fileID: 1608463748}
m_Father: {fileID: 849284131}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3750,7 +3785,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 469016880}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: 10.86, y: 1.36, z: 19.7}
+ m_LocalPosition: {x: 10.86, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 819185222}
@@ -4038,7 +4073,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 495435993}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -19.7, y: 0.9, z: 3.67}
+ m_LocalPosition: {x: -19.7, y: 0.9, z: 8.85}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -4578,6 +4613,7 @@
- component: {fileID: 567180760}
- component: {fileID: 567180758}
- component: {fileID: 567180764}
+ - component: {fileID: 567180765}
m_Layer: 0
m_Name: WaveManager
m_TagString: Untagged
@@ -4739,6 +4775,24 @@
m_Script: {fileID: 11500000, guid: ae98f435720c34145a1b4019d3893885, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &567180765
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 567180756}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ 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}
--- !u!114 &567180766
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5125,7 +5179,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 618377762}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 10.35, y: 0.98, z: 3.67}
+ m_LocalPosition: {x: 10.6, y: 0.98, z: 8.85}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -6426,7 +6480,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798990854}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: -19.7, y: 1.36, z: 19.7}
+ m_LocalPosition: {x: -19.7, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 236991185}
@@ -6822,6 +6876,7 @@
- {fileID: 181323909}
- {fileID: 1570259601}
- {fileID: 559457822}
+ - {fileID: 76143239}
- {fileID: 306286610}
- {fileID: 19764330}
- {fileID: 1730636813}
@@ -6965,7 +7020,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 902738588}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 10.35, y: 1.36, z: 19.77}
+ m_LocalPosition: {x: 10.8, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 304173789}
@@ -7179,6 +7234,10 @@
m_Name:
m_EditorClassIdentifier:
RewardInfoUI: {fileID: 1514665749}
+ PrimaryTreasure: {fileID: 795048839}
+ MiddleTreasure: {fileID: 1482631636}
+ AdvancedTreasure: {fileID: 1343237802}
+ Gold: {fileID: 1083155069}
--- !u!1 &918905599
GameObject:
m_ObjectHideFlags: 0
@@ -7399,7 +7458,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 928059874}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: 0.61, y: 1.36, z: 19.7}
+ m_LocalPosition: {x: 0.61, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1927819623}
@@ -10173,7 +10232,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1172845526}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -9.98, y: 0.98, z: 3.67}
+ m_LocalPosition: {x: -9.98, y: 0.98, z: 8.85}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -11962,7 +12021,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1396658961}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: -9.98, y: 1.36, z: 19.77}
+ m_LocalPosition: {x: -9.7, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 304173789}
@@ -13282,7 +13341,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618971293}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: 20.87, y: 1.36, z: 19.7}
+ m_LocalPosition: {x: 20.87, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1990433419}
@@ -13668,7 +13727,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1643240603}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 20.36, y: 1.36, z: 19.77}
+ m_LocalPosition: {x: 20.7, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 304173789}
@@ -14439,7 +14498,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -15025,7 +15084,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813750110}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: -19.61, y: 1.36, z: 19.77}
+ m_LocalPosition: {x: -19.61, y: 1.36, z: 24.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 304173789}
@@ -16811,7 +16870,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1977355534}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.47000003, y: 0.98, z: 3.67}
+ m_LocalPosition: {x: 0.47000003, y: 0.98, z: 8.85}
m_LocalScale: {x: 0.79999995, y: 1, z: 3.3}
m_Children: []
m_Father: {fileID: 304173789}
--
Gitblit v1.9.1