ZXP 1 éve
szülő
commit
5f5b51dcc8

+ 239 - 0
Assets/Prefabs/SelectPrefab.prefab

@@ -210,6 +210,162 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &2726691555787053063
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5047922067959657570}
+  - component: {fileID: 3377935817573932481}
+  - component: {fileID: 623261883551011891}
+  m_Layer: 5
+  m_Name: Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5047922067959657570
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726691555787053063}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3534683727869037249}
+  - {fileID: 3302031003032592594}
+  m_Father: {fileID: 5943149763234368313}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 2899, y: 55.794617}
+  m_SizeDelta: {x: 566, y: 1401}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3377935817573932481
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726691555787053063}
+  m_CullTransparentMesh: 1
+--- !u!114 &623261883551011891
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726691555787053063}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6cb2cf9b1132ec241b49219ff53a8c7f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3162679140897421636
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3534683727869037249}
+  - component: {fileID: 8335293495787179565}
+  - component: {fileID: 8616888099124879587}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3534683727869037249
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3162679140897421636}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5047922067959657570}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.000030518, y: -93.49}
+  m_SizeDelta: {x: 566, y: 187}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8335293495787179565
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3162679140897421636}
+  m_CullTransparentMesh: 1
+--- !u!114 &8616888099124879587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3162679140897421636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 56
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 57
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BF9\u9519\u5224\u8BFB"
 --- !u!1 &3598049237769983302
 GameObject:
   m_ObjectHideFlags: 0
@@ -610,6 +766,7 @@ RectTransform:
   - {fileID: 7292299762948857128}
   - {fileID: 3452663630765219810}
   - {fileID: 9161303790801863530}
+  - {fileID: 5047922067959657570}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -675,6 +832,7 @@ MonoBehaviour:
   - "\u4F4E\u7EA7\u8BA4\u77E5\u63D0\u95EE"
   answers: 0001
   textActive: 0
+  upData: 0
   answerParent: {fileID: 5943149763872498518}
   answerPrefab: {fileID: 9166703818729814927, guid: 9bd35f25831011446acc8faf8a09f3eb, type: 3}
   selectButton: {fileID: 5943149762659415359}
@@ -683,6 +841,7 @@ MonoBehaviour:
   falseText1: {fileID: 6674884602338548330}
   trueText2: {fileID: 8202470091603290958}
   falseText2: {fileID: 8916313156189303569}
+  tipsText: {fileID: 3468576293183454263}
 --- !u!114 &8300432721581713372
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -807,6 +966,7 @@ MonoBehaviour:
   animator: {fileID: 0}
   modelActive: 1
   animatonPlay: 1
+  modelEndActive: 1
 --- !u!1 &5943149763324754592
 GameObject:
   m_ObjectHideFlags: 0
@@ -1595,6 +1755,85 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1 &9030573033444333170
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3302031003032592594}
+  - component: {fileID: 2950186172854792603}
+  - component: {fileID: 3468576293183454263}
+  m_Layer: 5
+  m_Name: AnswerParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3302031003032592594
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9030573033444333170}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5047922067959657570}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.000043869, y: -77}
+  m_SizeDelta: {x: 422.9146, y: 1042.2976}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2950186172854792603
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9030573033444333170}
+  m_CullTransparentMesh: 1
+--- !u!114 &3468576293183454263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9030573033444333170}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 120
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 158
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 123214
 --- !u!1 &9205319816540010534
 GameObject:
   m_ObjectHideFlags: 0

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 818 - 123
Assets/Scenes/Main.unity


+ 7 - 2
Assets/Scripts/Login.cs

@@ -24,6 +24,8 @@ public class Login : SingletonBaseMono<Login>
     /// ÍÆ¼ö¿Î³Ì
     /// </summary>
     private string firseState;
