Skip to content

Commit

Permalink
Merge pull request #3 from taptap/feat_3.29.2
Browse files Browse the repository at this point in the history
update sdk version to 3.29.2 and delete unused file
  • Loading branch information
lc1006 authored Jun 28, 2024
2 parents 634bcc7 + 0c2fdbb commit 1f7aa94
Show file tree
Hide file tree
Showing 18 changed files with 134 additions and 233 deletions.
18 changes: 0 additions & 18 deletions Assets/Plugins/Android/AndroidManifest.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Plugins/Android/AndroidManifest.xml.meta

This file was deleted.

31 changes: 0 additions & 31 deletions Assets/Plugins/Android/baseProjectTemplate.gradle

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Plugins/Android/baseProjectTemplate.gradle.meta

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Plugins/Android/gradleTemplate.properties

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Plugins/Android/gradleTemplate.properties.meta

This file was deleted.

42 changes: 0 additions & 42 deletions Assets/Plugins/Android/mainTemplate.gradle

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Plugins/Android/mainTemplate.gradle.meta

This file was deleted.

3 changes: 0 additions & 3 deletions Assets/Script/GameStoreAndSettingsScene.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public void OnChargeCancel()
StoreMenu.SetActive(false);

// 返回游戏
Time.timeScale = 1f;
audioBgm.Play();

}
Expand Down Expand Up @@ -160,7 +159,6 @@ public void OnChargeFinished()
{
ChargeTip.SetActive(false);

Time.timeScale = 1f;
audioBgm.Play();
}

Expand All @@ -169,7 +167,6 @@ public void OnChargeFinished()
/// </summary>
public void GoStore()
{
Time.timeScale = 0f;
audioBgm.Pause();

StoreMenu.SetActive(true);
Expand Down
18 changes: 17 additions & 1 deletion Assets/Script/LoginScene.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,23 @@ public void OnRetryAntiaddiction()
/// </summary>
public async void StartAntiAddiction()
{
var profile = await TapLogin.GetProfile();
// 获取当前已登录用户的 Profile 信息
Profile profile = null;
try
{
profile = await TapLogin.GetProfile();
}
catch (Exception exception)
{
Debug.Log($"获取 Profile 信息出现异常:{exception}");
}
if (profile == null)
{
// 无法获取 Profile 时,登出并显示登录按钮
TapLogin.Logout();
SwitchLoginState(false);
return;
}

// 使用当前 Tap 用户的 unionid 作为用户标识进行合规认证检查
string userIdentifier = profile.unionid;
Expand Down
8 changes: 0 additions & 8 deletions Assets/TapTap/Achievement.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/TapTap/Achievement/AutoGenerated.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/TapTap/Gen.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/TapTap/Gen/Editor.meta

This file was deleted.

4 changes: 0 additions & 4 deletions Assets/TapTap/Gen/Editor/TapTapADRDependencies.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/TapTap/Gen/Editor/TapTapADRDependencies.xml.meta

This file was deleted.

108 changes: 56 additions & 52 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,57 @@
{
"dependencies": {
"com.tapsdk.antiaddiction": "https://github.com/taptap/TapAntiAddiction-Unity.git#3.29.1",
"com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#3.29.1",
"com.taptap.tds.login": "https://github.com/TapTap/TapLogin-Unity.git#3.29.1",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.pixel-perfect": "5.0.1",
"com.unity.2d.psdimporter": "6.0.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "7.0.5",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.cinemachine": "2.8.6",
"com.unity.collab-proxy": "1.17.1",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}
"dependencies": {
"com.tapsdk.antiaddiction": "https://github.com/taptap/TapAntiAddiction-Unity.git#3.29.2",
"com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#3.29.2",
"com.taptap.tds.login": "https://github.com/TapTap/TapLogin-Unity.git#3.29.2",
"com.unity.2d.animation": "7.0.6",
"com.unity.2d.pixel-perfect": "5.0.1",
"com.unity.2d.psdimporter": "6.0.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "7.0.5",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "3.7.5",
"com.unity.analytics": "3.6.12",
"com.unity.cinemachine": "2.8.6",
"com.unity.collab-proxy": "1.17.1",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.purchasing": "4.2.1",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.9",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
}
}
Loading

0 comments on commit 1f7aa94

Please sign in to comment.