diff --git a/Forest/Assets/Config/Data/ad_adconfig.json b/Forest/Assets/Config/Data/ad_adconfig.json index f30647a..ee700c7 100644 --- a/Forest/Assets/Config/Data/ad_adconfig.json +++ b/Forest/Assets/Config/Data/ad_adconfig.json @@ -3,7 +3,7 @@ "ID": 100, "AdType": 0, "AdMod_UnitId_Android": "ca-app-pub-3940256099942544/5224354917", - "AdMod_UnitId_iOS": "ca-app-pub-3940256099942544/1712485313", + "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/9777215144", "UnityAds_UnitId_Android": "Rewarded_Android", "UnityAds_UnitId_iOS": "Rewarded_iOS" }, @@ -11,24 +11,24 @@ "ID": 101, "AdType": 0, "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5634049529", - "AdMod_UnitId_iOS": "ca-app-pub-2457954470236566/6001715188", - "UnityAds_UnitId_Android": "Rewarded_Android", - "UnityAds_UnitId_iOS": "Rewarded_iOS" + "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7039371165", + "UnityAds_UnitId_Android": "Reward_Android_101", + "UnityAds_UnitId_iOS": "Reward_iOS_101" }, { "ID": 102, "AdType": 0, "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5398902343", - "AdMod_UnitId_iOS": "ca-app-pub-2457954470236566/4688633519", - "UnityAds_UnitId_Android": "Rewarded_Android", - "UnityAds_UnitId_iOS": "Rewarded_iOS" + "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7971456684", + "UnityAds_UnitId_Android": "Reward_Android_102", + "UnityAds_UnitId_iOS": "Reward_iOS_102" }, { "ID": 103, "AdType": 0, "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/3331319818", - "AdMod_UnitId_iOS": "ca-app-pub-2457954470236566/3866328825", - "UnityAds_UnitId_Android": "Rewarded_Android", - "UnityAds_UnitId_iOS": "Rewarded_iOS" + "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/8945966315", + "UnityAds_UnitId_Android": "Reward_Android_103", + "UnityAds_UnitId_iOS": "Reward_iOS_103" } ] \ No newline at end of file diff --git a/Forest/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset b/Forest/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset index 1290fed..f165eb9 100644 --- a/Forest/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset +++ b/Forest/Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: GoogleMobileAdsSettings m_EditorClassIdentifier: adMobAndroidAppId: - adMobIOSAppId: + adMobIOSAppId: ca-app-pub-3416046585132585~3816928566 enableKotlinXCoroutinesPackagingOption: 1 optimizeInitialization: 0 optimizeAdLoading: 0 diff --git a/Forest/Assets/PhxhSDK b/Forest/Assets/PhxhSDK index f50f49b..05576c2 160000 --- a/Forest/Assets/PhxhSDK +++ b/Forest/Assets/PhxhSDK @@ -1 +1 @@ -Subproject commit f50f49bf2d585c21e0e31e95152c228ae653cac1 +Subproject commit 05576c26da26c4ca1e307f43e6787ffe0128edad diff --git a/Tool/Luban/.cache.meta b/Tool/Luban/.cache.meta index 137e340..00d30ad 100644 --- a/Tool/Luban/.cache.meta +++ b/Tool/Luban/.cache.meta @@ -1,20 +1,20 @@ -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,9BB1353E825B5AAF725BD1F57B1F230,1082,1718883891607 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,F9B531A897A2686FB7D07A8BFA6AABB,7213,1718883891607 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1718883891607 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1718883891607 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1718883891606 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1718883891606 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,71A2B6B6709FE3FF4DE257362B4885C,1094,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,F9B531A897A2686FB7D07A8BFA6AABB,7213,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719208478807 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1718685908734 -/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,3B47B6CD7D8EC7CFFBC64B4F43A88C3,10025,1718685908733 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,94BD1CE582A461FEF69E5F186F4FB516,9841,1719208462217 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,AE932D408FE5AC314C87D2C18FBE3476,12884,1718883875802 diff --git a/Tool/Luban/Datas/AD.xlsx b/Tool/Luban/Datas/AD.xlsx index 7526933..66f0e09 100644 Binary files a/Tool/Luban/Datas/AD.xlsx and b/Tool/Luban/Datas/AD.xlsx differ