3 Commits
tw ... main

Author SHA1 Message Date
c0509da0fc fix: correct Java types and remove unused import in SDKManager
- Replace Kotlin-style bool/string with Java boolean/String
- Remove unused kotlinx.serialization.json.Json import

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-03 22:02:36 +08:00
c9fe482c8c update tuyoosdk, set DNS IPs 2026-06-03 15:57:50 +08:00
92d04aba61 sync from ty 2026-06-03 14:54:56 +08:00
16 changed files with 56 additions and 29 deletions

View File

@@ -113,7 +113,7 @@ public class SDKTest : MonoBehaviour
var customId_2 = TDAnalytics.GetDistinctId("0caf287574bd4a9bb08be8995705ef6f"); var customId_2 = TDAnalytics.GetDistinctId("0caf287574bd4a9bb08be8995705ef6f");
Debug.Log($"customId = {customId}, customId_2 = {customId_2}"); 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; int retryAttempt;

View File

@@ -196,9 +196,9 @@ namespace tysdk.editor
//Facebook //Facebook
{ {
string faceBookAppId = "2262594684272912"; string faceBookAppId = "162066986963808";
string faceBookDisPlayname = "fb2262594684272912"; string faceBookDisPlayname = "arkgame";
string facebookClientToken = "123be126bb573f87cd96b0fd67274329"; string facebookClientToken = "5fe59b0d985ad7acb51f48081e69d45b";
PlistElementDict facebookDic = urlTypesArray.AddDict(); PlistElementDict facebookDic = urlTypesArray.AddDict();
PlistElementArray fbSchmes = facebookDic.CreateArray("CFBundleURLSchemes"); PlistElementArray fbSchmes = facebookDic.CreateArray("CFBundleURLSchemes");

View File

@@ -2,18 +2,24 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CLIENT_ID</key>
<string>481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62</string>
<key>ANDROID_CLIENT_ID</key>
<string>481260393117-jhq50gh6n2p6pat1bjhcgj3th1ke19jg.apps.googleusercontent.com</string>
<key>API_KEY</key> <key>API_KEY</key>
<string>AIzaSyAafu4s9EeILJctHwN-yd3lF7z-drQibxI</string> <string>AIzaSyDQrn5AeVA-T0PV22PtuUc_GrpK-M5cl-k</string>
<key>GCM_SENDER_ID</key> <key>GCM_SENDER_ID</key>
<string>679771497905</string> <string>481260393117</string>
<key>PLIST_VERSION</key> <key>PLIST_VERSION</key>
<string>1</string> <string>1</string>
<key>BUNDLE_ID</key> <key>BUNDLE_ID</key>
<string>com.arkgame.ft.tw</string> <string>com.arkgame.ft</string>
<key>PROJECT_ID</key> <key>PROJECT_ID</key>
<string>fishing-travel-tw</string> <string>fishing-travel</string>
<key>STORAGE_BUCKET</key> <key>STORAGE_BUCKET</key>
<string>fishing-travel-tw.firebasestorage.app</string> <string>fishing-travel.appspot.com</string>
<key>IS_ADS_ENABLED</key> <key>IS_ADS_ENABLED</key>
<false></false> <false></false>
<key>IS_ANALYTICS_ENABLED</key> <key>IS_ANALYTICS_ENABLED</key>
@@ -25,6 +31,6 @@
<key>IS_SIGNIN_ENABLED</key> <key>IS_SIGNIN_ENABLED</key>
<true></true> <true></true>
<key>GOOGLE_APP_ID</key> <key>GOOGLE_APP_ID</key>
<string>1:679771497905:ios:728d18a309ca5164210990</string> <string>1:481260393117:ios:120b4fb634fae8d007fa74</string>
</dict> </dict>
</plist> </plist>

View File

@@ -1,33 +1,41 @@
{ {
"project_info": { "project_info": {
"project_number": "679771497905", "project_number": "481260393117",
"project_id": "fishing-travel-tw", "project_id": "fishing-travel",
"storage_bucket": "fishing-travel-tw.firebasestorage.app" "storage_bucket": "fishing-travel.appspot.com"
}, },
"client": [ "client": [
{ {
"client_info": { "client_info": {
"mobilesdk_app_id": "1:679771497905:android:062e2b39ee6613ad210990", "mobilesdk_app_id": "1:481260393117:android:4e8da50d0ee3b5c207fa74",
"android_client_info": { "android_client_info": {
"package_name": "com.arkgame.ft.tw" "package_name": "com.arkgame.ft"
} }
}, },
"oauth_client": [ "oauth_client": [
{ {
"client_id": "679771497905-9d8ht9dnuhbn70p72hhc5ld29lfbqhpr.apps.googleusercontent.com", "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_type": 3 "client_type": 3
} }
], ],
"api_key": [ "api_key": [
{ {
"current_key": "AIzaSyCvYkrDG0tMViVdQ28VGQJ1NpgwkROm_9U" "current_key": "AIzaSyBU6gAwu0O28jg7-TRd_Vx2YMCH_Baa8Bw"
} }
], ],
"services": { "services": {
"appinvite_service": { "appinvite_service": {
"other_platform_oauth_client": [ "other_platform_oauth_client": [
{ {
"client_id": "679771497905-9d8ht9dnuhbn70p72hhc5ld29lfbqhpr.apps.googleusercontent.com", "client_id": "481260393117-0ah0ekk7lu5r44ko2uqlfoebgak8dmhj.apps.googleusercontent.com",
"client_type": 3 "client_type": 3
} }
] ]

View File

@@ -7,9 +7,9 @@ public class ConfigManager {
public static String SDK_GAMEID = "20587"; public static String SDK_GAMEID = "20587";
public static String SDK_PROJECTID = "20587"; public static String SDK_PROJECTID = "20587";
public static String SDK_CLOUDID = "128"; public static String SDK_CLOUDID = "128";
public static String SDK_CLIENTID = "Android_5.00_tyGuest,facebook.googleplay.0-hall20587.googleplay.FishingTravelTw"; public static String SDK_CLIENTID = "Android_5.00_tyGuest,facebook.googleplay.0-hall20587.googleplay.FishingMaster";
public static String SDK_LOGIN_SERVER_URL = "https://128-hwsfsdk-sdk-ts02.sdk-k8s-us-gcp.arksgame.com"; public static String SDK_LOGIN_SERVER_URL = "https://128-hwsfsdk-sdk-online01.qijihdhk.com";
// 防沉迷 - nameSpace // 防沉迷 - nameSpace
public static String FCM_NAMESPACE = "128"; public static String FCM_NAMESPACE = "128";

View File

@@ -44,8 +44,6 @@ import org.json.JSONObject;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import kotlinx.serialization.json.Json;
public class SDKManager { public class SDKManager {
private final static Handler handler = new Handler(Looper.getMainLooper()); private final static Handler handler = new Handler(Looper.getMainLooper());
@@ -124,6 +122,7 @@ public class SDKManager {
public static void UnityResetServerUrl(String url) { public static void UnityResetServerUrl(String url) {
SDKLog.i("UnityResetServerUrl : " + url); SDKLog.i("UnityResetServerUrl : " + url);
SetDNSIPsEnable(false);
SDKAPI.getIns().updateServer(url); SDKAPI.getIns().updateServer(url);
} }
@@ -561,6 +560,18 @@ public class SDKManager {
} }
} }
public static void SetDNSIPsEnable(boolean enable) {
SDKAPI.enableDoh(enable);
if(enable) {
SDKAPI.setHttpDnsIps(new String[]{
"34.111.1.231",
"2600:1901:0:c31b::"
});
}
else{
SDKAPI.setHttpDnsIps(new String[0]);
}
}
} }

View File

@@ -12,6 +12,7 @@ public class TYApp extends Application {
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
SDKAPI.getIns().onApplicationCreate(this); SDKAPI.getIns().onApplicationCreate(this);
SDKManager.SetDNSIPsEnable(true);
} }
@Override @Override
@@ -19,4 +20,5 @@ public class TYApp extends Application {
super.attachBaseContext(base); super.attachBaseContext(base);
SDKAPI.getIns().onAttachBaseContext(base, this); SDKAPI.getIns().onAttachBaseContext(base, this);
} }
} }

View File

@@ -11,13 +11,13 @@
#define SDK_GAMEID @"20587" #define SDK_GAMEID @"20587"
#define SDK_PROJECTID @"20587" #define SDK_PROJECTID @"20587"
#define SDK_CLOUDID @"128" #define SDK_CLOUDID @"128"
#define SDK_CLIENTID @"IOS_5.00_tyGuest,facebook,appStore.appStore.0-hall20587.appStore.FishingTravelTw" #define SDK_CLIENTID @"IOS_5.00_tyGuest,facebook,appStore.appStore.0-hall20587.appStore.FishingMaster"
//Google //Google
#define GOOGLE_CLIENTID @"481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62.apps.googleusercontent.com" #define GOOGLE_CLIENTID @"481260393117-88n0v3ht8ashhk0r5ri47hced7o5qj62.apps.googleusercontent.com"
// 账号支付 - 服务域名 // 账号支付 - 服务域名
#define SDK_LOGIN_SERVER_URL @"https://128-hwsfsdk-sdk-ts02.sdk-k8s-us-gcp.arksgame.com" #define SDK_LOGIN_SERVER_URL @"https://128-hwsfsdk-sdk-online01.qijihdhk.com"
// 账号支付 - Debug // 账号支付 - Debug
#define XYSDK_DEBUG YES #define XYSDK_DEBUG YES
// 广告 - AdBoxID // 广告 - AdBoxID

View File

@@ -16,7 +16,7 @@
<files /> <files />
<settings> <settings>
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" /> <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
<setting name="bundleId" value="com.arkgame.ft.tw" /> <setting name="bundleId" value="com.arkgame.ft" />
<setting name="explodeAars" value="True" /> <setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" /> <setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="True" /> <setting name="gradlePropertiesTemplateEnabled" value="True" />

View File

@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: "Ark Game Limited (\u9999\u6E2F)" companyName: "Ark Game Limited (\u9999\u6E2F)"
productName: "\u91E3\u738B\u74B0\u904A\u50B3\u5947" productName: Fishing Travel
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.arkgame.ft.tw Android: com.arkgame.ft
Standalone: com.Unity-Technologies.com.unity.template.urp-blank Standalone: com.Unity-Technologies.com.unity.template.urp-blank
iPhone: com.arkgame.ft iPhone: com.arkgame.ft
buildNumber: buildNumber:

View File

@@ -1,7 +1,7 @@
{ {
"keystoreName": "bamboogame.keystore", "keystoreName": "bamboogame.keystore",
"keyaliasName": "fishing", "keyaliasName": "fishing",
"applicationIdentifier":"com.arkgame.ft.tw", "applicationIdentifier":"com.arkgame.ft",
"companyName":"Ark Game Limited (香港)", "companyName":"Ark Game Limited (香港)",
"productName":"釣王環遊傳奇" "productName":"Fishing Travel"
} }