| Assets/Prefabs/UI/PlacementTileMobile.prefab | ●●●●● patch | view | raw | blame | history | |
| Assets/Scenes/LoadingScene.unity | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/GameSdk/BaseSdk.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/GameSdk/SDKCallBack.cs | ●●●●● patch | view | raw | blame | history | |
| Assets/Scripts/GameSdk/SDK_PC.cs | ●●●●● patch | view | raw | blame | history |
Assets/Prefabs/UI/PlacementTileMobile.prefab
@@ -34,6 +34,7 @@ - {fileID: 7663500724507464268} - {fileID: 7028420458808586989} - {fileID: 3619991940650253911} - {fileID: 4800866152402141593} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -254,7 +255,7 @@ m_GameObject: {fileID: 6911264303789898319} m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} m_LocalPosition: {x: 0, y: 0, z: 0.0785} m_LocalScale: {x: 1, y: 0.73, z: 1} m_LocalScale: {x: 1.2501, y: 0.913376, z: 1} m_Children: [] m_Father: {fileID: 4376446327882660} m_RootOrder: 1 @@ -308,6 +309,81 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6911264303789898319} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &3528288008446799815 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4376446327882660} m_Modifications: - target: {fileID: 7653521490706703376, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_Name value: 1028Effect_tishikuang_01 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - target: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f8f8871ead832445a20709c09832794, type: 3} --- !u!4 &4800866152402141593 stripped Transform: m_CorrespondingSourceObject: {fileID: 8239024443936845406, guid: 2f8f8871ead832445a20709c09832794, type: 3} m_PrefabInstance: {fileID: 3528288008446799815} m_PrefabAsset: {fileID: 0} --- !u!1001 &4874592655082232827 PrefabInstance: m_ObjectHideFlags: 0 Assets/Scenes/LoadingScene.unity
@@ -691,6 +691,50 @@ m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1037195905 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1037195907} - component: {fileID: 1037195906} m_Layer: 0 m_Name: SDKCallBack m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &1037195906 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037195905} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0639fa72bc8665d4faaed2dfea0c467b, type: 3} m_Name: m_EditorClassIdentifier: list_callBackName: [] --- !u!4 &1037195907 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037195905} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 523.2839, y: 426.2466, z: -525.2014} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1234802519 GameObject: m_ObjectHideFlags: 0 Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -22,7 +22,6 @@ private Text versionTxt;//版本号 private Text resVersion;//资源版本号 float waitTime;//切换场景等待时间 // Start is called before the first frame update @@ -54,22 +53,8 @@ //transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn); if (Application.platform == RuntimePlatform.Android) { //GetetDeviceIMEI();//获取安卓手机IMEI imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID } else if (Application.platform == RuntimePlatform.WindowsEditor) { imei0 = "MyTestGemBattle123"; } GameConfig.PlayerName = imei0; versionTxt.text = "版本号：" + Application.version; //resVersion.text 暂时没有使用 transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0; if (!GameConfig.isFirstStart)//后续直接加载 @@ -82,19 +67,29 @@ { waitTime = 0f; //第一次启动，初始化并且埋点 if (!GameConfig.useSDK) { TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString()); TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数 } //TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString()); //TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数 } } /// <summary> /// 开始游戏 /// </summary> void loginNext() { //if (Application.platform == RuntimePlatform.Android) //{ // //GetetDeviceIMEI();//获取安卓手机IMEI // imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID //} //else if (Application.platform == RuntimePlatform.WindowsEditor) //{ // imei0 = "MyTestGemBattle123"; //} GameConfig.PlayerName = SDKManager.ins.sdk.uid; versionTxt.text = "版本号：" + Application.version; //resVersion.text 暂时没有使用 transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + SDKManager.ins.sdk.uid; progressSlider.gameObject.SetActive(true); startBtn.gameObject.SetActive(false); @@ -105,16 +100,24 @@ StartCoroutine(loginMy()); } float waitTime; // private void OnEnable() // { // SocketEvent.Ins.Add<IMessage>((int)Opcode.LoginS2C, LoginS2C); // } // private void OnDestroy() // { // SocketEvent.Ins.Remove<IMessage>((int)Opcode.LoginS2C, LoginS2C); // } #region 获得安卓手机上的IMEI号 public string imei0 = ""; public string imei1 = ""; public string meid = ""; /// <summary> /// 已弃用 /// </summary> void GetetDeviceIMEI() { var unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"); @@ -142,17 +145,17 @@ if (!isLogining) { // CoderM: 在这里要使用SDK来进行登录了 if (GameConfig.useSDK) { //设置login的回调 SDKCallBack.ins.setNextAction("login", loginNext); SDKManager.ins.sdk.login(); } else { //没有使用SDK loginNext(); } SDKCallBack.ins.setNextAction("login", loginNext); SDKManager.ins.sdk.login(); //progressSlider.gameObject.SetActive(true); //startBtn.gameObject.SetActive(false); //AudioSourceManager.Ins.Play(AudioEnum.UI); //TDAA_SDKManager.Ins.Statistics(2);//埋点 //GameConfig.isFirstStart = false; //StartCoroutine(loginMy()); } else { Assets/Scripts/GameSdk/BaseSdk.cs
@@ -2,6 +2,7 @@ { public class BaseSdk { public string uid = ""; public virtual void changeAccount() { throw new System.NotImplementedException(); Assets/Scripts/GameSdk/SDKCallBack.cs
@@ -13,6 +13,7 @@ public void Awake() { DontDestroyOnLoad(this); ins = this; SDKManager.ins.sdk.setCallBackClazz("SDKCallBack", "AndroidCallBack"); // 在这里开始初始化SDK @@ -37,11 +38,27 @@ if (data.ContainsKey("action")) { // data.data.openid // { "code":200,"msg":"success","data":{ "is_certify":0,"age":0,"openid":"1000484"} } //{ "action":"login", "data":{ "code":200,"msg":"success","data":{ "is_certify":0,"age":0,"openid":"1000485"} } } string act = data["action"].ToString(); Debug.Log(act); if(act == "login") { LoginResult(act); JsonData loginData = data["data"]; if ((int)loginData["code"] == 200) { string uid = loginData["data"]["openid"].ToString(); SDKManager.ins.sdk.uid = (string)uid; LoginResult(act); } else { // 登录失败则直接重新拉起 SDKManager.ins.sdk.login(); } } }
@@ -32,7 +32,7 @@ public override void login() { Debug.Log("模拟PC登录游戏"); SDKCallBack.ins.AndroidCallBack("{\"action\":\"login\"}"); SDKCallBack.ins.AndroidCallBack("{\"action\":\"login\",\"data\":{ \"code\":200,\"msg\":\"success\",\"data\":{ \"is_certify\":0,\"age\":0,\"openid\":\"1000484\"} }}"); } public override void logout()
