diff --git a/GQ_TongXin/Assets/Scenes/SampleScene.unity b/GQ_TongXin/Assets/Scenes/SampleScene.unity index a1a9bb8ea..7e44d2e78 100644 --- a/GQ_TongXin/Assets/Scenes/SampleScene.unity +++ b/GQ_TongXin/Assets/Scenes/SampleScene.unity @@ -34194,7 +34194,7 @@ MonoBehaviour: gj_cx: gzp_cx: jxp_cx: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTIyNzA4NzgsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.tQ5sDtgG2SEcmMnTWOTcDeaxVo6DvQ_vkWT2bUMNIrY + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTIyOTcxMjAsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.nKW_O591jxA82BAkwZay_lKGi68cloW3D37iECW1bIY Cabinet_quYu: - {fileID: 0} - {fileID: 0} @@ -108644,7 +108644,7 @@ MonoBehaviour: - m_Target: {fileID: 3383533714502894980} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive - m_Mode: 6 + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -116739,18 +116739,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 1815567663} m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_MethodName: DoorCondition @@ -120755,7 +120743,7 @@ MonoBehaviour: - m_Target: {fileID: 3383533716176679773} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive - m_Mode: 6 + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -123220,7 +123208,7 @@ MonoBehaviour: - m_Target: {fileID: 3383533715280232959} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive - m_Mode: 6 + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -134527,18 +134515,6 @@ MonoBehaviour: - m_Target: {fileID: 3383533714502894980} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 7258734484910944914} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -136345,18 +136321,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 3383533714502894980} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 0} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive m_Mode: 0 @@ -138339,7 +138303,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -64, y: 487} + m_AnchoredPosition: {x: -63.99994, y: 487} m_SizeDelta: {x: -1303.1125, y: -1040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3383533715949184758 @@ -144781,7 +144745,7 @@ MonoBehaviour: - m_Target: {fileID: 3383533714502894980} m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_MethodName: SetActive - m_Mode: 6 + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/GQ_TongXin/Assets/script/GameManager.cs b/GQ_TongXin/Assets/script/GameManager.cs index de6c1edcc..9a6b695be 100644 --- a/GQ_TongXin/Assets/script/GameManager.cs +++ b/GQ_TongXin/Assets/script/GameManager.cs @@ -641,9 +641,9 @@ public class GameManager : MonoBehaviour root_AllPort = JsonConvert.DeserializeObject(jsonResult1); - var jsonResult2 = await CombineJSON.GetJson_POST(Jk_URL.hj_cx, token); + //var jsonResult2 = await CombineJSON.GetJson_POST(Jk_URL.hj_cx, token); - root_AllENV = JsonConvert.DeserializeObject(jsonResult2); + //root_AllENV = JsonConvert.DeserializeObject(jsonResult2); //return root; } @@ -907,7 +907,7 @@ public class GameManager : MonoBehaviour public webURL() { - string ct = " http://fpt9gx.natappfree.cc/"; + string ct = "http://fpt9gx.natappfree.cc/"; sb_cx = ct + "machineRoom/device/queryList"; sb_xz = ct + "machineRoom/device/save"; sb_sc = ct + "machineRoom/device/delete";