diff --git a/Forest/Assets/Config/Data/ad_adconfig.json b/Forest/Assets/Config/Data/ad_adconfig.json index ee700c7..a4bd6c6 100644 --- a/Forest/Assets/Config/Data/ad_adconfig.json +++ b/Forest/Assets/Config/Data/ad_adconfig.json @@ -3,14 +3,14 @@ "ID": 100, "AdType": 0, "AdMod_UnitId_Android": "ca-app-pub-3940256099942544/5224354917", - "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/9777215144", + "AdMod_UnitId_iOS": "ca-app-pub-3940256099942544/1712485313", "UnityAds_UnitId_Android": "Rewarded_Android", "UnityAds_UnitId_iOS": "Rewarded_iOS" }, { "ID": 101, "AdType": 0, - "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5634049529", + "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/8993157643", "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7039371165", "UnityAds_UnitId_Android": "Reward_Android_101", "UnityAds_UnitId_iOS": "Reward_iOS_101" @@ -18,7 +18,7 @@ { "ID": 102, "AdType": 0, - "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5398902343", + "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/9292540542", "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7971456684", "UnityAds_UnitId_Android": "Reward_Android_102", "UnityAds_UnitId_iOS": "Reward_iOS_102" @@ -26,7 +26,7 @@ { "ID": 103, "AdType": 0, - "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/3331319818", + "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/9076918124", "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/8945966315", "UnityAds_UnitId_Android": "Reward_Android_103", "UnityAds_UnitId_iOS": "Reward_iOS_103" diff --git a/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs index 750dc82..c4a3596 100644 --- a/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs +++ b/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs @@ -52,7 +52,7 @@ namespace Gameplay.Manager _consumableGoods = new Dictionary() { { Platform + "_CoinBox_100", 100 }, { Platform + "_CoinBox_600", 600 }, - { Platform + "_CoinBox_1200", 1600 } + { Platform + "_CoinBox_1600", 1600 } }; _nonConsumableGoods = new Dictionary(); } diff --git a/Tool/Luban/.cache.meta b/Tool/Luban/.cache.meta index 6c6f0f3..f3cd08d 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,71A2B6B6709FE3FF4DE257362B4885C,1094,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,448F97FC077CE499139EFC4854438,7226,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719225182858 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719225182859 -/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719225182859 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,448F97FC077CE499139EFC4854438,7226,1719548938242 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719548938242 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719548938242 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719548938241 +/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719548938241 /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,94BD1CE582A461FEF69E5F186F4FB516,9841,1719208462217 +/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,C664BD5E7C8E22397FB8CDF12EAED4E,9832,1719548816307 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,7928FA644D565490BF62C9F31161DF,12898,1719225115683 diff --git a/Tool/Luban/Datas/AD.xlsx b/Tool/Luban/Datas/AD.xlsx index 66f0e09..99c5dab 100644 Binary files a/Tool/Luban/Datas/AD.xlsx and b/Tool/Luban/Datas/AD.xlsx differ