Commit 3ca4f7ee authored by 潘梓豪's avatar 潘梓豪

更新

parent 449ed984
...@@ -2,7 +2,6 @@ using System.Collections; ...@@ -2,7 +2,6 @@ using System.Collections;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine; using UnityEngine;
using TMPro; using TMPro;
using System.IO;
using LitJson; using LitJson;
using System; using System;
...@@ -40,14 +39,14 @@ public class LoginManager : MonoBehaviour ...@@ -40,14 +39,14 @@ public class LoginManager : MonoBehaviour
private void Awake() private void Awake()
{ {
OnReceiveMsg.AddListener(_getData); OnReceiveMsg.AddListener(_getData);
StartCoroutine(GetJson()); //StartCoroutine(GetJson());
} }
private void Start() private void Start()
{ {
StartCoroutine(GetPositionData()); //StartCoroutine(GetPositionData());
StartCoroutine(FaultInformation()); //StartCoroutine(FaultInformation());
StartCoroutine(GetThreeModelSensorData()); //StartCoroutine(GetThreeModelSensorData());
} }
public void StartLogin() public void StartLogin()
...@@ -272,7 +271,7 @@ public class LoginManager : MonoBehaviour ...@@ -272,7 +271,7 @@ public class LoginManager : MonoBehaviour
{ {
try try
{ {
inputFieldData = JsonUtility.FromJson<InputFieldData>(rq.downloadHandler.text); inputFieldData = JsonMapper.ToObject<InputFieldData>(rq.downloadHandler.text);
if (IsLine1) if (IsLine1)
{ {
productionlineID.text = inputFieldData.productionlineID1; productionlineID.text = inputFieldData.productionlineID1;
......
...@@ -172,9 +172,9 @@ ...@@ -172,9 +172,9 @@
symbolsUrl: buildUrl + "/{{{ SYMBOLS_FILENAME }}}", symbolsUrl: buildUrl + "/{{{ SYMBOLS_FILENAME }}}",
#endif #endif
streamingAssetsUrl: "StreamingAssets", streamingAssetsUrl: "StreamingAssets",
companyName: {{{ JSON.stringify(COMPANY_NAME) }}}, companyName: JSON.stringify({{{ COMPANY_NAME }}}).replace(/^"(.*)"$/,'$1'),
productName: {{{ JSON.stringify(PRODUCT_NAME) }}}, productName: JSON.stringify({{{ PRODUCT_NAME }}}).replace(/^"(.*)"$/,'$1'),
productVersion: {{{ JSON.stringify(PRODUCT_VERSION) }}}, productVersion: JSON.stringify({{{ PRODUCT_VERSION }}}).replace(/^"(.*)"$/,'$1'),
showBanner: unityShowBanner, showBanner: unityShowBanner,
}; };
......
...@@ -653,7 +653,7 @@ PlayerSettings: ...@@ -653,7 +653,7 @@ PlayerSettings:
webGLDebugSymbols: 0 webGLDebugSymbols: 0
webGLEmscriptenArgs: webGLEmscriptenArgs:
webGLModulesDirectory: webGLModulesDirectory:
webGLTemplate: APPLICATION:Default webGLTemplate: PROJECT:ZeusWebGL
webGLAnalyzeBuildSize: 0 webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0 webGLUseEmbeddedResources: 0
webGLCompressionFormat: 2 webGLCompressionFormat: 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment