From 26f3d09556502c9f9fa953f9801e819f621cbc74 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 9 Jun 2023 17:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=8C=85=E5=90=8D=E7=AD=89?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/BFBuildProjectTools/BuildInfo.cs | 4 ++-- .../BuildProjectWindow/BuildProjectWindow.cs | 2 +- .../Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs | 2 +- Assets/Editor/JenkinsAdapter.cs | 4 ++-- Assets/Editor/Package.cs | 4 ++-- Assets/Plugins/Android/AndroidManifest.xml | 6 +++--- Assets/Scripts/Const/BFPlatform.Gate.cs | 2 +- Assets/Scripts/Const/BFPlatform.Language.cs | 2 +- .../FacebookSDK/SDK/Resources/FacebookSettings.asset | 6 +++--- Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset | 2 +- Assets/scenes/enter_scene.unity | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/Editor/BFBuildProjectTools/BuildInfo.cs b/Assets/Editor/BFBuildProjectTools/BuildInfo.cs index f26cc2930..3405ed321 100644 --- a/Assets/Editor/BFBuildProjectTools/BuildInfo.cs +++ b/Assets/Editor/BFBuildProjectTools/BuildInfo.cs @@ -34,12 +34,12 @@ namespace BFEditor.Build public bool IsGPChannel() { - return bundleName == "com.knight.connect.rpg"; + return bundleName == "com.combo.heroes.puzzle.rpg"; } public bool IsGPOfficial() { - return bundleName == "com.knight.connect.rpg"; + return bundleName == "com.combo.heroes.puzzle.rpg"; } // dev包使用mono编译，不会导出as工程 diff --git a/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs b/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs index ca839b6dc..d11aebb88 100644 --- a/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs +++ b/Assets/Editor/BFBuildProjectTools/BuildProjectWindow/BuildProjectWindow.cs @@ -16,7 +16,7 @@ namespace BFEditor.Build BFPlatformOptions platform = BFPlatformOptions.AndroidDev; const string ANDROID_DEV_PACKAGE_NAME = "com.juzu.b6.dev.android"; const string ANDROID_RELEASE_PACKAGE_NAME = "com.juzu.b6.release.android"; - const string ANDROID_GP_PACKAGE_NAME = "com.knight.connect.rpg"; + const string ANDROID_GP_PACKAGE_NAME = "com.combo.heroes.puzzle.rpg"; const string IOS_PACKAGE_NAME = "com.juzu.b6.dev.ios"; public BuildProjectWindow() diff --git a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs index e19edddd2..7ae08adf8 100644 --- a/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs +++ b/Assets/Editor/BFBuildProjectTools/Utils/BuildAndroidUtils.cs @@ -131,7 +131,7 @@ namespace BFEditor.Build // 应用名 if (buildInfo.IsPublish()) { - PlayerSettings.productName = "Knight Connect"; + PlayerSettings.productName = "Combo Hero"; } else { diff --git a/Assets/Editor/JenkinsAdapter.cs b/Assets/Editor/JenkinsAdapter.cs index 00947bcc6..ec21b3964 100644 --- a/Assets/Editor/JenkinsAdapter.cs +++ b/Assets/Editor/JenkinsAdapter.cs @@ -50,7 +50,7 @@ public class JenkinsAdapter { var buildInfo = new BuildInfo(); buildInfo.version = "0.1.0"; buildInfo.mode = "publish_release"; - buildInfo.bundleName = "com.knight.connect.rpg"; + buildInfo.bundleName = "com.combo.heroes.puzzle.rpg"; buildInfo.skipVersion = false; BuildProjectTools.BuildResources(buildInfo, Application.streamingAssetsPath, true); @@ -85,7 +85,7 @@ public class JenkinsAdapter { } PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.iOS, symbols); // 商品名称 - PlayerSettings.productName = "Knight Connect"; + PlayerSettings.productName = "Combo Hero"; // BuildType设置dev/release EditorUserBuildSettings.iOSBuildConfigType = iOSBuildType.Release; // 使用IL2CPP diff --git a/Assets/Editor/Package.cs b/Assets/Editor/Package.cs index 3dd210e93..e7e71f3f9 100644 --- a/Assets/Editor/Package.cs +++ b/Assets/Editor/Package.cs @@ -715,12 +715,12 @@ public class Package { CFBundleURLSchemes - fb222326627097275 + fb277827051329111 FacebookAppID - 222326627097275 + 277827051329111 FacebookClientToken 63ee45cf6edfede0ab7cd532592fb3f1 FacebookDisplayName diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 6f9ebdb20..9b4700e24 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -25,11 +25,11 @@ - - + + - + diff --git a/Assets/Scripts/Const/BFPlatform.Gate.cs b/Assets/Scripts/Const/BFPlatform.Gate.cs index e19bd23df..0e5525e7c 100644 --- a/Assets/Scripts/Const/BFPlatform.Gate.cs +++ b/Assets/Scripts/Const/BFPlatform.Gate.cs @@ -77,7 +77,7 @@ namespace BF {"com.juzu.b6.release.ios", "http://game.juzugame.com:3000"}, // gp - {"com.knight.connect.rpg", "https://entrance.bigfoot-studio.link"}, + {"com.combo.heroes.puzzle.rpg", "https://entrance.bigfoot-studio.link"}, }; //combine url解析的数据 diff --git a/Assets/Scripts/Const/BFPlatform.Language.cs b/Assets/Scripts/Const/BFPlatform.Language.cs index 6043dc41f..d2f9d8401 100644 --- a/Assets/Scripts/Const/BFPlatform.Language.cs +++ b/Assets/Scripts/Const/BFPlatform.Language.cs @@ -48,7 +48,7 @@ namespace BF {"com.juzu.b6.release.android", new BFLanguageInfo(new List{"en"})}, {"com.juzu.b6.release.ios", new BFLanguageInfo(new List{"en"})}, // 这个是gp渠道 - {"com.knight.connect.rpg", new BFLanguageInfo(new List{"en", "cn", "zh", "th", "ru", "id", "vi"})}, + {"com.combo.heroes.puzzle.rpg", new BFLanguageInfo(new List{"en", "cn", "zh", "th", "ru", "id", "vi"})}, {"com.juzu.b6.ios", new BFLanguageInfo(new List{"en"})}, }; diff --git a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset index 5b815c3f2..c891f8228 100644 --- a/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset +++ b/Assets/ThirdParty/FacebookSDK/SDK/Resources/FacebookSettings.asset @@ -14,11 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: selectedAppIndex: 0 clientTokens: - - 7ec364275c7766833d2ebace0c5a806e + - cd6be8cc57dff789f3476ee1b25e2410 appIds: - - 222326627097275 + - 277827051329111 appLabels: - - Knight Connect + - Combo Hero cookie: 1 logging: 1 status: 1 diff --git a/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset b/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset index b2b2d4463..476470d58 100644 --- a/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset +++ b/Assets/ThirdParty/MaxSdk/Resources/AppLovinSettings.asset @@ -28,5 +28,5 @@ MonoBehaviour: userTrackingUsageDescriptionZhHans: userTrackingUsageDescriptionZhHant: adMobAndroidAppId: - adMobIosAppId: ca-app-pub-8252390069143459~9766550824 + adMobIosAppId: ca-app-pub-8252390069143459~7358844489 snapAppStoreAppId: 0 diff --git a/Assets/scenes/enter_scene.unity b/Assets/scenes/enter_scene.unity index 39d9fad36..7c847bac5 100644 --- a/Assets/scenes/enter_scene.unity +++ b/Assets/scenes/enter_scene.unity @@ -280,7 +280,7 @@ MonoBehaviour: enableLog: 0 networkType: 1 tokens: - - appid: 4bd4464b39394188a6708fee41f352f7 + - appid: e6758afddf584e73b9b647da025bf7db serverUrl: https://ta.perfeggsgame.com mode: 0 timeZone: 1 @@ -462,8 +462,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: devKey: XHsvoUhhNvMamKMSEvrew3 - iosDevKey: - appID: + iosDevKey: R4qWrbCEhSQRBgeQVvGHQ9 + appID: 6450101181 UWPAppID: isDebug: 0 getConversionData: 0