diff --git a/sdk-intergration/Assets/Scripts/SDKTest.cs b/sdk-intergration/Assets/Scripts/SDKTest.cs index 12a2d37..d06ace6 100644 --- a/sdk-intergration/Assets/Scripts/SDKTest.cs +++ b/sdk-intergration/Assets/Scripts/SDKTest.cs @@ -113,7 +113,7 @@ public class SDKTest : MonoBehaviour var customId_2 = TDAnalytics.GetDistinctId("0caf287574bd4a9bb08be8995705ef6f"); Debug.Log($"customId = {customId}, customId_2 = {customId_2}"); - UnityBridgeFunc.UnityResetServerUrl("https://128-hwsfsdk-sdk-test01.qijihdhk.com"); + // UnityBridgeFunc.UnityResetServerUrl("https://128-hwsfsdk-sdk-test01.qijihdhk.com"); } int retryAttempt; diff --git a/sdk-intergration/Packages/tysdk/Editor/IOSBuildProcessor.cs b/sdk-intergration/Packages/tysdk/Editor/IOSBuildProcessor.cs index 421bfd6..ef07bc0 100644 --- a/sdk-intergration/Packages/tysdk/Editor/IOSBuildProcessor.cs +++ b/sdk-intergration/Packages/tysdk/Editor/IOSBuildProcessor.cs @@ -196,9 +196,9 @@ namespace tysdk.editor //Facebook { - string faceBookAppId = "162066986963808"; - string faceBookDisPlayname = "arkgame"; - string facebookClientToken = "5fe59b0d985ad7acb51f48081e69d45b"; + string faceBookAppId = "2262594684272912"; + string faceBookDisPlayname = "fb2262594684272912"; + string facebookClientToken = "123be126bb573f87cd96b0fd67274329"; PlistElementDict facebookDic = urlTypesArray.AddDict(); PlistElementArray fbSchmes = facebookDic.CreateArray("CFBundleURLSchemes"); diff --git a/sdk-intergration/Packages/tysdk/Files/GoogleService-Info.plist b/sdk-intergration/Packages/tysdk/Files/GoogleService-Info.plist index eb43860..d415994 100644 --- a/sdk-intergration/Packages/tysdk/Files/GoogleService-Info.plist +++ b/sdk-intergration/Packages/tysdk/Files/GoogleService-Info.plist @@ -2,24 +2,18 @@ - CLIENT_ID - 481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62 - ANDROID_CLIENT_ID - 481260393117-jhq50gh6n2p6pat1bjhcgj3th1ke19jg.apps.googleusercontent.com API_KEY - AIzaSyDQrn5AeVA-T0PV22PtuUc_GrpK-M5cl-k + AIzaSyAafu4s9EeILJctHwN-yd3lF7z-drQibxI GCM_SENDER_ID - 481260393117 + 679771497905 PLIST_VERSION 1 BUNDLE_ID - com.arkgame.ft + com.arkgame.ft.tw PROJECT_ID - fishing-travel + fishing-travel-tw STORAGE_BUCKET - fishing-travel.appspot.com + fishing-travel-tw.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -31,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:481260393117:ios:120b4fb634fae8d007fa74 + 1:679771497905:ios:728d18a309ca5164210990 \ No newline at end of file diff --git a/sdk-intergration/Packages/tysdk/Files/google-services.json b/sdk-intergration/Packages/tysdk/Files/google-services.json index 8ae069a..660578d 100644 --- a/sdk-intergration/Packages/tysdk/Files/google-services.json +++ b/sdk-intergration/Packages/tysdk/Files/google-services.json @@ -1,41 +1,33 @@ { "project_info": { - "project_number": "481260393117", - "project_id": "fishing-travel", - "storage_bucket": "fishing-travel.appspot.com" + "project_number": "679771497905", + "project_id": "fishing-travel-tw", + "storage_bucket": "fishing-travel-tw.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:481260393117:android:4e8da50d0ee3b5c207fa74", + "mobilesdk_app_id": "1:679771497905:android:062e2b39ee6613ad210990", "android_client_info": { - "package_name": "com.arkgame.ft" + "package_name": "com.arkgame.ft.tw" } }, "oauth_client": [ { - "client_id": "481260393117-jhq50gh6n2p6pat1bjhcgj3th1ke19jg.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.arkgame.ft", - "certificate_hash": "c9cf2f5eaba383cbdd5b968d0342c49afabc32a2" - } - }, - { - "client_id": "481260393117-0ah0ekk7lu5r44ko2uqlfoebgak8dmhj.apps.googleusercontent.com", + "client_id": "679771497905-9d8ht9dnuhbn70p72hhc5ld29lfbqhpr.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyBU6gAwu0O28jg7-TRd_Vx2YMCH_Baa8Bw" + "current_key": "AIzaSyCvYkrDG0tMViVdQ28VGQJ1NpgwkROm_9U" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "481260393117-0ah0ekk7lu5r44ko2uqlfoebgak8dmhj.apps.googleusercontent.com", + "client_id": "679771497905-9d8ht9dnuhbn70p72hhc5ld29lfbqhpr.apps.googleusercontent.com", "client_type": 3 } ] diff --git a/sdk-intergration/Packages/tysdk/Plugins/Android/ConfigManager.java b/sdk-intergration/Packages/tysdk/Plugins/Android/ConfigManager.java index a66a81f..d3c3930 100644 --- a/sdk-intergration/Packages/tysdk/Plugins/Android/ConfigManager.java +++ b/sdk-intergration/Packages/tysdk/Plugins/Android/ConfigManager.java @@ -7,9 +7,9 @@ public class ConfigManager { public static String SDK_GAMEID = "20587"; public static String SDK_PROJECTID = "20587"; public static String SDK_CLOUDID = "128"; - public static String SDK_CLIENTID = "Android_5.00_tyGuest,facebook.googleplay.0-hall20587.googleplay.FishingMaster"; + public static String SDK_CLIENTID = "Android_5.00_tyGuest,facebook.googleplay.0-hall20587.googleplay.FishingTravelTw"; - public static String SDK_LOGIN_SERVER_URL = "https://128-hwsfsdk-sdk-online01.qijihdhk.com"; + public static String SDK_LOGIN_SERVER_URL = "https://128-hwsfsdk-sdk-ts02.sdk-k8s-us-gcp.arksgame.com"; // 防沉迷 - nameSpace public static String FCM_NAMESPACE = "128"; diff --git a/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar b/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar index 6576bb4..b271bb9 100644 Binary files a/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar and b/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar differ diff --git a/sdk-intergration/Packages/tysdk/Plugins/iOS/TYConfig.h b/sdk-intergration/Packages/tysdk/Plugins/iOS/TYConfig.h index c57f198..7566999 100644 --- a/sdk-intergration/Packages/tysdk/Plugins/iOS/TYConfig.h +++ b/sdk-intergration/Packages/tysdk/Plugins/iOS/TYConfig.h @@ -11,13 +11,13 @@ #define SDK_GAMEID @"20587" #define SDK_PROJECTID @"20587" #define SDK_CLOUDID @"128" -#define SDK_CLIENTID @"IOS_5.00_tyGuest,facebook,appStore.appStore.0-hall20587.appStore.FishingMaster" +#define SDK_CLIENTID @"IOS_5.00_tyGuest,facebook,appStore.appStore.0-hall20587.appStore.FishingTravelTw" //Google #define GOOGLE_CLIENTID @"481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62.apps.googleusercontent.com" // 账号支付 - 服务域名 -#define SDK_LOGIN_SERVER_URL @"https://128-hwsfsdk-sdk-online01.qijihdhk.com" +#define SDK_LOGIN_SERVER_URL @"https://128-hwsfsdk-sdk-ts02.sdk-k8s-us-gcp.arksgame.com" // 账号支付 - Debug #define XYSDK_DEBUG YES // 广告 - AdBoxID diff --git a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs index abdf36d..6b2ed62 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs @@ -364,6 +364,13 @@ namespace tysdk UnityBridgeFunc.CleanLinkTmpSnsInfo(); } +#if UNITY_EDITOR + public async Task ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId) + { + await Task.Delay(300); + return new ChangeLinkResult(){code = 1}; + } +#elif UNITY_IOS || UNITY_ANDROID public async Task ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId) { var task = TYSDKCallbackManager.Instance.RegisterCallback(TimeSpan.FromSeconds(30)); @@ -388,6 +395,7 @@ namespace tysdk CleanLinkTempSnSInfo(); } } +#endif public void ChangeLinkAccountResult(string message) { diff --git a/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml b/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml index ac4214a..745103a 100644 --- a/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml +++ b/sdk-intergration/ProjectSettings/AndroidResolverDependencies.xml @@ -16,7 +16,7 @@ - + diff --git a/sdk-intergration/ProjectSettings/ProjectSettings.asset b/sdk-intergration/ProjectSettings/ProjectSettings.asset index 6699313..2352213 100644 --- a/sdk-intergration/ProjectSettings/ProjectSettings.asset +++ b/sdk-intergration/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: "Ark Game Limited (\u9999\u6E2F)" - productName: Fishing Travel + productName: "\u91E3\u738B\u74B0\u904A\u50B3\u5947" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -163,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.arkgame.ft + Android: com.arkgame.ft.tw Standalone: com.Unity-Technologies.com.unity.template.urp-blank iPhone: com.arkgame.ft buildNumber: diff --git a/sdk-intergration/keystore/android.json b/sdk-intergration/keystore/android.json index 4bd2279..3cf9b06 100644 --- a/sdk-intergration/keystore/android.json +++ b/sdk-intergration/keystore/android.json @@ -1,7 +1,7 @@ { "keystoreName": "bamboogame.keystore", "keyaliasName": "fishing", - "applicationIdentifier":"com.arkgame.ft", + "applicationIdentifier":"com.arkgame.ft.tw", "companyName":"Ark Game Limited (香港)", - "productName":"Fishing Travel" + "productName":"釣王環遊傳奇" }