From df8c6633500f6c1c752f8a60025cda0e9909644c Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 17 Dec 2020 14:53:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scenes/LoadingScene.unity | 2
Assets/Scripts/Guide/GuidePanelNew.cs | 20 +
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab | 4
Assets/UI/icon_512.png | 0
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 1
Assets/Resources/UI/Guide/GuidePanel.prefab | 240 +++++++-------
Assets/00000/package/Scene/DengLu/dl_tian01.png.meta | 2
Assets/Scripts/Guide/GuideCtrl.cs | 2
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab | 4
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 162 ++++++++--
Assets/Prefabs/UI/GuideUI/BoxPanel.prefab | 122 +++++++
Assets/UI/icon_512.png.meta | 118 +++++++
Assets/Prefabs/UI/Endless/FPSText.prefab.meta | 7
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 21
ProjectSettings/ProjectSettings.asset | 2
Assets/Prefabs/UI/Endless/FPSText.prefab | 95 +++++
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs | 70 +++-
Assets/00000/package/Scene/DengLu/dl_tian02.png.meta | 2
Assets/Scenes/Loading.unity | 6
ProjectSettings/EditorBuildSettings.asset | 2
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 25 +
Assets/Scripts/Manager/ManagerRoot.cs | 7
Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab | 4
23 files changed, 714 insertions(+), 204 deletions(-)
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab
index 4313443..0509bf9 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Huo.prefab
@@ -316,7 +316,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -5195,7 +5195,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 3
maxCurve:
serializedVersion: 2
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab
index 67463e5..ca344b4 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Mu.prefab
@@ -285,7 +285,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -5164,7 +5164,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 3
maxCurve:
serializedVersion: 2
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab
index a05f7ad..4347bac 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_TuoDong_Elf_Shui.prefab
@@ -316,7 +316,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 1
maxCurve:
serializedVersion: 2
@@ -5195,7 +5195,7 @@
startSize:
serializedVersion: 2
minMaxState: 0
- scalar: 25
+ scalar: 15
minScalar: 3
maxCurve:
serializedVersion: 2
diff --git a/Assets/00000/package/Scene/DengLu/dl_tian01.png.meta b/Assets/00000/package/Scene/DengLu/dl_tian01.png.meta
index b644be9..95e8883 100644
--- a/Assets/00000/package/Scene/DengLu/dl_tian01.png.meta
+++ b/Assets/00000/package/Scene/DengLu/dl_tian01.png.meta
@@ -87,7 +87,7 @@
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
- maxTextureSize: 2048
+ maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
diff --git a/Assets/00000/package/Scene/DengLu/dl_tian02.png.meta b/Assets/00000/package/Scene/DengLu/dl_tian02.png.meta
index 3bd8c61..ef7e3f3 100644
--- a/Assets/00000/package/Scene/DengLu/dl_tian02.png.meta
+++ b/Assets/00000/package/Scene/DengLu/dl_tian02.png.meta
@@ -87,7 +87,7 @@
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
- maxTextureSize: 2048
+ maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index 5c8ff3b..2551753 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -1272,7 +1272,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4623057513073301098}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -2223,6 +2223,7 @@
loseHeartPrefab: {fileID: 1733602031831890639, guid: be8d40e5dec17924db9f7ba011f48ea6,
type: 3}
heartImg: {fileID: 800655732497070847}
+ loseHeartPS: {fileID: 8872091061161614627}
--- !u!1 &4623057511712181235
GameObject:
m_ObjectHideFlags: 0
@@ -4644,7 +4645,7 @@
m_Children:
- {fileID: 6565149699357486630}
m_Father: {fileID: 4623057513073301098}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0.9990001, y: -0.99600005, z: -0.109000005}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4720,6 +4721,7 @@
m_Children:
- {fileID: 6000510335155308273}
- {fileID: 125448539437654225}
+ - {fileID: 6664392428777704896}
- {fileID: 4623057511285327671}
- {fileID: 4623057513050824274}
m_Father: {fileID: 2866087324517106990}
@@ -6925,15 +6927,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1c45b10d1786ecd4fae18d70525aa22c, type: 3}
---- !u!198 &3539411673559000662 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 3022757409187105008, guid: 1c45b10d1786ecd4fae18d70525aa22c,
- type: 3}
- m_PrefabInstance: {fileID: 1795944436746546854}
- m_PrefabAsset: {fileID: 0}
--- !u!4 &6128013593978591219 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5613572104525330773, guid: 1c45b10d1786ecd4fae18d70525aa22c,
+ type: 3}
+ m_PrefabInstance: {fileID: 1795944436746546854}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &3539411673559000662 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 3022757409187105008, guid: 1c45b10d1786ecd4fae18d70525aa22c,
type: 3}
m_PrefabInstance: {fileID: 1795944436746546854}
m_PrefabAsset: {fileID: 0}
@@ -7186,15 +7188,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!224 &4623057511292283298 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 2593358110680681470}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &4623057511292283299 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 2593358110680681470}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &4623057511292283298 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 2593358110680681470}
m_PrefabAsset: {fileID: 0}
@@ -7929,12 +7931,6 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3}
---- !u!224 &3028643154847299432 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511490369855}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &7735723185271377626 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c,
@@ -7947,6 +7943,12 @@
m_Script: {fileID: 11500000, guid: 9a92c216c3d4e97459299f45fc451060, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!224 &3028643154847299432 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511490369855}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4623057511554511967
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8078,6 +8080,12 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: edd0f54808263644d9740a9c0040b493, type: 3}
+--- !u!1 &8424158400893339871 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511554511967}
+ m_PrefabAsset: {fileID: 0}
--- !u!224 &6989462182969459993 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
@@ -8096,12 +8104,6 @@
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &8424158400893339871 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511554511967}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &4623057511616550406
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8937,15 +8939,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!224 &2593358111913102218 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 4623057512515660246}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &2593358111913102219 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057512515660246}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &2593358111913102218 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 4623057512515660246}
m_PrefabAsset: {fileID: 0}
@@ -9039,6 +9041,102 @@
type: 3}
m_PrefabInstance: {fileID: 4877504796896280371}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4932092804175574798
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4623057513073301098}
+ m_Modifications:
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 18.099997
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 47
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 1733602031831890639, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_UI_XinSui
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be8d40e5dec17924db9f7ba011f48ea6, type: 3}
+--- !u!198 &8872091061161614627 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4570502257699842605, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ m_PrefabInstance: {fileID: 4932092804175574798}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6664392428777704896 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6,
+ type: 3}
+ m_PrefabInstance: {fileID: 4932092804175574798}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &7366026308063481932
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/UI/Endless/FPSText.prefab b/Assets/Prefabs/UI/Endless/FPSText.prefab
new file mode 100644
index 0000000..04e8f91
--- /dev/null
+++ b/Assets/Prefabs/UI/Endless/FPSText.prefab
@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2915540906519113776
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2915540906519113777}
+ - component: {fileID: 2915540906519113772}
+ - component: {fileID: 2915540906519113775}
+ - component: {fileID: 2915540906519113774}
+ m_Layer: 5
+ m_Name: FPSText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2915540906519113777
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ 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: 0}
+ 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: 457, y: 923.6}
+ m_SizeDelta: {x: 200, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2915540906519113772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ m_CullTransparentMesh: 0
+--- !u!114 &2915540906519113775
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 30
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!114 &2915540906519113774
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2915540906519113776}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b60bfbc84f4b10642a259b632bc7d0cd, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ fpsText: {fileID: 2915540906519113775}
diff --git a/Assets/Prefabs/UI/Endless/FPSText.prefab.meta b/Assets/Prefabs/UI/Endless/FPSText.prefab.meta
new file mode 100644
index 0000000..7dba60e
--- /dev/null
+++ b/Assets/Prefabs/UI/Endless/FPSText.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 836294196125bc94cb6c988e99cb5869
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab b/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
index a35ed67..38ec02a 100644
--- a/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
+++ b/Assets/Prefabs/UI/GuideUI/BoxPanel.prefab
@@ -595,6 +595,125 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3017429313853889024
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 936162029952686492}
+ - component: {fileID: 6214860091745948174}
+ - component: {fileID: 182856015140478567}
+ - component: {fileID: 1844790699053639362}
+ m_Layer: 5
+ m_Name: BackGround (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &936162029952686492
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3017429313853889024}
+ 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: 3402256463678719083}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6214860091745948174
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3017429313853889024}
+ m_CullTransparentMesh: 0
+--- !u!114 &182856015140478567
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3017429313853889024}
+ 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: 0, g: 0, b: 0, a: 0.8}
+ 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: 0}
+ m_Type: 1
+ 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!114 &1844790699053639362
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3017429313853889024}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 182856015140478567}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &3023218368860148358
GameObject:
m_ObjectHideFlags: 0
@@ -1790,7 +1909,8 @@
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_Children:
+ - {fileID: 936162029952686492}
m_Father: {fileID: 3329837434862512135}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 875ef30..5bcbae1 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -232,7 +232,7 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 6650253152916097481}
+ - {fileID: 2791340110216712227}
m_Father: {fileID: 4438159195928217730}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1025,125 +1025,6 @@
m_OnClick:
m_PersistentCalls:
m_Calls: []
---- !u!1 &3877913321702056043
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6650253152916097481}
- - component: {fileID: 3529863359404665673}
- - component: {fileID: 8479939958163075339}
- - component: {fileID: 5628354807042106697}
- m_Layer: 5
- m_Name: BGPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6650253152916097481
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877913321702056043}
- 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: 3396256655537851812}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 0, y: -250}
- m_SizeDelta: {x: 0, y: 500}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3529863359404665673
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877913321702056043}
- m_CullTransparentMesh: 0
---- !u!114 &8479939958163075339
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877913321702056043}
- 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: 7545f6da4eda5274396e5021d128679d, 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!114 &5628354807042106697
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3877913321702056043}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 0
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 8479939958163075339}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
--- !u!1 &4033919787940865614
GameObject:
m_ObjectHideFlags: 0
@@ -1727,6 +1608,125 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6154220841498617752
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2791340110216712227}
+ - component: {fileID: 1207393868354034612}
+ - component: {fileID: 4895019568768851786}
+ - component: {fileID: 8746675086269234565}
+ m_Layer: 5
+ m_Name: BGPanel (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2791340110216712227
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6154220841498617752}
+ 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: 3396256655537851812}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1207393868354034612
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6154220841498617752}
+ m_CullTransparentMesh: 0
+--- !u!114 &4895019568768851786
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6154220841498617752}
+ 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: 7545f6da4eda5274396e5021d128679d, 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!114 &8746675086269234565
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6154220841498617752}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 4895019568768851786}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &6276095933853610772
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Loading.unity b/Assets/Scenes/Loading.unity
index f14c417..201fb0d 100644
--- a/Assets/Scenes/Loading.unity
+++ b/Assets/Scenes/Loading.unity
@@ -44511,7 +44511,7 @@
m_Children:
- {fileID: 1755399726}
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -44559,7 +44559,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &475775423
GameObject:
@@ -220790,7 +220790,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1930105022
GameObject:
diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity
index ec436fa..a7b5495 100644
--- a/Assets/Scenes/LoadingScene.unity
+++ b/Assets/Scenes/LoadingScene.unity
@@ -302,7 +302,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: e187cb70474cf834fb08574deefcb084, type: 3}
+ m_Sprite: {fileID: 21300000, guid: cc5d797972864ce4ea2a203dba620097, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Scripts/Guide/GuideCtrl.cs b/Assets/Scripts/Guide/GuideCtrl.cs
index 5e767ab..7639cc5 100644
--- a/Assets/Scripts/Guide/GuideCtrl.cs
+++ b/Assets/Scripts/Guide/GuideCtrl.cs
@@ -227,7 +227,7 @@
private void KillDone()
{
string[] s2 = new string[] { allGuideDic[currentStep][2] };
-
+ panel.CloseSkillImage();
panel.Step3(s2, OpenBoxFire);
}
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index 3889b7b..acad04e 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -42,8 +42,10 @@
//ParticleSystem finishPS;
Button finishBtn;
Image finishImg;
+ Canvas skillCanvasGroup;
void Awake()
{
+
tmpMask = transform.GetComponent<Image>();
tipsUI = transform.Find("Tips").gameObject;
tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -345,7 +347,18 @@
StopShowDragPath(true);
}
-
+ /// <summary>
+ /// 关闭技能X1的显示优先级
+ /// </summary>
+ public void CloseSkillImage()
+ {
+ GameObject go1 = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillCount1");
+ if (go1 != null)
+ {
+ skillCanvasGroup = go1.GetComponent<Canvas>();
+ skillCanvasGroup.overrideSorting = false;
+ }
+ }
/// <summary>
/// 步骤3 ：对话---出兵后杀光---对话---展示火鸡
@@ -617,6 +630,8 @@
public void Step7Talk(string[] str, Action ac)
{
callBack = ac;
+ GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
+
SetGuideUI(true);
StartShowWord(str, GuideEnergyUp);
}
@@ -628,7 +643,6 @@
/// </summary>
public void GuideEnergyUp()
{
- GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideEnergyUp, 100);
tmpMask.enabled = false;
@@ -677,6 +691,8 @@
public void FinishGuide()
{
+ if (skillCanvasGroup != null)
+ skillCanvasGroup.overrideSorting = true;
towerBuyBtn.gameObject.SetActive(true);
}
diff --git a/Assets/Scripts/Manager/ManagerRoot.cs b/Assets/Scripts/Manager/ManagerRoot.cs
index 8271377..cdee2df 100644
--- a/Assets/Scripts/Manager/ManagerRoot.cs
+++ b/Assets/Scripts/Manager/ManagerRoot.cs
@@ -15,6 +15,13 @@
GameObject root = GameObject.Find("ManagerRoot");
if (root == null)
{
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ }
+ Application.targetFrameRate = 60;
+ //Debug.Log("设置了帧数为60");
DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);
root = new GameObject("ManagerRoot");
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
index 9fd6421..b2cc919 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
@@ -5,6 +5,7 @@
using TMPro;
using DG.Tweening;
using Core.Utilities;
+using System.Collections;
/**
* 无尽模式玩家基地血量管理器
@@ -41,6 +42,8 @@
private Image heartImg;
private Timer timer;
+ public ParticleSystem loseHeartPS;//心碎特效
+ private GameObject decreaseHeartObj;//掉血显示
// Start is called before the first frame update
private void Start()
@@ -78,29 +81,51 @@
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessHeartAllLose);
}
+
/// <summary>
/// 丢失爱心飘字
/// </summary>
/// <param name="count"></param>
private void FloatLoseHeart(int count)
{
- GameObject prefab = Resources.Load<GameObject>("UI/DecreaseHeart");
- GameObject obj = Instantiate(prefab);
- obj.transform.SetParent(GameObject.Find("UICamera/BottomCanvas/Panel/Bottom/CurrencyContainer").transform, false);
- obj.transform.localPosition = new Vector3(91.5f, 48.8f, 0f);
- obj.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f);
- TextMeshProUGUI textMeshProUGUI = obj.transform.GetChild(0).GetComponent<TextMeshProUGUI>();
- textMeshProUGUI.text = $"-{count}";
- DOTween.To(
- () => obj.transform.localPosition.y,
- (float v) =>
- {
- Vector3 pos = obj.transform.localPosition;
- pos.y = v;
- obj.transform.localPosition = pos;
+ TextMeshProUGUI textMeshProUGUI;
+ if (decreaseHeartObj != null)
+ {
+ textMeshProUGUI = decreaseHeartObj.transform.GetChild(0).GetComponent<TextMeshProUGUI>();
+ textMeshProUGUI.text = int.Parse(textMeshProUGUI.text) - count + "";
+ }
+ else
+ {
+ GameObject prefab = Resources.Load<GameObject>("UI/DecreaseHeart");
+ GameObject obj = Instantiate(prefab);
+ obj.transform.SetParent(GameObject.Find("UICamera/BottomCanvas/Panel/Bottom/CurrencyContainer").transform, false);
+ obj.transform.localPosition = new Vector3(91.5f, 48.8f, 0f);
+ obj.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f);
- }, 70.9f, 0.3f);
- Destroy(obj, 0.6f);
+ decreaseHeartObj = obj;
+
+ textMeshProUGUI = obj.transform.GetChild(0).GetComponent<TextMeshProUGUI>();
+ textMeshProUGUI.text = $"-{count}";
+ DOTween.To(
+ () => obj.transform.localPosition.y,
+ (float v) =>
+ {
+ Vector3 pos = obj.transform.localPosition;
+ pos.y = v;
+ obj.transform.localPosition = pos;
+
+ }, 70.9f, 0.3f);
+ StartCoroutine(DestroyDecreaseHeart());
+ }
+
+ //Destroy(obj, 0.6f);
+ }
+
+ IEnumerator DestroyDecreaseHeart()
+ {
+ yield return new WaitForSeconds(0.6f);
+ Destroy(decreaseHeartObj);
+ decreaseHeartObj = null;
}
private void PlayLoseHeartEffect()
@@ -108,12 +133,13 @@
if (!isPlayLoseHeartDone) return;
heartImg.enabled = false;
- GameObject obj = Instantiate(loseHeartPrefab);
- obj.transform.SetParent(GameObject.Find("ParticleSystemObject").transform, false);
- obj.transform.localPosition = new Vector3(-27.93f, 0f, -51.52f);
- obj.transform.localScale = new Vector3(0.9f, 0.9f, 0.9f);
- ParticleSystem ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
- ps?.Play();
+ // GameObject obj = Instantiate(loseHeartPrefab);
+ // obj.transform.SetParent(GameObject.Find("ParticleSystemObject").transform, false);
+ // obj.transform.localPosition = new Vector3(-27.93f, 0f, -51.52f);
+ // obj.transform.localScale = new Vector3(0.9f, 0.9f, 0.9f);
+ // ParticleSystem ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
+
+ loseHeartPS?.Play();
timer = new Timer(0.6f, SpawnHeart);
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
index 0df0ca1..f8b98e3 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
@@ -31,6 +31,7 @@
public Text DoubleHitText;
public Image OneTimeKillObj;
+ private bool isShowing;
public Text OneTimeKillText;
@@ -66,6 +67,7 @@
// Start is called before the first frame update
private void Start()
{
+ isShowing = false;
Init();
EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessOneHit, OnHit);
@@ -173,6 +175,7 @@
DOTween.To(() => canvasGroup.alpha, (float v) => canvasGroup.alpha = v, 0, 0.3f);
}
+
/// <summary>
/// 显示一次性击杀飘字
/// </summary>
@@ -180,10 +183,24 @@
/// <param name="score"></param>
private void ShowOneTimeKill(int count, int score)
{
- Image obj = Instantiate(OneTimeKillObj);
- obj.transform.SetParent(GameObject.Find("Panel").transform, false);
- obj.sprite = Resources.Load<Sprite>($"UI/DoubleHit/hit_{count}");
- Destroy(obj.gameObject, 2.05f);
+ if (!isShowing)
+ {
+ isShowing = true;
+ Image obj = Instantiate(OneTimeKillObj);
+ obj.transform.SetParent(GameObject.Find("Panel").transform, false);
+ obj.sprite = Resources.Load<Sprite>($"UI/DoubleHit/hit_{count}");
+ StartCoroutine(KillImage(obj.gameObject));
+ }
+
+ //Destroy(obj.gameObject, 2.05f);
+ }
+
+ IEnumerator KillImage(GameObject obj)
+ {
+ yield return new WaitForSeconds(2.05f);
+ Destroy(obj);
+
+ isShowing = false;
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 842dfb7..b6f1ab3 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -125,7 +125,6 @@
panelUI.SetData($"{level}关 {wave}波", EndlessScoreData.CurrentSocre);
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessCompletedPort, level, wave);
-
}
private void PlayEffect()
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 988f459..a4ee0d5 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -67,13 +67,20 @@
if (root == null)
{
- root = new GameObject("ManagerRoot");
- root.AddComponent<DoNotDestory>();
- root.AddComponent<MasterSocket>();
- root.AddComponent<TDAA_SDKManager>();
- root.AddComponent<AudioSourceManager>();
- root.AddComponent<JsonDataReader>();
- root.AddComponent<JsonDataInit>();
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ }
+
+ root = new GameObject("ManagerRoot");
+
+ root.AddComponent<DoNotDestory>();
+ root.AddComponent<MasterSocket>();
+ root.AddComponent<TDAA_SDKManager>();
+ root.AddComponent<AudioSourceManager>();
+ root.AddComponent<JsonDataReader>();
+ root.AddComponent<JsonDataInit>();
}
firstStart = true;
//EventCenter.Ins.Add((int)KTGMGemClient.EventType.JsonDataReadDone, JsonDataReadDone);
diff --git a/Assets/UI/icon_512.png b/Assets/UI/icon_512.png
new file mode 100644
index 0000000..ffdeaa8
--- /dev/null
+++ b/Assets/UI/icon_512.png
Binary files differ
diff --git a/Assets/UI/icon_512.png.meta b/Assets/UI/icon_512.png.meta
new file mode 100644
index 0000000..d4cc802
--- /dev/null
+++ b/Assets/UI/icon_512.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 63d4e00990539f948a1e9f9293c97c09
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index ad10384..055f57a 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -14,7 +14,7 @@
- enabled: 1
path: Assets/Scenes/LoadingScene.unity
guid: 587e6361681b8c54f92c0bc9bbfa2cb7
- - enabled: 1
+ - enabled: 0
path: Assets/Scenes/MainManuScene.unity
guid: 520ddc4fdac3ea246b57984ad40aea6c
- enabled: 0
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 918a46c..1b54089 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -279,7 +279,7 @@
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
- m_Icon: {fileID: 2800000, guid: 697bd2fa39041aa4380226f620add44a, type: 3}
+ m_Icon: {fileID: 2800000, guid: 63d4e00990539f948a1e9f9293c97c09, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
--
Gitblit v1.9.1