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

Compare commits

base: PHXH:7c9fd6f6dedd33d5c2dff97ae0a155cf21dd4287
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main
...
compare: PHXH:db9eb019afc2abc8c7d28566107e7340274c16ff
Branches Tags
PHXH:Android_Dev
PHXH:Android_release
PHXH:iOS_release
PHXH:main

4 Commits
7c9fd6f6de ... db9eb019af

Author SHA1 Message Date
zhangaotian db9eb019af Merge branch 'main' into iOS_release 2024-08-23 15:31:55 +08:00
zhangaotian 7a37ce77cc 【优化】增加失败看广告获得时间弹窗 2024-08-23 15:30:30 +08:00
zhangaotian 617f1d9cf7 【补提】 2024-08-23 15:20:17 +08:00
zhangaotian 3af2ec9047 【更新】更新制作者名字 2024-08-23 14:53:58 +08:00
7 changed files with 60 additions and 39 deletions
Show Stats Expand all files Collapse all files

4
Forest/Assets/Art/UI/Prefab/UISettingPanel.prefab
View File

@ -1577,12 +1577,12 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 'Producer: AoTian Zhang m_text: 'Producer: Aotian Zhang
Project Manager: Yuanzheng Ma Project Manager: Yuanzheng Ma
Artist: Artist:
Jie Zhang, WeiChao Zhao, KeYu Wang, Jing Li, HuiLing Yao' Jie Zhang, Weichao Zhao, Keyu Wang, Jing Li, Huiling Yao, Ke Song, Ting Zeng'
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2}
m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6,

6
Forest/Assets/Config/Data/stringcfg_stringconfig.json
View File

@ -418,5 +418,11 @@
"Key": "Build_Go", "Key": "Build_Go",
"Value": "进入", "Value": "进入",
"Value_En": "Go" "Value_En": "Go"
},
{
"ID": 171,
"Key": "Tip_AD_LoseGetTime",
"Value": "获得15秒",
"Value_En": "Gain 15 seconds"
} }
] ]

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

@ -1,10 +1,12 @@
using cfg.BI; using cfg.BI;
using cfg.Prop; using cfg.Prop;
using Framework; using Framework;
using UnityEngine;
using Framework.BI; using Framework.BI;
using Framework.UI; using Framework.UI;
using Gameplay.Manager; using Gameplay.Manager;
using Framework.Constants; using Framework.Constants;
using Event = cfg.BI.Event;
public class UIADPopupController : UIWindow public class UIADPopupController : UIWindow
{ {
@ -25,11 +27,13 @@ public class UIADPopupController : UIWindow
private void WatchAD() private void WatchAD()
{ {
Time.timeScale = 0f;
LevelManager.Instance.WatchADGetRandomProp(ADSuccessCallBack, ADFailCallBack); LevelManager.Instance.WatchADGetRandomProp(ADSuccessCallBack, ADFailCallBack);
} }
private async void ADSuccessCallBack() private async void ADSuccessCallBack()
{ {
Time.timeScale = 1f;
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);
await UIManager.Instance.OpenWindow(UIConstants.UITips, string.Format(_stringContent, stringName), await UIManager.Instance.OpenWindow(UIConstants.UITips, string.Format(_stringContent, stringName),
@ -39,6 +43,7 @@ public class UIADPopupController : UIWindow
private void ADFailCallBack() private void ADFailCallBack()
{ {
Time.timeScale = 1f;
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", () => { });

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

@ -528,10 +528,12 @@ namespace Gameplay.Manager
() => { _isGetTimeSuccess = true; }, getFail); () => { _isGetTimeSuccess = true; }, getFail);
} }
private void ADGetTime() private async void ADGetTime()
{ {
BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_add_time, _adGetTimeSuccess?.Invoke();
BIManager.Reason.ClickOnLosePanel.ToString()); await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_LoseGetTime", () =>
{
BIManager.Instance.TrackEventLevel(cfg.BI.Event.level_add_time, BIManager.Reason.ClickOnLosePanel.ToString());
RemainingTime = 15f; RemainingTime = 15f;
IsOver = false; IsOver = false;
IsFail2AddTime = true; IsFail2AddTime = true;
@ -540,7 +542,7 @@ namespace Gameplay.Manager
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(); ShowGfx();
_adGetTimeSuccess?.Invoke(); });
} }
//关卡内看广告获取指定道具 //关卡内看广告获取指定道具
@ -553,10 +555,10 @@ namespace Gameplay.Manager
ADManager.Instance.ShowAdWithPreLoad(101, () => { _isGetPropSuccess = true; }, rewardFail); ADManager.Instance.ShowAdWithPreLoad(101, () => { _isGetPropSuccess = true; }, rewardFail);
} }
private void ADGetProp() private async void ADGetProp()
{ {
_adGetPropSuccess?.Invoke(); _adGetPropSuccess?.Invoke();
UIManager.Instance.OpenWindow(UIConstants.UITips, ADGetPropTips, await UIManager.Instance.OpenWindow(UIConstants.UITips, ADGetPropTips,
() => () =>
{ {
switch (_adProp) switch (_adProp)

10
Forest/Assets/Scripts/Gameplay/UI/EndPanel/UILosePanelController.cs
View File

@ -58,11 +58,19 @@ public class UILosePanelController : UIWindow
private void AddTime() 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() private async void ADFailCallBack()
{ {
Time.timeScale = 1f;
BIManager.Instance.TrackEventLevel(Event.level_ad_show_fail, "102"); BIManager.Instance.TrackEventLevel(Event.level_ad_show_fail, "102");
BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "102"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "102");
await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { });

46
Tool/Luban/.cache.meta
View File

@ -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/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1724397186248
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/build_buildconfig.json,48AB9FAF4B191CBFAD1AE41D8DB5E9,264,1724323726434 /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,1724323726435 /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,1724323726434 /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,F9E47AA657849A2E45D7DC79DE7138DA,8730,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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,1724323726434 /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/__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/__enums__.xlsx,BB1B7B4C814680E15D54B12E0C4BAD5,12703,1722244651038
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,F5E663DB51F49239D4EF4F4A87EAD5CC,11140,1724143842408 /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/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/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/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

BIN
Tool/Luban/Datas/StringConfig.xlsx
View File

Binary file not shown.