+
+    private Action<string> sendListCallBack;
     void Start()
     {
 
@@ -38,8 +40,9 @@ public class Login : SingletonBaseMono<Login>
     /// <summary>
     /// ·¢Ëͳɼ¨
     /// </summary>
-    public void SendList(ArrayData arrayData)
+    public void SendList(ArrayData arrayData, Action<string> sendListCallBack)
     {
+        this.sendListCallBack = sendListCallBack;
         List<ArrayData> arrays = new List<ArrayData>();
         arrays.Add(arrayData);
         string jsonValue = JsonConvert.SerializeObject(arrays);
@@ -54,6 +57,8 @@ public class Login : SingletonBaseMono<Login>
         UnityWebRequest unityWebRequest = UnityWebRequest.Post("http://gdsyzxlwxx.dds-ai.cn/jxpc-server/third-api/vr/api/save-train-result", form);
         yield return unityWebRequest.SendWebRequest();
         Debug.Log(unityWebRequest.downloadHandler.text);
+        sendListCallBack?.Invoke(unityWebRequest.downloadHandler.text);
+
     }
     public void InputPhoneNumber(string phoneNumber)
     {
@@ -103,7 +108,7 @@ public class Login : SingletonBaseMono<Login>
     {
         Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
         keyValuePairs.Add("clientId", id);
-        keyValuePairs.Add("expiresTime", (DateTime.UtcNow.Ticks - Jan1st1970Ms) / 10000 + 100000);
+        keyValuePairs.Add("expiresTime", (DateTime.UtcNow.Ticks - Jan1st1970Ms) / 10000 + 200000);
         Debug.Log(keyValuePairs["expiresTime"]);
         string jsonString = JsonConvert.SerializeObject(keyValuePairs);
         string base64 = Convert.ToBase64String(Encoding.UTF8.GetBytes(jsonString));

+ 4 - 0
Assets/Scripts/PlayList.cs

@@ -126,4 +126,8 @@ public class QuestionData
     /// </summary>
     public string selectIndex;
     public bool isRight;
+    /// <summary>
+    /// ÊÇ·ñÐèÒªÉÏ´«
+    /// </summary>
+    public bool isUpData;
 }

+ 38 - 4
Assets/Scripts/SelectPrefab.cs

@@ -18,7 +18,8 @@ public class SelectPrefab : MonoBehaviour
     public bool[] answers;
     [Header("是否显示认知提问对话框")]
     public bool textActive;
-
+    [Header("是否上传该题目数据")]
+    public bool upData;
     [Header(" ")]
     public Transform answerParent;
     public Toggle answerPrefab;
@@ -41,7 +42,10 @@ public class SelectPrefab : MonoBehaviour
     /// </summary>
     public GameObject trueText2;
     public GameObject falseText2;
-
+    /// <summary>
+    /// 练习题目答题提示
+    /// </summary>
+    public Text tipsText;
 
 
     /// <summary>
@@ -68,6 +72,7 @@ public class SelectPrefab : MonoBehaviour
     private void OnEnable()
     {
         text.gameObject.SetActive(true);
+        tipsText.transform.parent.gameObject.SetActive(false);
     }
     private void Start()
     {
@@ -110,10 +115,11 @@ public class SelectPrefab : MonoBehaviour
     /// </summary>
     private void SelectButtonOnClick()
     {
-        text.gameObject.SetActive(false);
+
         audioSource.enabled = false;
         if (textActive)
         {
+            text.gameObject.SetActive(false);
             closeButton.gameObject.SetActive(true);
             if (answers[0])
             {
@@ -140,7 +146,34 @@ public class SelectPrefab : MonoBehaviour
         }
         else
         {
-            closeButton.gameObject.SetActive(true);
+            if (upData)
+            {
+                CloseButtonOnClick();
+            }
+            else
+            {
+                closeButton.gameObject.SetActive(true);
+
+                if (isRight)
+                {
+                    tipsText.text = "答案正确";
+                }
+                else
+                {
+                    string d = "";
+                    for (int i = 0; i < answerTexts.Length; i++)
+                    {
+                        if (answers[i])
+                        {
+                            d += answerTexts[i];
+                        }
+                    }
+                    tipsText.text = $"答案错误,正确答案为{d}选项";
+                }
+
+                tipsText.transform.parent.gameObject.SetActive(true);
+            }
+
             //selectCallBack?.Invoke(isRight);
         }
 
@@ -166,6 +199,7 @@ public class SelectPrefab : MonoBehaviour
         }
 
         questionData.isRight = isRight;
+        questionData.isUpData = upData;
         selectCallBack?.Invoke(questionData);
     }
     /// <summary>

+ 39 - 19
Assets/UpData.cs

@@ -1,3 +1,4 @@
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -10,6 +11,10 @@ public class UpData : MonoBehaviour
     public Transform showParent;
     private List<GameObject> createGameObjects;
     private ArrayData arrayData;
+
+    public GameObject t1;
+    public GameObject t2;
+
     void Start()
     {
 
@@ -39,31 +44,46 @@ public class UpData : MonoBehaviour
         arrayData.wrongQuestions = new List<WrongQuestionsItem>();
         for (int i = 0; i < saveData.Count; i++)
         {
-            ShowPrefab obj = Instantiate(showPrefab, showParent);
-            obj.text.text = "ÌâºÅ" + i;
-            createGameObjects.Add(showPrefab.gameObject);
-            if (saveData[i].isRight)
-            {
-                obj.falseObject.SetActive(false);
-                obj.trueObject.SetActive(true);
-                arrayData.correctCount += 1;
-            }
-            else
+            if (saveData[i].isUpData)
             {
-                obj.falseObject.SetActive(true);
-                obj.trueObject.SetActive(false);
-                WrongQuestionsItem item = new WrongQuestionsItem();
-                item.questionId = i.ToString();
-                item.userWrongOption = saveData[i].selectIndex;
-                arrayData.wrongQuestions.Add(item);
-                arrayData.wrongCount += 1;
+                ShowPrefab obj = Instantiate(showPrefab, showParent);
+                obj.text.text = "ÌâºÅ" + i;
+                createGameObjects.Add(showPrefab.gameObject);
+                if (saveData[i].isRight)
+                {
+                    obj.falseObject.SetActive(false);
+                    obj.trueObject.SetActive(true);
+                    arrayData.correctCount += 1;
+                }
+                else
+                {
+                    obj.falseObject.SetActive(true);
+                    obj.trueObject.SetActive(false);
+                    WrongQuestionsItem item = new WrongQuestionsItem();
+                    item.questionId = i.ToString();
+                    item.userWrongOption = saveData[i].selectIndex;
+                    arrayData.wrongQuestions.Add(item);
+                    arrayData.wrongCount += 1;
+                }
             }
 
-
+        }
+    }
+    public void CallBack(string value)
+    {
+        JObject keyValuePairs = JObject.Parse(value);
+        string code = keyValuePairs["code"].ToString();
+        if (code == "200")
+        {
+            t2.SetActive(true);
+        }
+        else
+        {
+            t1.SetActive(true);
         }
     }
     public void StartUpDate()
     {
-        Login.Instance.SendList(arrayData);
+        Login.Instance.SendList(arrayData, CallBack);
     }
 }

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott

粤ICP备19079148号