From 7a37ce77cc54274525e342fcef596eee545b441f Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Fri, 23 Aug 2024 15:30:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A4=B1=E8=B4=A5=E7=9C=8B=E5=B9=BF=E5=91=8A=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E6=97=B6=E9=97=B4=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/Data/stringcfg_stringconfig.json | 6 +++ .../Framework/UI/Other/UIADPopupController.cs | 5 ++ .../Scripts/Gameplay/Manager/LevelManager.cs | 28 ++++++----- .../UI/EndPanel/UILosePanelController.cs | 10 +++- Tool/Luban/.cache.meta | 46 +++++++++--------- Tool/Luban/Datas/StringConfig.xlsx | Bin 13604 -> 13668 bytes 6 files changed, 58 insertions(+), 37 deletions(-) diff --git a/Forest/Assets/Config/Data/stringcfg_stringconfig.json b/Forest/Assets/Config/Data/stringcfg_stringconfig.json index 901eb9e..9c948dd 100644 --- a/Forest/Assets/Config/Data/stringcfg_stringconfig.json +++ b/Forest/Assets/Config/Data/stringcfg_stringconfig.json @@ -418,5 +418,11 @@ "Key": "Build_Go", "Value": "进入", "Value_En": "Go" + }, + { + "ID": 171, + "Key": "Tip_AD_LoseGetTime", + "Value": "获得15秒", + "Value_En": "Gain 15 seconds" } ] \ No newline at end of file diff --git a/Forest/Assets/Scripts/Framework/UI/Other/UIADPopupController.cs b/Forest/Assets/Scripts/Framework/UI/Other/UIADPopupController.cs index 52516c7..80cfe43 100644 --- a/Forest/Assets/Scripts/Framework/UI/Other/UIADPopupController.cs +++ b/Forest/Assets/Scripts/Framework/UI/Other/UIADPopupController.cs @@ -1,10 +1,12 @@ using cfg.BI; using cfg.Prop; using Framework; +using UnityEngine; using Framework.BI; using Framework.UI; using Gameplay.Manager; using Framework.Constants; +using Event = cfg.BI.Event; public class UIADPopupController : UIWindow { @@ -25,11 +27,13 @@ public class UIADPopupController : UIWindow private void WatchAD() { + Time.timeScale = 0f; LevelManager.Instance.WatchADGetRandomProp(ADSuccessCallBack, ADFailCallBack); } private async void ADSuccessCallBack() { + Time.timeScale = 1f; var dataProp = _propConfig?.GetOrDefault(LevelManager.Instance.RandomProp)?.SKName; var stringName = StringManager.Instance.GetTextByKey(dataProp); await UIManager.Instance.OpenWindow(UIConstants.UITips, string.Format(_stringContent, stringName), @@ -39,6 +43,7 @@ public class UIADPopupController : UIWindow private void ADFailCallBack() { + Time.timeScale = 1f; BIManager.Instance.TrackEventLevel(Event.ad_load_fail, "103"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "103"); UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); diff --git a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs index a2017f4..42f2bf5 100644 --- a/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs +++ b/Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs @@ -528,19 +528,21 @@ namespace Gameplay.Manager () => { _isGetTimeSuccess = true; }, getFail); } - private void ADGetTime() + private async void ADGetTime() { - BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_add_time, - BIManager.Reason.ClickOnLosePanel.ToString()); - RemainingTime = 15f; - IsOver = false; - IsFail2AddTime = true; - BIManager.Instance.TrackEventLevel(Event.level_ad_show_success, "102", "AddTime"); - BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_success, "102", "AddTime"); - AudioManager.Instance.PlaySound(AudioType.SOUND, "S_AddTime", new UnityAudio(false)); - PlayAnimation = true; - ShowGfx(); _adGetTimeSuccess?.Invoke(); + await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_LoseGetTime", () => + { + BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_add_time, BIManager.Reason.ClickOnLosePanel.ToString()); + RemainingTime = 15f; + IsOver = false; + IsFail2AddTime = true; + BIManager.Instance.TrackEventLevel(Event.level_ad_show_success, "102", "AddTime"); + BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_success, "102", "AddTime"); + AudioManager.Instance.PlaySound(AudioType.SOUND, "S_AddTime", new UnityAudio(false)); + PlayAnimation = true; + ShowGfx(); + }); } //关卡内看广告获取指定道具 @@ -553,10 +555,10 @@ namespace Gameplay.Manager ADManager.Instance.ShowAdWithPreLoad(101, () => { _isGetPropSuccess = true; }, rewardFail); } - private void ADGetProp() + private async void ADGetProp() { _adGetPropSuccess?.Invoke(); - UIManager.Instance.OpenWindow(UIConstants.UITips, ADGetPropTips, + await UIManager.Instance.OpenWindow(UIConstants.UITips, ADGetPropTips, () => { switch (_adProp) diff --git a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs index 415f6a8..a80c4cd 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs @@ -58,11 +58,19 @@ public class UILosePanelController : UIWindow private void AddTime() { - LevelManager.Instance.WatchADGetTime(() => { CloseWindow(); }, ADFailCallBack); + Time.timeScale = 0f; + LevelManager.Instance.WatchADGetTime(ADSuccessCallBack, ADFailCallBack); + } + + private void ADSuccessCallBack() + { + Time.timeScale = 1f; + CloseWindow(true); } private async void ADFailCallBack() { + Time.timeScale = 1f; BIManager.Instance.TrackEventLevel(Event.level_ad_show_fail, "102"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "102"); await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); diff --git a/Tool/Luban/.cache.meta b/Tool/Luban/.cache.meta index bfd589c..27b0517 100644 --- a/Tool/Luban/.cache.meta +++ b/Tool/Luban/.cache.meta @@ -1,25 +1,25 @@ -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildconfig.json,48AB9FAF4B191CBFAD1AE41D8DB5E9,264,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,F0B7F2CC3D5E8E1F289E6F854F40E2,2491,1724323726435 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,F9E47AA657849A2E45D7DC79DE7138DA,8730,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildConfig.cs,734C93C94E7956CBFC7EEFA6D012384,2021,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuild.cs,58A25B6C58163A71C557A4F7DF7A73F3,2062,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,BEB85D16C8FEBFBE0679C7F9C9F9A8,606,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,C360B48BE0179D52C15D41892A4B,1008,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1724323726434 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,D55A3261561E846DDDB2C7D41F75,2643,1724323726434 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildconfig.json,48AB9FAF4B191CBFAD1AE41D8DB5E9,264,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/guide_guideconfig.json,F0B7F2CC3D5E8E1F289E6F854F40E2,2491,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,D8DA85A54F3DF67CB547A683F7BB567,8849,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/BuildConfig.cs,734C93C94E7956CBFC7EEFA6D012384,2021,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Build/DataBuild.cs,58A25B6C58163A71C557A4F7DF7A73F3,2062,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/DataGuide.cs,A23BB4F3F93B395441BB83D74E59B6F,4292,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideConfig.cs,B1779443C4E6B0FD80A8B0CAE418015,2003,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/GuideStepType.cs,BEB85D16C8FEBFBE0679C7F9C9F9A8,606,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Guide/StepCompleteType.cs,C360B48BE0179D52C15D41892A4B,1008,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1724397186248 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1724397186247 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,D55A3261561E846DDDB2C7D41F75,2643,1724397186247 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,BB1B7B4C814680E15D54B12E0C4BAD5,12703,1722244651038 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,F5E663DB51F49239D4EF4F4A87EAD5CC,11140,1724143842408 @@ -27,4 +27,4 @@ /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/BuildConfig.xlsx,413DFEA990EC718571D09D4632F8AD41,9393,1724143842407 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Guide.xlsx,EFF399A2B66C639A70B9956CB653A6D3,10462,1724143842408 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,AE8B38D96D84597AC63E636D9B76958,13604,1724323675547 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,10D1D3AC5C92DA927D19A23C927BADDF,13668,1724397171193 diff --git a/Tool/Luban/Datas/StringConfig.xlsx b/Tool/Luban/Datas/StringConfig.xlsx index dd9d8a57e4afff9f569c49a8094092d120b1c5aa..41b6ab8c6c1053f276c9c11b8c62ab8714f8831a 100644 GIT binary patch delta 6336 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 Dn9&J+ delta 6268 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