From 2ae75e1664089d9e7680a14cc812b68f6b2e6294 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Wed, 9 Apr 2025 15:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9web=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LYTWebGL.meta} | 3 +- .../LYTWebGL/RSA.txt} | 0 Assets/Resources/LYTWebGL/RSA.txt.meta | 7 ++++ Assets/Scripts/UI/UIScore.cs | 2 +- Assets/WebPlatform/LaiYiTe/LYTWebGLHelper.cs | 42 ++++++++++++------- Assets/WebPlatform/WebTest.cs | 23 ++++++++++ Assets/WebPlatform/WebTest.cs.meta | 11 +++++ 7 files changed, 71 insertions(+), 17 deletions(-) rename Assets/{WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta => Resources/LYTWebGL.meta} (67%) rename Assets/{WebPlatform/LaiYiTe/Resrouces/RSA.Private => Resources/LYTWebGL/RSA.txt} (100%) create mode 100644 Assets/Resources/LYTWebGL/RSA.txt.meta create mode 100644 Assets/WebPlatform/WebTest.cs create mode 100644 Assets/WebPlatform/WebTest.cs.meta diff --git a/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta b/Assets/Resources/LYTWebGL.meta similarity index 67% rename from Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta rename to Assets/Resources/LYTWebGL.meta index 288425aa..bc2681ad 100644 --- a/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private.meta +++ b/Assets/Resources/LYTWebGL.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 72fe0ae24cde45946914fa10b54896b0 +guid: d0622dae4bc2b2a4d937ad88a765e87a +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private b/Assets/Resources/LYTWebGL/RSA.txt similarity index 100% rename from Assets/WebPlatform/LaiYiTe/Resrouces/RSA.Private rename to Assets/Resources/LYTWebGL/RSA.txt diff --git a/Assets/Resources/LYTWebGL/RSA.txt.meta b/Assets/Resources/LYTWebGL/RSA.txt.meta new file mode 100644 index 00000000..4c11c38c --- /dev/null +++ b/Assets/Resources/LYTWebGL/RSA.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fa05fa85bd33f6c4ca626c1e0317d53d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/UIScore.cs b/Assets/Scripts/UI/UIScore.cs index 69eb0643..25e192ed 100644 --- a/Assets/Scripts/UI/UIScore.cs +++ b/Assets/Scripts/UI/UIScore.cs @@ -121,7 +121,7 @@ namespace QFramework.Example sum += float.Parse(item.Value.sum); score += item.Value.value; stepNames.Add(item.Value.step + item.Value.name); - maxScore.Add(int.Parse(item.Value.sum)); + maxScore.Add((int)float.Parse(item.Value.sum)); scores.Add((int)item.Value.value); } } diff --git a/Assets/WebPlatform/LaiYiTe/LYTWebGLHelper.cs b/Assets/WebPlatform/LaiYiTe/LYTWebGLHelper.cs index 1cd7c801..3f82b5fd 100644 --- a/Assets/WebPlatform/LaiYiTe/LYTWebGLHelper.cs +++ b/Assets/WebPlatform/LaiYiTe/LYTWebGLHelper.cs @@ -11,21 +11,22 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.Networking; -public class LYTWebGLHelper : Singleton +public class LYTWebGLHelper : MonoSingleton { private LYTWebGLHelper() { } public class LabData { public string GUID; public string ExpID; - public string HOST; + public string HOST = string.Empty; public string PARA1; public string PARA; public string PARA2; } +#if UNITY_WEBGL [DllImport("__Internal")] private static extern string GetURLParameter(string name); - +#endif string token = string.Empty; LabData labData = new LabData(); @@ -35,19 +36,27 @@ public class LYTWebGLHelper : Singleton public string uploadUrl; + private void Awake() + { + Init(); + } public void Init() { +#if UNITY_WEBGL&&!UNITY_EDITOR token = GetURLParameter("token").Replace("%2B", "+"); - RSA = Resources.Load("RSA"); - string urlData = Decrypt(token); - var datas = urlData.Split("&"); - labData.GUID = datas[0]; - labData.ExpID = datas[1]; - labData.HOST = datas[2]; - labData.PARA1 = datas[3]; - labData.PARA = datas[4]; - labData.PARA2 = datas[5]; - +#endif + RSA = Resources.Load("LYTWebGL/RSA"); + if (string.IsNullOrEmpty(token) == false) + { + string urlData = Decrypt(token); + var datas = urlData.Split("&"); + labData.GUID = datas[0]; + labData.ExpID = datas[1]; + labData.HOST = datas[2]; + labData.PARA1 = datas[3]; + labData.PARA = datas[4]; + labData.PARA2 = datas[5]; + } uploadUrl = Path.Combine(labData.HOST, "host/public/Exp/AddScore/"); } /// @@ -87,7 +96,9 @@ public class LYTWebGLHelper : Singleton { var data = new UploadData(); data.GUID = labData.GUID; - data.ExpID = int.Parse(labData.ExpID); + int expId = 0; + int.TryParse(labData.ExpID, out expId); + data.ExpID = expId; data.score = totalScore; data.flag = true; @@ -101,7 +112,7 @@ public class LYTWebGLHelper : Singleton } data.ExpStepVTwoList = list.ToArray(); - SendScore(JsonConvert.SerializeObject(data)); + StartCoroutine(SendScore(JsonConvert.SerializeObject(data))); } IEnumerator SendScore(string json, UnityAction action = null) @@ -122,6 +133,7 @@ public class LYTWebGLHelper : Singleton if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError) { + Debug.LogError($"Upload failed: {request.uri}"); Debug.LogError($"Upload failed: {request.error}"); Debug.LogError($"Response Code: {request.responseCode}"); } diff --git a/Assets/WebPlatform/WebTest.cs b/Assets/WebPlatform/WebTest.cs new file mode 100644 index 00000000..9e5a181e --- /dev/null +++ b/Assets/WebPlatform/WebTest.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WebTest : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + List stepNames = new List() { "һ", "ڶ", "" }; + List maxScore = new List() { 10, 20, 30 }; + List score = new List() { 5, 10, 15 }; + LYTWebGLHelper.Instance.UpLoadData(60, stepNames, maxScore, score); + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/WebPlatform/WebTest.cs.meta b/Assets/WebPlatform/WebTest.cs.meta new file mode 100644 index 00000000..86bcbfe0 --- /dev/null +++ b/Assets/WebPlatform/WebTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 08f51ad357b70604492d4c3e95ce1e27 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: