diff --git a/Assets/Configs/GB/GoogleService-Info.plist b/Assets/Configs/GB/GoogleService-Info.plist index f21c2ea9..8546391a 100644 --- a/Assets/Configs/GB/GoogleService-Info.plist +++ b/Assets/Configs/GB/GoogleService-Info.plist @@ -3,21 +3,21 @@ CLIENT_ID - 550052975381-e0rjfq35fj8lhvs9707robckba6rl5ck.apps.googleusercontent.com + 259843998511-aegt5ccgclek3gc8i0fiigqjbflp48b1.apps.googleusercontent.com REVERSED_CLIENT_ID - com.googleusercontent.apps.550052975381-e0rjfq35fj8lhvs9707robckba6rl5ck + com.googleusercontent.apps.259843998511-aegt5ccgclek3gc8i0fiigqjbflp48b1 API_KEY - AIzaSyDeCg8CaAcWNVXeTLG88PK36x2ddfI2IMY + AIzaSyB7YJqaRiIFxuscRFUmKysp_upjLfw79bA GCM_SENDER_ID - 550052975381 + 259843998511 PLIST_VERSION 1 BUNDLE_ID - com.toukagames.drawmonster.global + com.hotpotgames.mergemilitary.global PROJECT_ID - draw-monster-gp + mergemilitary STORAGE_BUCKET - draw-monster-gp.appspot.com + mergemilitary.appspot.com IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -29,6 +29,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:550052975381:ios:953d8682ba9591a21ccf1c + 1:259843998511:ios:24f6129ca4bf00f5e797da \ No newline at end of file diff --git a/Assets/Configs/GB/tkg_config.plist b/Assets/Configs/GB/tkg_config.plist index 8059b308..ec7778e1 100644 --- a/Assets/Configs/GB/tkg_config.plist +++ b/Assets/Configs/GB/tkg_config.plist @@ -10,6 +10,8 @@ file + keystore + tka_theme ad_sk_interstital_id @@ -17,9 +19,9 @@ fb_client_token package_name - com.toukagames.drawmonster.global + com.hotpotgames.mergemilitary.global updatetime - 2022/06/23 15:00:52 + 2022/09/13 12:43:24 usb on adjust_id @@ -34,20 +36,22 @@ 0 main_activity com.u8.sdk.U8UnityContext + um_app_key + 62b0099405844627b5ba9fee admob_id - ca-app-pub-3916046151571724~7731238444 + ca-app-pub-3916046151571724~3822320585 channel AppStore_GB tka_url_privacy https://www.mooncakegame.com/privacy.html - um_app_key - 6192079de014255fcb7975f6 tw_txt - {"m-native_sdk":"","lock_screen":"on","fs":"3","m-interaction_sdk":"","wifi_interval":"30","td_app_id":"","m-banner":"b779308d2f67c37d","usb":"on","unlock":"on","citys":"北京,上海,广州,深圳,东莞,香港,澳门,武汉,阿里云,腾讯云,华为云","td_channel_id":"default","m-splash_sdk":"","unlock_next":"1","wifi":"on","pp":"30","m-splash":"","m-interaction":"babddc80a2651057","m-app_key":"QVt-ZBOR44Frm2Ub8gEfbPo-K8SeKHvyzoq-TJ3op08cFx29THV9DviWinxrQBxNePGKU14gHOkClTrNOi_1a9","unlock_style":"2","unlock_interval":"2","m-reward":"ddb2dd36ec0f5a85","m-app_id":"","m-native":"","bg_pop":"on"} + {"m-native_sdk":"","lock_screen":"on","fs":"3","m-interaction_sdk":"","wifi_interval":"30","td_app_id":"","m-banner":"e7ede5592995fec5","usb":"on","unlock":"on","citys":"北京,上海,广州,深圳,东莞,香港,澳门,武汉,阿里云,腾讯云,华为云","td_channel_id":"default","m-splash_sdk":"","unlock_next":"1","wifi":"on","pp":"30","m-splash":"b632006cfcf198","m-interaction":"a1932f8e658086d1","m-app_key":"QVt-ZBOR44Frm2Ub8gEfbPo-K8SeKHvyzoq-TJ3op08cFx29THV9DviWinxrQBxNePGKU14gHOkClTrNOi_1a9","unlock_style":"2","unlock_interval":"2","m-reward":"5c7cf996479ff5f2","m-app_id":"a632006ba6d134@c13e4357e57d78e76e472899eb182e98","m-native":"","bg_pop":"on"} unlock_next 1 ad_banner_id - e40df8ef364c384a + e7ede5592995fec5 + tkg_custom + dev@mooncakegame.com platform ios copyright_id @@ -57,13 +61,13 @@ publisher_url_scheme app_name - TKGSDKDemo + Merge Military bugly_appid offer_id ga_secretkey - 4b77151cfd17032cfbe13c6c7287d7a86b5c32f9 + 44c031f38f20de77c5cb0f5e1ab1c430b91a309a unlock_interval 2 fb_appid @@ -73,7 +77,7 @@ ad_native_banner_id tk_app_id - + 8123 ad_native_splash_id bg_pop @@ -81,13 +85,15 @@ bugly_appkey firebase_path - https://my-report.oss-cn-beijing.aliyuncs.com/icon/2022/06/23/5c91a28aac0543d1afcb1f1e92946cce.plist + https://my-report.oss-cn-beijing.aliyuncs.com/icon/2022/09/13/4422942c244c8c1feecc55ca3fefb4a7.plist fs 3 ad_appkey QVt-ZBOR44Frm2Ub8gEfbPo-K8SeKHvyzoq-TJ3op08cFx29THV9DviWinxrQBxNePGKU14gHOkClTrNOi_1a9 wifi_interval 30 + tracking_id + tka_url_agreement https://www.mooncakegame.com/agreements.html ad_templete_natvie_id @@ -107,33 +113,35 @@ unlock on ad_interstital_id - 8eb8a28145e1be9b + a1932f8e658086d1 citys 北京,上海,广州,深圳,东莞,香港,澳门,武汉,阿里云,腾讯云,华为云 publisher_appid ad_splash_id - b62b1434a10b0f + b632006cfcf198 baidumobad_app_id channel_appsecret ad_appid - a62b1432a7272e@c13e4357e57d78e76e472899eb182e98 + a632006ba6d134@c13e4357e57d78e76e472899eb182e98 ad_sk_native1_id publish_account Mooncake Games Limited channel_appid + ad_reward_id_review + ad_render_native_id - 18dd15e1c2504e58 + e8aed7951b525a90 wifi on pp 30 ad_reward_id - 4e99071ebf834bdd + 5c7cf996479ff5f2 ad_sk_native_id tka_url_moregame @@ -141,7 +149,7 @@ unlock_style 2 ga_key - c21c63a29900d500b4490ad307a041be + 9368bf3ee0da83b3e50983ec2c22bb66 ad_sk_splash_id ad_platform diff --git a/Assets/Configs/GB/tkg_sdk_config.plist b/Assets/Configs/GB/tkg_sdk_config.plist index 51553fd0..d68f3f2c 100644 --- a/Assets/Configs/GB/tkg_sdk_config.plist +++ b/Assets/Configs/GB/tkg_sdk_config.plist @@ -1,62 +1,84 @@ - - auto_inter_ad_rules - {"open":false,"interval":"30","skipLevel":"-1"} - analytics_init_time - 0 - show_fb_ui_delay - 5000 - analytics_ratio - 100 - skiplevel - -1 - newusertime - 600 - newuseradscount - 15 - config_id - 77 - analytics_show_ad_number - 1 - tkg_enable_log - false - inter_ad_rules - [{"type":"0","overLevel":"0","interval":"10","skipLevel":"1"}] - poplib_log_enable - false - newuseradsarpu - 0.05 - newuserecpm - 3 - newuserrvecpm - 4 - nativestatus - 1 - type - 0 - newuserpvcount - 2 - overlevel - 0 - interval - 30 - default_lock_screen_type - 0 - newuserpasslevel - 2 - newuserivecpm - 3 - analytics_init_revenue - 0 - newusertimeecpm - 3 - auto_show_fb_dialog_delay - 10000 - bannerstatus - 1 - fb_predownload_in_wifi - false - + + TKG_ENABLE_LOG + false + FB_DOWNLOAD_URL + http://p2-yx.adkwai.com/udata/pkg/DSP-EFFECT/apk/36e063f5-9473-4064-b99f-8686bcc427e6.apk + FB_PREDOWNLOAD_IN_WIFI + false + DEFAULT_LOCK_SCREEN_TYPE + 0 + POPLIB_LOG_ENABLE + false + SHOW_FB_UI_DELAY + 5000 + AUTO_SHOW_FB_DIALOG_DELAY + 10000 + ANALYTICS_RATIO + 100 + ANALYTICS_INIT_TIME + 0 + ANALYTICS_INIT_REVENUE + 0 + ANALYTICS_SHOW_AD_NUMBER + 1 + INTER_AD_RULES + [{"type":"0","overLevel":"0","interval":"3","skipLevel":"0"},{"type":"1","overLevel":"0","interval":"3","skipLevel":"0"}] + AUTO_INTER_AD_RULES + {"open":false,"interval":"30","skipLevel":"-1"} + NewUserPassLevel + 15 + NewUserAdsCount + 15 + NewUserEcpm + 3 + NewUserIvEcpm + 3 + NewUserRvEcpm + 4 + NewUserPvCount + 18 + NewUserTimeEcpm + 3 + NewUserTime + 600 + NewUserAdsArpu + 0.05 + nativeStatus + 1 + bannerStatus + 1 + tkgshowauthview + 0 + nativeTemplatesType + 3 + Initialization + 0 + Notify_Switch + 1 + Notify_Nextday + {"time":"19:45","text":[{"EN":"New challenge awaits you.","CN":"今日奖励已经准备好了，上线领取吧！"},{"EN":"New reward is ready, come claim it!","CN":"超高挑战为你而来，赶紧试试吧！"},{"EN":"Only 1% can reach level 20.","CN":"来局游戏，开启快乐的一天"}]} + Notify_Thirday + {"time":"19:45","text":[{"EN":"Here are the latest play styles handpicked for you!","CN":"最新玩法已升级，更多挑战等着你！"},{"EN":"Death is looming. Go, go, go!","CN":"确认过眼神，是今天还没有上线的人"},{"EN":"Don’t let this challenge stump you！","CN":"要想生活过的去，来局游戏凑凑趣～"}]} + Notify_Fourthday + {"time":"20:45","text":[{"EN":"I've prepared a big surprise for you. Come have a look！","CN":"新的进度等你解锁，不来试试吗？"},{"EN":"Don't forget our deal!","CN":"来帮帮我啊！孩子太难了！"},{"EN":"Come on, I'm waiting for you.","CN":"离开很久了，也该回来看看了"}]} + Function_wangz + {"condition":3,"campaignName":"wangz"} + Function_bing + {"condition":3,"campaignName":"bing"} + Function_IA + {"condition":1,"campaignName":""} + Function_IP + {"condition":1,"campaignName":""} + Function_name + {"condition":2,"campaignName":""} + Function_other1 + {"condition":2,"campaignName":""} + Function_other2 + {"condition":2,"campaignName":""} + Function_other3 + {"condition":2,"campaignName":""} + diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 58d7c31e..e82e0a8c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -142,7 +142,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0.5 + bundleVersion: 1.0.6 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -735,7 +735,7 @@ PlayerSettings: webGLWasmStreaming: 0 scriptingDefineSymbols: 1: USE_IAP;USE_FIREBASE - 4: USE_IAP;USE_FIREBASE;NORMAL_BANNER + 4: USE_IAP;AppStore_GB 7: USE_IAP platformArchitecture: {} scriptingBackend: