From 45faee0adf3b5bc2ac051c2a0e08bb4ecf738aac Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 17 Dec 2020 14:31:17 +0800
Subject: [PATCH] Merge commit 'fe59d1a97e80284315bcdfa18a49059b38dfd137'
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 21 ++-
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs | 70 +++++++++----
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 162 ++++++++++++++++++++++++++------
ProjectSettings/EditorBuildSettings.asset | 2
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 25 ++++
5 files changed, 214 insertions(+), 66 deletions(-)
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/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..5d7c80b 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, 2.05f);
+
+ isShowing = false;
}
/// <summary>
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/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
--
Gitblit v1.9.1