com.xd.sdk.tap 0.0.6-xd.3 → 4.8.1-xd.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Compliance/Runtime/Public/TapTapCompliance.cs +1 -1
- package/Core/Resources/TapMessage.prefab.meta +0 -0
- package/Core/Resources/tap_toast_background.png +0 -0
- package/Core/Resources/tap_toast_background1.png +0 -0
- package/Core/Runtime/Internal/Utils/TapMessage.cs +0 -0
- package/Core/Runtime/Internal/Utils/TapMessage.cs.meta +0 -0
- package/Core/Runtime/Public/TapTapSDK.cs +1 -1
- package/Core/Standalone/Plugins/macOS/TapDBDeviceInfo.bundle/Contents/MacOS/TapDBDeviceInfo +0 -0
- package/License/Runtime/Public/TapTapLicense.cs +1 -1
- package/Login/Runtime/Public/TapTapLogin.cs +1 -1
- package/Login/Standalone/Resources/Sprites/taptap-login-button-bg.png +0 -0
- package/Login/Standalone/Resources/Sprites/taptap-scan-tips-error.png +0 -0
- package/Login/Standalone/Resources/Sprites/taptap-scan-tips-info.png +0 -0
- package/Moment/Runtime/Public/TapTapMoment.cs +1 -1
- package/Plugins/Android/XDGBridgeTapTapWrapper_v7_7.0.1.aar.meta +32 -0
- package/Review/Runtime/Public/TapTapReview.cs +1 -1
- package/Runtime/Internal/TapComplianceHelper.cs +6 -3
- package/Runtime/Public/TapSDKEventHandler.cs +29 -30
- package/Update/Runtime/Public/TapTapUpdate.cs +1 -1
- package/package.json +1 -1
- package/Login/Plugins/iOS.meta +0 -8
- package/Plugins/Android/XDGBridgeTapTapWrapper_v7_7.0.0.aar.meta +0 -3
- /package/Plugins/Android/{XDGBridgeTapTapWrapper_v7_7.0.0.aar → XDGBridgeTapTapWrapper_v7_7.0.1.aar} +0 -0
|
@@ -10,7 +10,7 @@ namespace TapSDK.Compliance
|
|
|
10
10
|
public static class TapTapCompliance
|
|
11
11
|
{
|
|
12
12
|
|
|
13
|
-
public static readonly string Version = "4.8.1
|
|
13
|
+
public static readonly string Version = "4.8.1";
|
|
14
14
|
|
|
15
15
|
public static void RegisterComplianceCallback(Action<int, string> callback)
|
|
16
16
|
{
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -7,7 +7,7 @@ namespace TapSDK.Login
|
|
|
7
7
|
public class TapTapLogin
|
|
8
8
|
{
|
|
9
9
|
|
|
10
|
-
public static readonly string Version = "4.8.1
|
|
10
|
+
public static readonly string Version = "4.8.1";
|
|
11
11
|
|
|
12
12
|
public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
|
|
13
13
|
public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
fileFormatVersion: 2
|
|
2
|
+
guid: 3410dde9cb59e44eda44f69909f92ebd
|
|
3
|
+
PluginImporter:
|
|
4
|
+
externalObjects: {}
|
|
5
|
+
serializedVersion: 2
|
|
6
|
+
iconMap: {}
|
|
7
|
+
executionOrder: {}
|
|
8
|
+
defineConstraints: []
|
|
9
|
+
isPreloaded: 0
|
|
10
|
+
isOverridable: 1
|
|
11
|
+
isExplicitlyReferenced: 0
|
|
12
|
+
validateReferences: 1
|
|
13
|
+
platformData:
|
|
14
|
+
- first:
|
|
15
|
+
Android: Android
|
|
16
|
+
second:
|
|
17
|
+
enabled: 1
|
|
18
|
+
settings: {}
|
|
19
|
+
- first:
|
|
20
|
+
Any:
|
|
21
|
+
second:
|
|
22
|
+
enabled: 0
|
|
23
|
+
settings: {}
|
|
24
|
+
- first:
|
|
25
|
+
Editor: Editor
|
|
26
|
+
second:
|
|
27
|
+
enabled: 0
|
|
28
|
+
settings:
|
|
29
|
+
DefaultValueInitialized: true
|
|
30
|
+
userData:
|
|
31
|
+
assetBundleName:
|
|
32
|
+
assetBundleVariant:
|
|
@@ -42,8 +42,8 @@ namespace XD.SDK.Tap.Internal
|
|
|
42
42
|
|
|
43
43
|
private void StartUp(bool bGlobal, string unionId, Action<Dictionary<string, object>> callback)
|
|
44
44
|
{
|
|
45
|
-
EnsureCallbackRegistered();
|
|
46
45
|
loginProcessComplianceResult = callback;
|
|
46
|
+
|
|
47
47
|
if (bGlobal)
|
|
48
48
|
{
|
|
49
49
|
var quick = new Dictionary<string, object>
|
|
@@ -57,6 +57,7 @@ namespace XD.SDK.Tap.Internal
|
|
|
57
57
|
loginProcessComplianceResult = null;
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
+
EnsureCallbackRegistered();
|
|
60
61
|
|
|
61
62
|
TapTapCompliance.Startup(unionId);
|
|
62
63
|
}
|
|
@@ -117,22 +118,24 @@ namespace XD.SDK.Tap.Internal
|
|
|
117
118
|
case StartUpResult.EXITED:
|
|
118
119
|
if (loginProcessComplianceResult == null)
|
|
119
120
|
{
|
|
120
|
-
AccountFeaturesImpl.Instance.InternalLogout("COMPLIANCE_EXIT"
|
|
121
|
+
AccountFeaturesImpl.Instance.InternalLogout("COMPLIANCE_EXIT");
|
|
121
122
|
}
|
|
122
123
|
else
|
|
123
124
|
{
|
|
124
125
|
SendLoginProcessComplianceResult(code, "exited", message);
|
|
125
126
|
}
|
|
127
|
+
|
|
126
128
|
break;
|
|
127
129
|
case StartUpResult.SWITCH_ACCOUNT:
|
|
128
130
|
if (loginProcessComplianceResult == null)
|
|
129
131
|
{
|
|
130
|
-
AccountFeaturesImpl.Instance.InternalLogout("SWITCH_ACCOUNT"
|
|
132
|
+
AccountFeaturesImpl.Instance.InternalLogout("SWITCH_ACCOUNT");
|
|
131
133
|
}
|
|
132
134
|
else
|
|
133
135
|
{
|
|
134
136
|
SendLoginProcessComplianceResult(code, "switch_account", message);
|
|
135
137
|
}
|
|
138
|
+
|
|
136
139
|
break;
|
|
137
140
|
case StartUpResult.REAL_NAME_STOP:
|
|
138
141
|
SendLoginProcessComplianceResult(code, "real_name_stop", message);
|
|
@@ -12,6 +12,7 @@ using TapSDK.Login;
|
|
|
12
12
|
using TapSDK.Moment;
|
|
13
13
|
using UnityEngine;
|
|
14
14
|
using UnityEngine.Scripting;
|
|
15
|
+
using XD.SDK.Common;
|
|
15
16
|
using XD.SDK.Common.Internal.Events;
|
|
16
17
|
|
|
17
18
|
#if UNITY_EDITOR || UNITY_STANDALONE
|
|
@@ -37,56 +38,51 @@ namespace XD.SDK.Tap.Internal
|
|
|
37
38
|
static void RegisterTapCore()
|
|
38
39
|
{
|
|
39
40
|
#if UNITY_EDITOR || UNITY_STANDALONE
|
|
40
|
-
// 同步事件处理
|
|
41
41
|
XDGEventBus.SubscribeAsync(XDGEvents.TapSDKInit, async args =>
|
|
42
42
|
{
|
|
43
|
-
var
|
|
44
|
-
var
|
|
45
|
-
var
|
|
46
|
-
var
|
|
47
|
-
var
|
|
48
|
-
var
|
|
49
|
-
var bDB = (bool)args[6];
|
|
50
|
-
var channel = (string)args[7];
|
|
51
|
-
|
|
52
|
-
var antiConfig = (AntiConfig)args[8];
|
|
53
|
-
|
|
43
|
+
var language = (string)args[0];
|
|
44
|
+
var packageType = (string)args[1];
|
|
45
|
+
var tapConfig = ConfigModule.TapConfig;
|
|
46
|
+
var bGlobal = ConfigModule.IsGlobal;
|
|
47
|
+
var antiConfig = ConfigModule.Anti;
|
|
48
|
+
var bEnableLog = true;
|
|
54
49
|
var options = new TapTapSdkOptions
|
|
55
50
|
{
|
|
56
|
-
clientId =
|
|
57
|
-
clientToken =
|
|
58
|
-
clientPublicKey =
|
|
51
|
+
clientId = tapConfig.ClientId,
|
|
52
|
+
clientToken = tapConfig.ClientToken,
|
|
53
|
+
clientPublicKey = tapConfig.ClientPublicKey,
|
|
59
54
|
preferredLanguage = language.ConvertToTapLanguage(),
|
|
60
55
|
region = bGlobal ? TapTapRegionType.Overseas : TapTapRegionType.CN,
|
|
61
|
-
//TODO
|
|
62
|
-
enableLog =
|
|
56
|
+
// TODO 是否开启日志
|
|
57
|
+
enableLog = bEnableLog,
|
|
58
|
+
gameVersion = tapConfig.DBConfig.Version
|
|
63
59
|
};
|
|
64
60
|
|
|
65
|
-
var baseOptions = new TapTapSdkBaseOptions[
|
|
61
|
+
var baseOptions = new TapTapSdkBaseOptions[2];
|
|
66
62
|
|
|
67
63
|
if (!bGlobal && antiConfig.Enabled)
|
|
68
64
|
{
|
|
69
65
|
var complianceOption = new TapTapComplianceOption()
|
|
70
66
|
{
|
|
71
67
|
useAgeRange = antiConfig.UseAgeRange,
|
|
72
|
-
showSwitchAccount = antiConfig.ShowSwitchAccount
|
|
68
|
+
showSwitchAccount = packageType != XDGPackageType.PackageTypePCTapTap && antiConfig.ShowSwitchAccount
|
|
73
69
|
};
|
|
74
70
|
baseOptions[0] = complianceOption;
|
|
75
71
|
}
|
|
76
72
|
|
|
77
|
-
|
|
73
|
+
var tapDBOption = new TapTapEventOptions()
|
|
78
74
|
{
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
75
|
+
channel = WindowsRegistryAccess.GetChannel(bGlobal, ConfigModule.ClientId, tapConfig.DBConfig.Channel),
|
|
76
|
+
enableTapTapEvent = tapConfig.DBConfig.Enable,
|
|
77
|
+
overrideBuiltInParameters = true,
|
|
78
|
+
enableAutoIAPEvent = false
|
|
79
|
+
};
|
|
80
|
+
baseOptions[1] = tapDBOption;
|
|
85
81
|
|
|
86
82
|
//TODO 埋点,4.x 内部判断了是否需要从 Tap 启动器启动
|
|
87
83
|
TapTapSDK.Init(options, baseOptions);
|
|
88
84
|
|
|
89
|
-
if (
|
|
85
|
+
if (bEnableLog)
|
|
90
86
|
{
|
|
91
87
|
TapLogger.LogDelegate = (level, s) =>
|
|
92
88
|
{
|
|
@@ -105,9 +101,12 @@ namespace XD.SDK.Tap.Internal
|
|
|
105
101
|
};
|
|
106
102
|
}
|
|
107
103
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
104
|
+
if (ConfigModule.UsingTapPC)
|
|
105
|
+
{
|
|
106
|
+
UIManager.ShowLoading(false, 5);
|
|
107
|
+
await TapTapSDK.IsLaunchedFromTapTapPC();
|
|
108
|
+
UIManager.DismissLoading();
|
|
109
|
+
}
|
|
111
110
|
});
|
|
112
111
|
|
|
113
112
|
#endif
|
package/package.json
CHANGED
package/Login/Plugins/iOS.meta
DELETED
/package/Plugins/Android/{XDGBridgeTapTapWrapper_v7_7.0.0.aar → XDGBridgeTapTapWrapper_v7_7.0.1.aar}
RENAMED
|
File without changes
|