Merge branch 'main' of ssh://n.samien.cn:10022/Zxp/PICO_VR

Assets/Scenes/Main.unity

@@ -2289,7 +2289,6 @@ GameObject:
   - component: {fileID: 533917026}
   - component: {fileID: 533917029}
   - component: {fileID: 533917028}
-  - component: {fileID: 533917027}
   m_Layer: 5
   m_Name: Help
   m_TagString: Untagged
@@ -2318,23 +2317,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &533917027
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 533917025}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0bb5e4d934d798343a34c26749cec382, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  loginGameObject: {fileID: 0}
-  tj1: {fileID: 0}
-  tj2: {fileID: 0}
-  id: 
-  key: 
 --- !u!114 &533917028
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2689,18 +2671,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 5374442943955902139}
-        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: 0
-        m_CallState: 2
       - m_Target: {fileID: 1673634204}
         m_TargetAssemblyTypeName: UpData, Assembly-CSharp
         m_MethodName: StartUpDate
@@ -3246,6 +3216,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1673634202}
+        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
 --- !u!114 &744930735
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5242,7 +5224,6 @@ GameObject:
   - component: {fileID: 1769636558}
   - component: {fileID: 1769636561}
   - component: {fileID: 1769636560}
-  - component: {fileID: 1769636559}
   m_Layer: 5
   m_Name: Help
   m_TagString: Untagged
@@ -5271,23 +5252,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1769636559
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1769636557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0bb5e4d934d798343a34c26749cec382, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  loginGameObject: {fileID: 0}
-  tj1: {fileID: 0}
-  tj2: {fileID: 0}
-  id: 
-  key: 
 --- !u!114 &1769636560
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6248,23 +6212,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &1267426224449379286
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6864616657517224061}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0bb5e4d934d798343a34c26749cec382, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  loginGameObject: {fileID: 0}
-  tj1: {fileID: 0}
-  tj2: {fileID: 0}
-  id: 
-  key: 
 --- !u!222 &1437060350621267016
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6872,6 +6819,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -43.24
       objectReference: {fileID: 0}
+    - target: {fileID: 3070781098541185147, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1769.21
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070781098541185147, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -196
+      objectReference: {fileID: 0}
+    - target: {fileID: 3070781098541185147, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3815411491395628664, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 129
@@ -7044,6 +7003,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4400771669887348958, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4400771669929847808, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.9
@@ -7839,6 +7802,10 @@ PrefabInstance:
       propertyPath: animator
       value: 
       objectReference: {fileID: 1352205745}
+    - target: {fileID: 7716555740142952300, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
+      propertyPath: modelEndActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7783640314403166192, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 129
@@ -12924,7 +12891,6 @@ GameObject:
   - component: {fileID: 420628105223965114}
   - component: {fileID: 2887623186718275935}
   - component: {fileID: 3170216226395077973}
-  - component: {fileID: 1267426224449379286}
   m_Layer: 5
   m_Name: Help
   m_TagString: Untagged

Assets/Scripts/Login.cs

@@ -34,7 +34,7 @@ public class Login : SingletonBaseMono<Login>
     // Update is called once per frame
     void Update()
     {
-
+        //Debug.Log(phoneNumber);
     }
 
     /// <summary>
@@ -50,6 +50,7 @@ public class Login : SingletonBaseMono<Login>
     }
     public IEnumerator SendListCoroutine(string jsonValue)
     {
+        Debug.Log(phoneNumber);
         WWWForm form = new WWWForm();
         form.AddField("terminal-token", GetToken());
         form.AddField("phoneNumber", phoneNumber);
@@ -70,6 +71,7 @@ public class Login : SingletonBaseMono<Login>
     }
     public IEnumerator GetListCoroutine()
     {
+        Debug.Log(phoneNumber);
         WWWForm form = new WWWForm();
         form.AddField("terminal-token", GetToken());
         form.AddField("phoneNumber", phoneNumber);

Assets/UpData.cs

@@ -89,6 +89,7 @@ public class UpData : MonoBehaviour
     {
         JObject keyValuePairs = JObject.Parse(value);
         string code = keyValuePairs["code"].ToString();
+        Debug.Log(code);
         if (code == "200")
         {
             t2.SetActive(true);