PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PHXH:a2e6857ef886bbd261b068da042363d11cc50001
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main
...
compare: PHXH:2e1cf4debbc51c6c32fe2a433663bad0a5e35b39
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main

2 Commits
a2e6857ef8 ... 2e1cf4debb

Author SHA1 Message Date
zhangaotian 2e1cf4debb Merge branch 'main' into iOS_release 2024-08-23 11:35:33 +08:00
zhangaotian 89e0739f74 【Bug】修复增加时间后精灵特效消失 2024-08-23 11:34:55 +08:00
2 changed files with 5 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
Forest/Assets/Scripts/Framework/UI/Other/UIADPopupController.cs
View File

@ -28,11 +28,11 @@ public class UIADPopupController : UIWindow
LevelManager.Instance.WatchADGetRandomProp(ADSuccessCallBack, ADFailCallBack); LevelManager.Instance.WatchADGetRandomProp(ADSuccessCallBack, ADFailCallBack);
} }
private void ADSuccessCallBack() private async void ADSuccessCallBack()
{ {
var dataProp = _propConfig?.GetOrDefault(LevelManager.Instance.RandomProp)?.SKName; var dataProp = _propConfig?.GetOrDefault(LevelManager.Instance.RandomProp)?.SKName;
var stringName = StringManager.Instance.GetTextByKey(dataProp); var stringName = StringManager.Instance.GetTextByKey(dataProp);
UIManager.Instance.OpenWindow(UIConstants.UITips, string.Format(_stringContent, stringName), await UIManager.Instance.OpenWindow(UIConstants.UITips, string.Format(_stringContent, stringName),
() => { LevelManager.Instance.ResetLevel(); }); () => { LevelManager.Instance.ResetLevel(); });
CloseWindow(); CloseWindow();
} }
@ -40,7 +40,7 @@ public class UIADPopupController : UIWindow
private void ADFailCallBack() private void ADFailCallBack()
{ {
BIManager.Instance.TrackEventLevel(Event.ad_load_fail, "103"); BIManager.Instance.TrackEventLevel(Event.ad_load_fail, "103");
BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail,"103"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "103");
UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { });
} }
} }

3
Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs
View File

@ -10,10 +10,10 @@ using Gameplay.Level;
using Framework.Event; using Framework.Event;
using Framework.Manager; using Framework.Manager;
using Framework.Constants; using Framework.Constants;
using Gameplay.ForestLevel;
using Event = cfg.BI.Event; using Event = cfg.BI.Event;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using System.Collections.Generic; using System.Collections.Generic;
using Gameplay.ForestLevel;
namespace Gameplay.Manager namespace Gameplay.Manager
{ {
@ -539,6 +539,7 @@ namespace Gameplay.Manager
BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_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)); AudioManager.Instance.PlaySound(AudioType.SOUND, "S_AddTime", new UnityAudio(false));
PlayAnimation = true; PlayAnimation = true;
ShowGfx();
_adGetTimeSuccess?.Invoke(); _adGetTimeSuccess?.Invoke();
} }