From 5ad15def0b0cd852a3aac835135af101122db7f6 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Mon, 14 Dec 2020 16:25:54 +0800
Subject: [PATCH] 设置SDK打开 设置GameConfig.Imei = SDKManager.ins.sdk.uid
---
Assets/Scripts/Common/GameConfig.cs | 2
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | 75 ++++++++++----
Assets/Scripts/GameSdk/SDKCallBack.cs | 14 ++
Assets/UI/icon_shu_512.png | 0
Assets/Scripts/UI/FinalPanel/FinalHttp.cs | 3
ProjectSettings/ProjectSettings.asset | 78 ++++++++-------
Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs | 4
Assets/Scripts/Guide/GuideCtrl.cs | 1
Assets/UI/icon_shu_512.png.meta | 118 +++++++++++++++++++++++
9 files changed, 234 insertions(+), 61 deletions(-)
diff --git a/Assets/Scripts/Common/GameConfig.cs b/Assets/Scripts/Common/GameConfig.cs
index 2ae3096..f9e9443 100644
--- a/Assets/Scripts/Common/GameConfig.cs
+++ b/Assets/Scripts/Common/GameConfig.cs
@@ -15,7 +15,7 @@
public static string NextSceneName = "Endless2D";
// public static string NextSceneName = "Endless";
- public static bool useSDK = false;
+ public static bool useSDK = true;
public static string Imei;
public static bool isFirstStart = true;
diff --git a/Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs b/Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs
index b66b5a8..9c35774 100644
--- a/Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs
@@ -105,7 +105,7 @@
//注册
public void OnRegister()
{
- TalkingDataPlugin.OnRegister(GetDeviceId(), TalkingDataAccountType.ANONYMOUS, "testwgname");
+ TalkingDataPlugin.OnRegister(GameConfig.Imei, TalkingDataAccountType.ANONYMOUS, GameConfig.Imei);
}
/// <summary>
@@ -113,7 +113,7 @@
/// </summary>
public void Login()
{
- TalkingDataPlugin.OnLogin(GetDeviceId(), TalkingDataAccountType.ANONYMOUS, "testwgname");
+ TalkingDataPlugin.OnLogin(GameConfig.Imei, TalkingDataAccountType.ANONYMOUS, GameConfig.Imei);
}
/*
diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index 8e577d7..fd9d0ba 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -60,23 +60,24 @@
//transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
-
- if (Application.platform == RuntimePlatform.Android)
+ if (!GameConfig.useSDK)
{
- //GetetDeviceIMEI();//获取安卓手机IMEI
- imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
- }
- else if (Application.platform == RuntimePlatform.WindowsEditor)
- {
- imei0 = "MyTestGemBattle123";
- }
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ //GetetDeviceIMEI();//获取安卓手机IMEI
+ imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
+ }
+ else if (Application.platform == RuntimePlatform.WindowsEditor)
+ {
+ imei0 = "MyTestGemBattle123";
+ }
- GameConfig.PlayerName = imei0;
+ GameConfig.Imei = imei0;
+ }
versionTxt.text = "版本号：" + Application.version;
//resVersion.text 暂时没有使用
transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
-
if (GameConfig.isFirstStart)
{
@@ -129,6 +130,17 @@
StartCoroutine(loginMy());
}
+ /// <summary>
+ /// 使用SDK登录
+ /// </summary>
+ void SDKloginNext()
+ {
+ Debug.Log("SDK登录,修改Imei");
+ GameConfig.Imei = SDKManager.ins.sdk.uid;
+ transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + GameConfig.Imei;
+
+ loginNext();
+ }
#region 获得安卓手机上的IMEI号
@@ -155,9 +167,12 @@
private void OnClickResetBtn()
{
- Debug.LogError("清空了所有数据");
- PlayerPrefs.DeleteAll();
- TDAA_SDKManager.Ins.Reset();
+ if (!GameConfig.useSDK)
+ {
+ Debug.LogError("清空了所有数据");
+ PlayerPrefs.DeleteAll();
+ TDAA_SDKManager.Ins.Reset();
+ }
}
@@ -165,18 +180,36 @@
{
if (!isLogining)
{
- // CoderM: 在这里要使用SDK来进行登录了
- if (GameConfig.useSDK)
+ isLogining = true;
+ if (GameConfig.isFirstStart)
{
- //设置login的回调
- SDKCallBack.ins.setNextAction("login", loginNext);
- SDKManager.ins.sdk.login();
+ // CoderM: 在这里要使用SDK来进行登录了
+ if (GameConfig.useSDK)
+ {
+ Debug.Log("使用SDK来进行登录了");
+ //设置login的回调
+ SDKCallBack.ins.setNextAction("login", SDKloginNext);
+ SDKManager.ins.sdk.login();
+ }
+ else
+ {
+ Debug.Log("没有使用SDK");
+
+ //没有使用SDK
+ loginNext();
+ }
}
else
{
- //没有使用SDK
- loginNext();
+ Debug.Log("重玩");
+ progressSlider.gameObject.SetActive(true);
+ startBtn.gameObject.SetActive(false);
+
+ AudioSourceManager.Ins.Play(AudioEnum.UI);
+ TDAA_SDKManager.Ins.OnClickRestartBtn();//重玩
+ StartCoroutine(loginMy());
}
+
}
else
{
diff --git a/Assets/Scripts/GameSdk/SDKCallBack.cs b/Assets/Scripts/GameSdk/SDKCallBack.cs
index e4d6568..94a6383 100644
--- a/Assets/Scripts/GameSdk/SDKCallBack.cs
+++ b/Assets/Scripts/GameSdk/SDKCallBack.cs
@@ -62,6 +62,20 @@
JsonData loginData = data["data"];
if ((int)loginData["code"] == 200)
{
+ if (loginData.ContainsKey("msg"))
+ {
+ string result = loginData["msg"].ToString();
+ if (result.Equals("success"))
+ {
+ Debug.Log("成功了");
+ }
+ else
+ {
+ Debug.Log("失败了");
+
+ }
+ }
+
string uid = loginData["data"]["openid"].ToString();
SDKManager.ins.sdk.uid = (string)uid;
LoginResult(act);
diff --git a/Assets/Scripts/Guide/GuideCtrl.cs b/Assets/Scripts/Guide/GuideCtrl.cs
index a9e54cd..5e767ab 100644
--- a/Assets/Scripts/Guide/GuideCtrl.cs
+++ b/Assets/Scripts/Guide/GuideCtrl.cs
@@ -32,6 +32,7 @@
{
//int step = PlayerPrefs.GetInt("GemBattleGuide");
+ TDAA_SDKManager.Ins.Statistics(5);//埋点
Init(0);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWoodLv2, CreateWoodLv2);
diff --git a/Assets/Scripts/UI/FinalPanel/FinalHttp.cs b/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
index 8d315c4..1a0ab53 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalHttp.cs
@@ -44,7 +44,8 @@
/// <param name="level"></param>
public void SendPost(string nickname, int score, int level, string waveInfo)
{
- LoadImei();
+ if (!GameConfig.useSDK)
+ LoadImei();
Debug.Log("开始Post" + nickname);
string url = "http://9377-big-data.sbk-h5.com:8600/users/addrank";
diff --git a/Assets/UI/icon_shu_512.png b/Assets/UI/icon_shu_512.png
new file mode 100644
index 0000000..bbf32b3
--- /dev/null
+++ b/Assets/UI/icon_shu_512.png
Binary files differ
diff --git a/Assets/UI/icon_shu_512.png.meta b/Assets/UI/icon_shu_512.png.meta
new file mode 100644
index 0000000..67d6bf8
--- /dev/null
+++ b/Assets/UI/icon_shu_512.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 697bd2fa39041aa4380226f620add44a
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index a0ee955..f894be1 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -279,43 +279,13 @@
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
- m_Icon: {fileID: 2800000, guid: 2bf26fded646de94e8b124708c016027, type: 3}
+ m_Icon: {fileID: 2800000, guid: 697bd2fa39041aa4380226f620add44a, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons:
- m_BuildTarget: Android
m_Icons:
- - m_Textures: []
- m_Width: 432
- m_Height: 432
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 324
- m_Height: 324
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 216
- m_Height: 216
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 162
- m_Height: 162
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 108
- m_Height: 108
- m_Kind: 2
- m_SubKind:
- - m_Textures: []
- m_Width: 81
- m_Height: 81
- m_Kind: 2
- m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
@@ -347,31 +317,67 @@
m_Kind: 0
m_SubKind:
- m_Textures: []
+ m_Width: 432
+ m_Height: 432
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 324
+ m_Height: 324
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 216
+ m_Height: 216
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 162
+ m_Height: 162
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 108
+ m_Height: 108
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures: []
+ m_Width: 81
+ m_Height: 81
+ m_Kind: 2
+ m_SubKind:
+ - m_Textures:
+ - {fileID: 0}
m_Width: 192
m_Height: 192
m_Kind: 1
m_SubKind:
- - m_Textures: []
+ - m_Textures:
+ - {fileID: 0}
m_Width: 144
m_Height: 144
m_Kind: 1
m_SubKind:
- - m_Textures: []
+ - m_Textures:
+ - {fileID: 0}
m_Width: 96
m_Height: 96
m_Kind: 1
m_SubKind:
- - m_Textures: []
+ - m_Textures:
+ - {fileID: 0}
m_Width: 72
m_Height: 72
m_Kind: 1
m_SubKind:
- - m_Textures: []
+ - m_Textures:
+ - {fileID: 0}
m_Width: 48
m_Height: 48
m_Kind: 1
m_SubKind:
- - m_Textures: []
+ - m_Textures:
+ - {fileID: 0}
m_Width: 36
m_Height: 36
m_Kind: 1
--
Gitblit v1.9.1