From 7ea5599f685ea29f7ecab3516b7335fa93f6e2bf Mon Sep 17 00:00:00 2001 From: wangguan <wangguan@kt007.com> Date: Tue, 22 Dec 2020 20:35:25 +0800 Subject: [PATCH] 火技能杀死的怪物统一计算 修改击杀显示 --- Assets/Scripts/UI/DoubleHitImg.cs | 36 +++++ Assets/Prefabs/UI/DoubleHitImg.prefab | 27 +-- Assets/Scripts/UI/DoubleHitImg.cs.meta | 11 + Assets/Scripts/Guide/TestButton.cs | 64 +++++--- Assets/Scripts/TowerDefense/Level/AgentInsManager.cs | 9 Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 233 ++++++++++++++++++++++++++------ Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 38 ---- 7 files changed, 294 insertions(+), 124 deletions(-) diff --git a/Assets/Prefabs/UI/DoubleHitImg.prefab b/Assets/Prefabs/UI/DoubleHitImg.prefab index 084dac0..d77fbe8 100644 --- a/Assets/Prefabs/UI/DoubleHitImg.prefab +++ b/Assets/Prefabs/UI/DoubleHitImg.prefab @@ -11,7 +11,7 @@ - component: {fileID: 7000457136590000657} - component: {fileID: 1846360420982837283} - component: {fileID: 7603196512390067914} - - component: {fileID: 3151736608666648099} + - component: {fileID: -3274960031300206811} m_Layer: 5 m_Name: DoubleHitImg m_TagString: Untagged @@ -59,14 +59,14 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 49f99a736faf71f46b4b54850f258485, type: 3} + m_Sprite: {fileID: 21300000, guid: d6d7e99bdb2e06a4ca463844e357c8db, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -76,22 +76,15 @@ m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &3151736608666648099 -Animator: - serializedVersion: 3 +--- !u!114 &-3274960031300206811 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7462645731956919278} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 78ceed17a1c7d824084adc0646ced084, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1f62823fe2755048837fa08a1cafe59, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab index b55c851..7d90008 100644 --- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab +++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab @@ -3125,8 +3125,7 @@ ScoreText: {fileID: 4623057512200465645} DoubleHit: {fileID: 8424158400893339871} DoubleHitText: {fileID: 1184553460454064981} - OneTimeKillObj: {fileID: 7603196512390067914, guid: 4185c72a90809504daa5733a351e163c, - type: 3} + OneTimeKillObj: {fileID: 182285634368127240} OneTimeKillText: {fileID: 4623057512776119512} --- !u!1 &4623057512167066751 GameObject: @@ -6512,6 +6511,7 @@ - {fileID: 4623057511338059841} - {fileID: 4623057513236082835} - {fileID: 4623057513020863723} + - {fileID: 3543211742427311164} m_Father: {fileID: 4623057512704841790} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6927,15 +6927,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c45b10d1786ecd4fae18d70525aa22c, type: 3} ---- !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} +--- !u!4 &6128013593978591219 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5613572104525330773, guid: 1c45b10d1786ecd4fae18d70525aa22c, type: 3} m_PrefabInstance: {fileID: 1795944436746546854} m_PrefabAsset: {fileID: 0} @@ -7188,15 +7188,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} ---- !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} +--- !u!1 &4623057511292283299 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 2593358110680681470} m_PrefabAsset: {fileID: 0} @@ -8080,18 +8080,6 @@ 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, - type: 3} - m_PrefabInstance: {fileID: 4623057511554511967} - m_PrefabAsset: {fileID: 0} --- !u!114 &1184553460454064981 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493, @@ -8104,6 +8092,18 @@ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6989462182969459993 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, + type: 3} + m_PrefabInstance: {fileID: 4623057511554511967} + m_PrefabAsset: {fileID: 0} +--- !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 @@ -8263,15 +8263,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} ---- !u!1 &2593358111013876827 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, - type: 3} - m_PrefabInstance: {fileID: 4623057511616550406} - m_PrefabAsset: {fileID: 0} --- !u!224 &2593358111013876826 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, + type: 3} + m_PrefabInstance: {fileID: 4623057511616550406} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2593358111013876827 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511616550406} m_PrefabAsset: {fileID: 0} @@ -8591,6 +8591,12 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3} +--- !u!224 &3028643155105321891 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c, + type: 3} + m_PrefabInstance: {fileID: 4623057511748623860} + m_PrefabAsset: {fileID: 0} --- !u!114 &7735723185050839569 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c, @@ -8603,12 +8609,6 @@ m_Script: {fileID: 11500000, guid: 9a92c216c3d4e97459299f45fc451060, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &3028643155105321891 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c, - type: 3} - m_PrefabInstance: {fileID: 4623057511748623860} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4623057511883902042 PrefabInstance: m_ObjectHideFlags: 0 @@ -8768,15 +8768,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} ---- !u!224 &2593358110207618566 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, - type: 3} - m_PrefabInstance: {fileID: 4623057511883902042} - m_PrefabAsset: {fileID: 0} --- !u!1 &2593358110207618567 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, + type: 3} + m_PrefabInstance: {fileID: 4623057511883902042} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2593358110207618566 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511883902042} m_PrefabAsset: {fileID: 0} @@ -9125,17 +9125,154 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: be8d40e5dec17924db9f7ba011f48ea6, type: 3} +--- !u!4 &6664392428777704896 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1733602031831890638, guid: be8d40e5dec17924db9f7ba011f48ea6, + type: 3} + m_PrefabInstance: {fileID: 4932092804175574798} + m_PrefabAsset: {fileID: 0} --- !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, +--- !u!1001 &5767592570076331565 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2459412157512953547} + m_Modifications: + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_RootOrder + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 560 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_SizeDelta.x + value: 313 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_SizeDelta.y + value: 228 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7462645731956919278, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + propertyPath: m_Name + value: DoubleHitImg + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4185c72a90809504daa5733a351e163c, type: 3} +--- !u!114 &182285634368127240 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -3274960031300206811, guid: 4185c72a90809504daa5733a351e163c, type: 3} - m_PrefabInstance: {fileID: 4932092804175574798} + m_PrefabInstance: {fileID: 5767592570076331565} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1f62823fe2755048837fa08a1cafe59, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &3543211742427311164 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7000457136590000657, guid: 4185c72a90809504daa5733a351e163c, + type: 3} + m_PrefabInstance: {fileID: 5767592570076331565} m_PrefabAsset: {fileID: 0} --- !u!1001 &7366026308063481932 PrefabInstance: diff --git a/Assets/Scripts/Guide/TestButton.cs b/Assets/Scripts/Guide/TestButton.cs index 11b602b..8fdfa6e 100644 --- a/Assets/Scripts/Guide/TestButton.cs +++ b/Assets/Scripts/Guide/TestButton.cs @@ -25,46 +25,64 @@ // string s="<color=red>范围伤害</color>"; // t.text=s; // Debug.Log(s.Length); - TestFinalPanel(); + //TestFinalPanel(); // isSending = false; // score = 0; // TestHttp(); } + public DoubleHitImg OneTimeKillObj; + + /// <summary> + /// 显示一次性击杀飘字 + /// </summary> + /// <param name="count"></param> + private void ShowOneTimeKill() + { + OneTimeKillObj.SetkillCount(); + } + int score; private void OnGUI() { GUILayout.BeginArea(new Rect(5, 330, 150, 300)); - if (GUILayout.Button("SendRequest", GUILayout.Width(150), GUILayout.Height(70))) + // if (GUILayout.Button("SendRequest", GUILayout.Width(150), GUILayout.Height(70))) + // { + // //SendRequest("aa", 4700, 28); + // score += 10; + // SendPost(score.ToString(), score, 1, "25关 3波"); + // } + + // if (GUILayout.Button("SendGet", GUILayout.Width(150), GUILayout.Height(70))) + // { + // SendGet(); + + // } + + // if (GUILayout.Button("清理本地存储", GUILayout.Width(150), GUILayout.Height(70))) + // { + // PlayerPrefs.DeleteAll(); + // Debug.Log("清理本地存储"); + + // } + + // if (GUILayout.Button("生成Nick", GUILayout.Width(150), GUILayout.Height(70))) + // { + + // CreateNick(); + // } + if (GUILayout.Button("击杀10", GUILayout.Width(150), GUILayout.Height(50))) { - //SendRequest("aa", 4700, 28); - score += 10; - SendPost(score.ToString(), score, 1, "25关 3波"); + ShowOneTimeKill(); } - if (GUILayout.Button("SendGet", GUILayout.Width(150), GUILayout.Height(70))) - { - SendGet(); - - } - - if (GUILayout.Button("清理本地存储", GUILayout.Width(150), GUILayout.Height(70))) - { - PlayerPrefs.DeleteAll(); - Debug.Log("清理本地存储"); - - } - - if (GUILayout.Button("生成Nick", GUILayout.Width(150), GUILayout.Height(70))) - { - - CreateNick(); - } GUILayout.EndArea(); } + + int killCoun1t = 0; private void CreateNick() { TimeSpan timeStamp = new TimeSpan(DateTime.Now.Ticks); diff --git a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs index 0d92f60..1602f6d 100644 --- a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs +++ b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs @@ -220,6 +220,7 @@ /// 用于排序的Buf. /// </summary> protected Agent[] agentTmpArr = new Agent[3]; + int deathCount = 0;//被火技能杀死的怪物 @@ -828,11 +829,15 @@ } else { + deathCount = 0; for (int i = 0; i < agentWaveLineArray.Length; i++) { wavelineIns = agentWaveLineArray[i]; CalculateWavelineAttack(slinfo, wavelineIns, sid, slevel); } + + if (deathCount >= 10) + EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount); } } @@ -843,7 +848,6 @@ List<Agent> listAg = wavelineIns.listAgent; // 统计被火技能直接烧死的数量 - int deathCount = 0; for (int ti = listAg.Count - 1; ti >= 0; ti--) { @@ -880,8 +884,7 @@ } } - if (deathCount > 1) - EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount); + } /// <summary> diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs index f8b98e3..b494e57 100644 --- a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs +++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs @@ -30,8 +30,7 @@ public Text DoubleHitText; - public Image OneTimeKillObj; - private bool isShowing; + public DoubleHitImg OneTimeKillObj; public Text OneTimeKillText; @@ -67,7 +66,6 @@ // 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); @@ -84,17 +82,7 @@ if (count >= 10) { AddScore(0); - ShowOneTimeKill(10, 500); - } - else if (count >= 8) - { - AddScore(0); - ShowOneTimeKill(8, 200); - } - else if (count >= 5) - { - AddScore(0); - ShowOneTimeKill(5, 100); + ShowOneTimeKill(); } } @@ -118,6 +106,7 @@ else remainTime -= Time.deltaTime; } + } /// <summary> @@ -180,28 +169,11 @@ /// 显示一次性击杀飘字 /// </summary> /// <param name="count"></param> - /// <param name="score"></param> - private void ShowOneTimeKill(int count, int score) + private void ShowOneTimeKill() { - 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); + OneTimeKillObj.SetkillCount(); } - IEnumerator KillImage(GameObject obj) - { - yield return new WaitForSeconds(2.05f); - Destroy(obj); - - isShowing = false; - } /// <summary> /// 飘连击奖励分数 diff --git a/Assets/Scripts/UI/DoubleHitImg.cs b/Assets/Scripts/UI/DoubleHitImg.cs new file mode 100644 index 0000000..c8398a0 --- /dev/null +++ b/Assets/Scripts/UI/DoubleHitImg.cs @@ -0,0 +1,36 @@ +using UnityEngine.UI; +using UnityEngine; +using DG.Tweening; +public class DoubleHitImg : MonoBehaviour +{ + //[SerializeField] + //private Sprite hit_10; + private Image _image; + private Color normal, dark; + // Start is called before the first frame update + void Start() + { + _image = GetComponent<Image>(); + normal = new Color(1.0f, 1.0f, 1.0f, 1.0f); + dark = new Color(1.0f, 1.0f, 1.0f, 0.0f); + isShowing = false; + } + + bool isShowing; + private float showTime = 3.0f; + private Vector3 showV3 = new Vector3(0.7f, 0.7f, 0.7f); + public void SetkillCount() + { + _image.DOKill(); + _image.color = dark; + transform.localScale = showV3; + + _image.DOColor(normal, showTime * 0.5f).OnComplete(() => + { + _image.DOColor(dark, showTime * 0.5f); + }); + transform.DOScale(Vector3.one, showTime * 0.5f).SetEase(Ease.OutElastic); + } + + +} diff --git a/Assets/Scripts/UI/DoubleHitImg.cs.meta b/Assets/Scripts/UI/DoubleHitImg.cs.meta new file mode 100644 index 0000000..237137d --- /dev/null +++ b/Assets/Scripts/UI/DoubleHitImg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d1f62823fe2755048837fa08a1cafe59 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- Gitblit v1.9.1