Merge branch 'F/20241012' of ssh://gogs.ghz-tech.com:30979/GHzGlass/wxGameyuexiu into F/20241012

Assets/TaskManager.cs

@@ -64,7 +64,7 @@ public class TaskManager : MonoBehaviour
     public GameObject inputbt;
     private void Awake()
     { 
-       // PlayerPrefs.DeleteAll();21312312
+      PlayerPrefs.DeleteAll();
         StartCoroutine(InitGame());
     }
 
@@ -146,7 +146,7 @@ public class TaskManager : MonoBehaviour
     GameObject hc;
 
     public List<GameObject> items;
-
+    public GameObject rawjingzi;
     private IEnumerator checktaskSence(TaskItem ti)
     {
         if(hc)
@@ -250,6 +250,7 @@ public class TaskManager : MonoBehaviour
                 allimg.GetComponent<Button>().enabled = !ti.isClosebtShow;
 
                 tuodongbg.SetActive(ti.isTuo);
+                rawjingzi.SetActive(ti.isTuo);
                 break;
             case TaskConfig.TaskType.Xiansuo:
                 if (isarinit)

Assets/XXQQ/MyPingTu.cs

@@ -34,23 +34,23 @@ public class MyPingTu : MonoBehaviour
     /// 数组打乱
     /// </summary>
     T[] Shuffle<T>(T[] Array)
-    {
+    {
+        /*
         for (int i = Array.Length-3; i < Array.Length-1; i++)
         {
             T temp = Array[i];
             int randomIndex = i+1;//UnityEngine.Random.Range(Array.Length-2, Array.Length-1);
             Array[i] = Array[randomIndex];
             Array[randomIndex] = temp;
-        }
+        }*/
 
-        /*
         for (int i = 0; i < Array.Length - 1; i++)
         {
             T temp = Array[i];
             int randomIndex = UnityEngine.Random.Range(0, Array.Length-1);
             Array[i] = Array[randomIndex];
             Array[randomIndex] = temp;
-        }*/
+        }
         return Array;
     }
 

Assets/task.asset

@@ -121,7 +121,7 @@ MonoBehaviour:
     bgName: dialogbg
     imgName: dialogbg
     taskcheck: 
-    centerName: task_1
+    centerName: 
     centersize: 1
     perbName: 
     isClose: 0
@@ -169,14 +169,14 @@ MonoBehaviour:
     isTuo: 0
     daojus: []
     isClosebtShow: 0
-    isTextNext: 0
+    isTextNext: 1
     isARSao: 0
     isnongwu: 0
     arid: 2
     chooseItems: []
   - xiansuos: []
     type: 0
-    isNoshow: 1
+    isNoshow: 0
     info: "\u5C31\u5728\u6B64\u65F6\uFF0C\u4F60\u611F\u89C9\u5230\u524D\u65B9\u7684\u7A7A\u6C14\u5FFD\u7136\u5F00\u59CB\u632F\u52A8\u3001\u538B\u7F29\u3001\u7136\u540E\u4F60\u773C\u7741\u7741\u5730\u770B\u7740\u7A7A\u6C14\u91CC\u51FA\u73B0\u4E86\u4E00\u4E2A\u4F60\u4ECE\u672A\u89C1\u8FC7\u7684\u5C0F\u52A8\u7269\u3002"
     info2: 
     bgName: dialogbg
@@ -189,7 +189,7 @@ MonoBehaviour:
     isTuo: 0
     daojus: []
     isClosebtShow: 0
-    isTextNext: 0
+    isTextNext: 1
     isARSao: 0
     isnongwu: 0
     arid: 2
@@ -558,3 +558,23 @@ MonoBehaviour:
     isnongwu: 1
     arid: 2
     chooseItems: []
+  - xiansuos: []
+    type: 0
+    isNoshow: 0
+    info: "\u8FD9\u4E2A\u65E0\u7531\u7684\u5FF5\u5934\u51FA\u73B0\u5728\u4F60\u7684\u8111\u6D77\u4E2D\u3002"
+    info2: 
+    bgName: dialogbg
+    imgName: one_end2
+    taskcheck: 
+    centerName: one_end
+    centersize: 1
+    perbName: 
+    isClose: 1
+    isTuo: 0
+    daojus: []
+    isClosebtShow: 0
+    isTextNext: 0
+    isARSao: 0
+    isnongwu: 0
+    arid: 2
+    chooseItems: []