修复bug-3

Assets/Editor/change.cs

@@ -0,0 +1,178 @@
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+using System.Text;
+
+public class change
+{
+    // 添加一个右键菜单。
+    // % 按下ctrl时显示菜单。（Windows: control, macOS: command）
+    // & 按下alt时显示菜单。(Windows/Linux: alt, macOS: option)
+    // _ 按下shift时显示菜单。(Windows/Linux/macOS: shift)
+    [MenuItem("Assets/脚本改格式：GB2312->UTF8无BOM %g", false, 100)]
+    private static void CustomMenu()
+    {
+            Object[] selectedObjects = Selection.objects;
+            for(int i=0;i<selectedObjects.Length;i++)
+            {
+
+                // 例如: 获取Project视图中选定的对象
+                Object selectedObject = selectedObjects[i];
+                if (selectedObject != null)
+                {
+                    // 获取选定对象的相对路径
+                    string relativeAssetPath = AssetDatabase.GetAssetPath(selectedObject);
+                    // 获取项目根目录路径
+                    string projectPath = Path.GetDirectoryName(Application.dataPath);
+                    // 获取选定对象的绝对路径
+                    string absoluteAssetPath = Path.Combine(projectPath, relativeAssetPath);
+                    // 获取选定对象的文件名（包括后缀）
+                    string fileName = Path.GetFileName(relativeAssetPath);
+
+                    Debug.Log("执行自定义操作: " + selectedObject.name +
+                            ", 相对路径: " + relativeAssetPath +
+                            ", 绝对路径: " + absoluteAssetPath +
+                            ", 文件名: " + fileName);
+
+                    //判断是否是CSharp文件
+                    if (IsCSharpFile(fileName))
+                    {
+                        Debug.Log("这是一个csharp文件");
+                        ChangeFormat(absoluteAssetPath);
+                    }
+                    else
+                    {
+                        Debug.Log("兄弟，这不是一个csharp文件啊~~~~~~~~~~~");
+                    }
+                }
+            }
+    }
+
+    // 如果项目视图中有选中的对象，则启用右键菜单项
+    [MenuItem("Assets/脚本改格式：GB2312->UTF8无BOM %g", true)]
+    private static bool ValidateCustomMenu()
+    {
+        return Selection.activeObject != null;
+    }
+
+    /// <summary>
+    /// 判断该文件是否是CSharp文件
+    /// </summary>
+    /// <param name="fileName"></param>
+    /// <returns></returns>
+    private static bool IsCSharpFile(string fileName)
+    {
+        // 获取文件扩展名（包括点）
+        string fileExtension = Path.GetExtension(fileName);
+
+        // 将扩展名转换为小写并与 ".cs" 进行比较
+        if (fileExtension.ToLower() == ".cs")
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// 文件格式转码：GB2312转成UTF8
+    /// 读取指定的文件，转换成UTF8（无BOM标记）格式后，回写覆盖原文件
+    /// </summary>
+    /// <param name="sourceFilePath">文件路径</param>
+    public static void ChangeFormat(string sourceFilePath)
+    {
+        Encoding ed =GetType(sourceFilePath);
+        
+        if( ed is System.Text.ASCIIEncoding )
+        {
+            ed =Encoding.GetEncoding("GB2312");
+            string fileContent = File.ReadAllText(sourceFilePath, ed);
+            File.WriteAllText(sourceFilePath, fileContent, Encoding.UTF8);
+        }
+        Debug.Log("处理结束！");
+    }
+    public static System.Text.Encoding GetType(string FILE_NAME)
+    {
+        FileStream fs = new FileStream(FILE_NAME, FileMode.Open, FileAccess.Read);
+        Encoding r = GetType(fs);
+        fs.Close();
+        return r;
+    }
+        /// <summary>
+    /// 通过给定的文件流，判断文件的编码类型
+    /// </summary>
+    /// <param name="fs">文件流</param>
+    /// <returns>文件的编码类型</returns>
+    public static System.Text.Encoding GetType(FileStream fs)
+    {
+        byte[] Unicode = new byte[] { 0xFF, 0xFE, 0x41 };
+        byte[] UnicodeBIG = new byte[] { 0xFE, 0xFF, 0x00 };
+        byte[] UTF8 = new byte[] { 0xEF, 0xBB, 0xBF }; //带BOM
+        Encoding reVal = Encoding.Default;
+ 
+        BinaryReader r = new BinaryReader(fs, System.Text.Encoding.Default);
+        int i;
+        int.TryParse(fs.Length.ToString(), out i);
+        byte[] ss = r.ReadBytes(i);
+        if (IsUTF8Bytes(ss) || (ss[0] == 0xEF && ss[1] == 0xBB && ss[2] == 0xBF))
+        {
+            reVal = Encoding.UTF8;
+        }
+        else if (ss[0] == 0xFE && ss[1] == 0xFF && ss[2] == 0x00)
+        {
+            reVal = Encoding.BigEndianUnicode;
+        }
+        else if (ss[0] == 0xFF && ss[1] == 0xFE && ss[2] == 0x41)
+        {
+            reVal = Encoding.Unicode;
+        }
+        r.Close();
+        return reVal;
+ 
+    }
+      /// <summary>
+    /// 判断是否是不带 BOM 的 UTF8 格式
+    /// </summary>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    private static bool IsUTF8Bytes(byte[] data)
+    {
+        int charByteCounter = 1;
+        //计算当前正分析的字符应还有的字节数
+        byte curByte; //当前分析的字节.
+        for (int i = 0; i < data.Length; i++)
+        {
+            curByte = data[i];
+            if (charByteCounter == 1)
+            {
+                if (curByte >= 0x80)
+                {
+                    //判断当前
+                    while (((curByte <<= 1) & 0x80) != 0)
+                    {
+                        charByteCounter++;
+                    }
+                    //标记位首位若为非0 则至少以2个1开始 如:110XXXXX...........1111110X
+                    if (charByteCounter == 1 || charByteCounter > 6)
+                    {
+                        return false;
+                    }
+                }
+            }
+            else
+            {
+                //若是UTF-8 此时第一位必须为1
+                if ((curByte & 0xC0) != 0x80)
+                {
+                    return false;
+                }
+                charByteCounter--;
+            }
+        }
+        if (charByteCounter > 1)
+        {
+           // throw new Exception("非预期的byte格式");
+        }
+        return true;
+    }
+}

Assets/Editor/change.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c040b6937eb394ba592f889d5311ba05
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Login/Login.prefab

@@ -757,8 +757,8 @@ RectTransform:
   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: -27, y: -323.1}
-  m_SizeDelta: {x: 660, y: 204.6}
+  m_AnchoredPosition: {x: -27, y: -345.47943}
+  m_SizeDelta: {x: 660, y: 249.3588}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4792955376945237609
 CanvasRenderer:
@@ -845,7 +845,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7644096570010894456
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1246,7 +1246,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2291749833963476096}
   m_Direction: 0
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.9714286
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1418,7 +1418,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 8421095476062917274}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.6586667
+  m_Size: 0.80786264
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2342,8 +2342,8 @@ RectTransform:
   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: -27, y: 41}
-  m_SizeDelta: {x: 833, y: 402.5}
+  m_AnchoredPosition: {x: -27, y: 23.125}
+  m_SizeDelta: {x: 833, y: 438.25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3918196740892587664
 CanvasRenderer:
@@ -3690,27 +3690,27 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 626701679373348298, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -260
       objectReference: {fileID: 0}
     - target: {fileID: 1613693699635230920, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -3730,27 +3730,27 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 2907167052583204629, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -260
       objectReference: {fileID: 0}
     - target: {fileID: 3066090362970912318, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -3758,27 +3758,27 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 3672126360182014607, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -160
       objectReference: {fileID: 0}
     - target: {fileID: 4008755430146839552, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_Pivot.x
@@ -3866,27 +3866,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 4026525760586375704, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -260
       objectReference: {fileID: 0}
     - target: {fileID: 4128736893314604138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -3894,27 +3894,27 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 4916437562905309502, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -360
       objectReference: {fileID: 0}
     - target: {fileID: 5374938843881361228, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -3930,123 +3930,123 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 6144073829365956575, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -60
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 6339512804318092138, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -60
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 6455093651843846734, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -360
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 7108146915625963492, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -60
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 7715357070110856604, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -160
       objectReference: {fileID: 0}
     - target: {fileID: 7949072245279194524, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_Name
@@ -4058,51 +4058,51 @@ PrefabInstance:
       objectReference: {fileID: 5534962729355408741}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 8683930930848995764, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -360
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 170
       objectReference: {fileID: 0}
     - target: {fileID: 8884725165998707184, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -160
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7ffef9c04ebcf6459d36a38a942db7b, type: 3}

Assets/FrameWork/Login/SmallIconItem.prefab

@@ -115,7 +115,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2484990173723969103}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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_ConstrainProportionsScale: 0
@@ -271,8 +271,8 @@ RectTransform:
   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, y: -60.1}
-  m_SizeDelta: {x: 142.3784, y: 50}
+  m_AnchoredPosition: {x: 0, y: -76.3}
+  m_SizeDelta: {x: 142.3784, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &703594049007751494
 CanvasRenderer:
@@ -302,7 +302,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8089\u8089"
+  m_text: 1234567812345678
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
   m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
@@ -329,8 +329,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 32
+  m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -347,7 +347,7 @@ MonoBehaviour:
   m_charWidthMaxAdj: 0
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
+  m_overflowMode: 1
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1

Assets/FrameWork/Login/UserIcon.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 6496858072940881962}
   - component: {fileID: 1788977070213402945}
   - component: {fileID: 9183120740543960490}
+  - component: {fileID: 6695129912955136519}
   m_Layer: 5
   m_Name: UserIcon
   m_TagString: Untagged
@@ -73,3 +74,15 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!114 &6695129912955136519
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2484990173723969103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9e423d1011b0f43b7983e4d806abd53a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -960,6 +960,7 @@ MonoBehaviour:
   choosePeople: {fileID: 28752726587160762}
   parentGo: {fileID: 8610976162778903711}
   itemList: []
+  isExit: 0
 --- !u!1 &690978120645101105
 GameObject:
   m_ObjectHideFlags: 0
@@ -1135,7 +1136,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3216915827400214009
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1151,9 +1152,9 @@ RectTransform:
   m_Father: {fileID: 3281594166811149028}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 966.13336, y: -28}
   m_SizeDelta: {x: 42.5, y: 56}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2381855711151854591
@@ -5015,7 +5016,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 85, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &4594328452210515319

Assets/FrameWork/ProjectManager/XunJian/标题.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4366765054024803246
 RectTransform:
   m_ObjectHideFlags: 0
@@ -66,7 +66,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
@@ -170,7 +170,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1882.55, y: -112.00006}
+  m_AnchoredPosition: {x: 1817, y: -112.00006}
   m_SizeDelta: {x: 180, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &736642667702780907
@@ -201,7 +201,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
@@ -305,7 +305,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1603.1001, y: -112.00006}
+  m_AnchoredPosition: {x: 1491, y: -112.00006}
   m_SizeDelta: {x: 75, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5046512452350992551
@@ -336,7 +336,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
@@ -513,7 +513,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 504.45, y: -112.00006}
+  m_AnchoredPosition: {x: 551, y: -112.00006}
   m_SizeDelta: {x: 262.8, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3379814920796699839
@@ -544,7 +544,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
@@ -648,7 +648,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1218.65, y: -112.00006}
+  m_AnchoredPosition: {x: 1057, y: -112.00006}
   m_SizeDelta: {x: 180, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &119952052100435493
@@ -679,7 +679,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
@@ -997,7 +997,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1111111111111111
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 87d73d15ccf613c4c8dad6b4c03399f9, type: 2}

Assets/FrameWork/ProjectManager/XunJian/进入任务/进入任务.prefab

@@ -57,13 +57,13 @@ MonoBehaviour:
   VideoBT: {fileID: 5961737187245328613}
   ModelBT: {fileID: 3035996216676226476}
   ImageBT: {fileID: 2526870773437298684}
-  Image2BT: {fileID: 8843594528309396695}
   TextBT: {fileID: 5032695721807427012}
   AllBT: {fileID: 8976767908154181459}
   Video: {fileID: 8690263258676728082}
   Model: {fileID: 2522627176468705619}
   Image: {fileID: 1745053953211840778}
   Image2: {fileID: 5832889701450925646}
+  Image3: {fileID: 6781410932810381399}
   Text: {fileID: 6256073840031086573}
   paizhaoGo: {fileID: 4035001741767503962}
   indexText: {fileID: 6753458009496441128}
@@ -5531,6 +5531,7 @@ RectTransform:
   - {fileID: 4420183677033236063}
   - {fileID: 5511868129926330179}
   - {fileID: 340916537086920711}
+  - {fileID: 744733168888182302}
   - {fileID: 5159099031647131548}
   - {fileID: 8542819322292739457}
   - {fileID: 8014526504965210063}
@@ -6707,7 +6708,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4110988468234863099
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6725,9 +6726,9 @@ RectTransform:
   m_Father: {fileID: 8539070734399644934}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 426.5434, y: -32}
   m_SizeDelta: {x: 100, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3519941393662929980
@@ -7370,7 +7371,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4980491567860670752, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 4980491567860670752, guid: d3faef802ff64634497afd62661bdfbc, type: 3}
       propertyPath: m_AnchorMax.x
@@ -7529,7 +7530,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8949749624788767784, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 8949749624788767784, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMax.x
@@ -7729,7 +7730,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -760
+      value: -240
       objectReference: {fileID: 0}
     - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -7780,7 +7781,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4560886240936283504, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4560886240936283504, guid: f90550dfc0e1ef54ba8811058fbab030, type: 3}
       propertyPath: m_AnchorMax.x
@@ -8029,7 +8030,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   plbt: {fileID: 8183282706243599341}
   url: 
---- !u!1001 &7866664744296773037
+--- !u!1001 &7188588262015716276
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -8038,7 +8039,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_Name
-      value: Image
+      value: Image2
       objectReference: {fileID: 0}
     - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_IsActive
@@ -8054,7 +8055,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
       propertyPath: m_AnchorMax.x
@@ -8130,6 +8131,117 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+--- !u!224 &744733168888182302 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+  m_PrefabInstance: {fileID: 7188588262015716276}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6781410932810381399 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+  m_PrefabInstance: {fileID: 7188588262015716276}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7866664744296773037
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1363556228952835098}
+    m_Modifications:
+    - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Name
+      value: Image1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4458167396202558435, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 640
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 480
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 320
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -760
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bc3de041e82908647849e0e8128295b1, type: 3}
 --- !u!224 &340916537086920711 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7608598676142472618, guid: bc3de041e82908647849e0e8128295b1, type: 3}

Assets/FrameWork/Texture/容器 161-2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 77e1539e0491d464f9c14baf4f3a479b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Texture/容器 161.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 88aca03ce5f3a4a448184df8d3eff1d8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Texture/容器 162-2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 108ef46f3066a4a7ba49d23a95934a3e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Texture/容器 162-3.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: e3d3dc7ae3b4b4e899307c3894820cf4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Texture/容器 162.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 3da6773c2cca2447f8312a3e36076206
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/Texture/容器 163.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: eec7496b9ac4946a0bbfca50f01a5578
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/WindowsItem.asset

@@ -61,3 +61,21 @@ MonoBehaviour:
   - PrefabList:
       name: icon
       obj: {fileID: 2800000, guid: 8f01af81e5093ea4bb37d1dd09107316, type: 3}
+  - PrefabList:
+      name: stop
+      obj: {fileID: 2800000, guid: 108ef46f3066a4a7ba49d23a95934a3e, type: 3}
+  - PrefabList:
+      name: back
+      obj: {fileID: 2800000, guid: 3da6773c2cca2447f8312a3e36076206, type: 3}
+  - PrefabList:
+      name: finish
+      obj: {fileID: 2800000, guid: 77e1539e0491d464f9c14baf4f3a479b, type: 3}
+  - PrefabList:
+      name: dingwei
+      obj: {fileID: 2800000, guid: 77e1539e0491d464f9c14baf4f3a479b, type: 3}
+  - PrefabList:
+      name: zhongduan
+      obj: {fileID: 2800000, guid: e3d3dc7ae3b4b4e899307c3894820cf4, type: 3}
+  - PrefabList:
+      name: usericon
+      obj: {fileID: 2800000, guid: eec7496b9ac4946a0bbfca50f01a5578, type: 3}

Assets/HotUpdate/Scripts/LoginManager.cs

@@ -115,7 +115,7 @@ public class LoginManager : MonoSingleton<LoginManager>
                 }
                 else
                 {
-                    break;
+                    continue;
                 }
             }
 
@@ -186,12 +186,31 @@ public class LoginManager : MonoSingleton<LoginManager>
             }
             else
             {
-                ShowInfoTipManager.Instance.showTip("登录失败");
-                LoginPassWordManager.Instance.toError();
-                TimerMgr.Instance.CreateTimer(() => {
-                    ShowInfoTipManager.Instance.closeTip();
-                    isTongxun = false;
-                }, 1f);
+                if (obj["code"].ToString() == "10002")
+                {
+                    List<string> backTip = new List<string>();
+                    JsonData data = new JsonData();
+                    data["type"] = "40001";
+                    backTip.Add(data.ToJson());
+                    backTip.Add(data.ToJson());
+                    backTip.Add(data.ToJson());
+                    WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("账号已被封禁", "当前账号已封禁，将自动退出", Color.gray, "stop", backTip, true, "秒后自动退出", 5, "", "退出巡检", "返回").ToJson());
+                    TimerMgr.Instance.CreateTimer(() => {
+                        ShowInfoTipManager.Instance.closeTip();
+                        isTongxun = false;
+                    }, 1f);
+                }
+                else
+                {
+
+                    ShowInfoTipManager.Instance.showTip("登录失败");
+                    LoginPassWordManager.Instance.toError();
+                    TimerMgr.Instance.CreateTimer(() => {
+                        ShowInfoTipManager.Instance.closeTip();
+                        isTongxun = false;
+                    }, 1f);
+                }
+
                 // WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
             }
         }

Assets/HotUpdate/Scripts/Scripts/GetHttpTimer.cs

@@ -13,6 +13,11 @@ public class GetHttpTimer : MonoSingleton<GetHttpTimer>
 
     private void Start()
     {
+        updatetime();
+    }
+    void updatetime()
+    {
+
         StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.timestamp, "", (string msg) =>
         {
             Debug.Log(msg);
@@ -44,11 +49,28 @@ public class GetHttpTimer : MonoSingleton<GetHttpTimer>
     public DateTime GetTimer()
     {
         if (timestamp == -1)
+        {
+            updatetime();
             return System.DateTime.Now;
 
+        }
+
+
         return UnixTimeStampToDateTime((timestamp+(long)nowTimes));
     }
 
+    public long Getlongtime()
+    {
+        if (timestamp == -1)
+        {
+            updatetime();
+            return System.DateTime.Now.Ticks;
+
+        }
+
+        return (timestamp + (long)nowTimes);
+    }
+
     // 将Unix时间戳转换为DateTime
     DateTime UnixTimeStampToDateTime(long unixTimeStamp)
     {

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -22,7 +22,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     public GameObject VideoBT;
     public GameObject ModelBT;
     public GameObject ImageBT;
-    public GameObject Image2BT;
+   // public GameObject Image2BT;
     public GameObject TextBT;
 
     public GameObject AllBT;
@@ -31,6 +31,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     public GameObject Model;
     public GameObject Image;
     public GameObject Image2;
+    public GameObject Image3;
     public GameObject Text;
 
     public GameObject paizhaoGo;
@@ -162,7 +163,8 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //updateListRef();
         // rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex+1];
         rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
-        rwitem.startTime = Time.time;
+        long nowtime = GetHttpTimer.Instance.Getlongtime();
+        rwitem.startTime = nowtime;
         if (XunJianDataManager.Instance.chooseXunJian.renwuModelType == RenWuModelType.DianYun)
         {
             LineManager.Instance.setRoad(rwitem.roadList);
@@ -174,7 +176,8 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         // if (XunJianDataManager.Instance.chooseXunJian != null)
         //    UpdateData();
     }
-    
+
+    int img = 0;
 
     public override void UpdateData()
     {
@@ -183,11 +186,12 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         VideoBT.SetActive(false);
         ModelBT.SetActive(false);
         ImageBT.SetActive(false);
-        Image2BT.SetActive(false);
         TextBT.SetActive(false);
         // rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
         rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
-        rwitem.startTime = Time.time;
+
+        long nowtime = GetHttpTimer.Instance.Getlongtime();
+        rwitem.startTime = nowtime;
         indexText.text = (rwitem.sort).ToString();
         // info.text = rwitem.info;
         info.text = rwitem.title;
@@ -244,7 +248,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //    WenJianLan.SetActive(false);
         //} 
         #endregion
-
+        int ct = rwitem.resources.Count;
         if(rwitem.description!="")
         {
             MinioResources rym = new MinioResources();
@@ -254,27 +258,31 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
             rwitem.resources.Add(rym);
             Text.GetComponent<RenWuTypeWindow>().updateData(rym);
             TextBT.SetActive(true);
+            ct++;
         }
-
+        img = 0;
         if (rwitem.resources.Count > 0)
         {
-            int img = 0;
             for (int i = 0; i < rwitem.resources.Count; i++)
             {
                 switch (rwitem.resources[i].loadingMethod)
                 {
                     case 1:
+                        ImageBT.SetActive(true);
                         if (img == 0)
                         {
-                            ImageBT.SetActive(true);
                             Image.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
                         }
-                        else
+                        else if (img == 1)
                         {
 
-                            Image2BT.SetActive(true);
                             Image2.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
                         }
+                        else if (img == 2)
+                        {
+
+                            Image3.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
+                        }
                         img++;
                         break;
                     case 2:
@@ -293,7 +301,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
             //    AllBT.SetActive(false);
             //}
 
-            if ((rwitem.resources.Count) < 2)
+            if (ct< 2)
             {
                 AllBT.SetActive(false);
             }
@@ -404,6 +412,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //            break;
         //    }
         //}
+        img = 0;
         for (int i = 0; i < rwitem.resources.Count; i++)
         {
             switch (rwitem.resources[i].loadingMethod)
@@ -413,10 +422,14 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                     {
                         list.Add(Image);
                     }
-                    else
+                    else if (img == 1)
                     {
                         list.Add(Image2);
                     }
+                    else
+                    {
+                        list.Add(Image3);
+                    }
                     img++;
                     break;
                 case 2:
@@ -516,31 +529,26 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     }
     public void showImage()
     {
-
         Image.SetActive(!Image.activeSelf);
-        if (!JinRuRenwu.Instance.paizhaoGo.activeSelf)
+        switch (img)
         {
-            Image.transform.SetAsFirstSibling();
-        }
-        else
-        {
-            Video.transform.SetSiblingIndex(1);
+            case 2:
+                Image2.SetActive(Image.activeSelf);
+                break;
+            case 3:
+                Image2.SetActive(Image.activeSelf);
+                Image3.SetActive(Image.activeSelf);
+                break;
         }
-            checkJd();
-    }
-    public void showImage2()
-    {
-
-        Image2.SetActive(!Image2.activeSelf);
         if (!JinRuRenwu.Instance.paizhaoGo.activeSelf)
         {
-            Image2.transform.SetAsFirstSibling();
+            Image.transform.SetAsFirstSibling();
         }
         else
         {
-            Video.transform.SetSiblingIndex(1);
+            Image.transform.SetSiblingIndex(1);
         }
-        checkJd();
+            checkJd();
     }
 
     public void showModel()
@@ -660,7 +668,6 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 
         //jsonData["dataFileIds"] = jobject;
 
-        Debug.Log(" HttpEdustryAction.tasksReport  " + JsonConvert.SerializeObject(rwitem));
         Debug.Log(" HttpEdustryAction.tasksReport  " + report);
         if ((XunJianDataManager.Instance.chooseXunJian.nowIndex - 1)>=0)
         {
@@ -668,10 +675,10 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
             TasksReport tasks = new TasksReport();
             tasks.projectInspectionTaskId = rwitem.id;
             tasks.status = rwitem.status;
-            tasks.consumingTime = (int)(Time.time - rwitem.startTime);
+            long nowtime = GetHttpTimer.Instance.Getlongtime();
+            tasks.consumingTime = (int)(nowtime - rwitem.startTime);
             tasks.dataFileIds = rwitem.listUpload;
-
-            Debug.Log(JsonConvert.SerializeObject(tasks));
+            Debug.Log(" HttpEdustryAction.tasksReport  " + JsonConvert.SerializeObject(tasks));
 
             WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.tasksReport, JsonConvert.SerializeObject(tasks), msg =>
             {

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -97,7 +97,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         xj.projectname = "工厂巡检";
         xj.inarea = "杨浦区";
         xj.updateState = "新项目";
-        xj.projectState = "测试巡检 ";
+       // xj.projectState = "测试巡检 ";
         xj.projectType = "未开始 ";
         xj.projectTime = "2023/11/23 10:53 ";
         xj.renwuModelType = RenWuModelType.SaoTu;
@@ -114,7 +114,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         xj.projectname = "办公室巡检";
         xj.inarea = "杨浦区";
         xj.updateState = "新项目";
-        xj.projectState = "测试巡检 ";
+       // xj.projectState = "测试巡检 ";
         xj.projectType = "未开始 ";
         xj.projectTime = "2023/11/23 10:53 ";
         xj.renwuModelType = RenWuModelType.DianYun;
@@ -132,7 +132,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         xj.projectname = "机房巡检";
         xj.inarea = "杨浦区";
         xj.updateState = "新项目";
-        xj.projectState = "巡检 ";
+       // xj.projectState = "巡检 ";
         xj.projectType = "未开始 ";
         xj.projectTime = "2023/11/23 10:53 ";
         xj.renwuModelType = RenWuModelType.None;
@@ -618,7 +618,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             xj.id = data[i].id.ToString();
             xj.projectname = data[i].name;
             xj.inarea = data[i].regionName;
-            xj.projectState = ((ProjectStatus)data[i].status).ToString();
+            xj.status = data[i].status;
             xj.projectType = ((ProjectType)data[i].type).ToString();
             DateTime dateTimes = UnixTimeStampToDateTime(data[i].inspectionTime);
             long notime = GetHttpTimer.Instance.timestamp;
@@ -642,27 +642,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             xj.projectTime = dateTimes.Year.ToString() + "/" + dateTimes.Month.ToString() + "/" + dateTimes.Day.ToString() + " " + dateTimes.Hour.ToString() + ":" + dateTimes.Minute.ToString();
             
             xj.listWall = data[i].listWall;
-
-            switch (data[i].status)
-            {
-                case 1:
-                    xj.projectState = "已完成";
-                    break;
-                case 2:
-                    xj.projectState = "进行中";
-                    break;
-                case 3:
-                    xj.projectState = "未开始";
-                    break;
-                case 4:
-                    xj.projectState = "即将开始";
-                    break;
-                case 5:
-                    xj.projectState = "已逾期";
-                    break;
-                default:
-                    break;
-            }
+            xj.status = data[i].status;
             switch (data[i].regionMapType)
             {
                 case 0:
@@ -710,7 +690,8 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         public string projectname;
         public string inarea; // 所在区域
         public string updateState; // 这个参数目前本地自己判断
-        public string projectState;
+    //    public string projectState;
+        public int status;
         public string projectType;
         public string projectTime;
        // public List<RenWuItem> itemList;
@@ -725,6 +706,35 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         /// 当前未完成任务的开始下标
         /// </summary>
         public int rwIndex = 0;
+
+
+        public void setState(int state)
+        {
+            status = state;
+        }
+
+        public string getstate()
+        {
+
+            switch (status)
+            {
+                case 1:
+                    return "已完成";
+                case 2:
+                    return "进行中";
+                case 3:
+                    return "未开始";
+                case 4:
+                    return "即将开始";
+                case 5:
+                    return "已逾期";
+                default:
+                    break;
+            }
+            return "--";
+
+
+        }
     }
 
     public class XunJianData
@@ -770,7 +780,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
 
     public void GotoXunJian(XunJianListData xjld)
     {
-        xjld.projectState = "进行中";
+        xjld.setState(2);//.projectState = "进行中";
         chooseXunJian = xjld;
         WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
         TopManager.Instance.gameObject.SetActive(false);
@@ -801,11 +811,13 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             List<string> backTip = new List<string>();
             JsonData data = new JsonData();
             data["type"] = "30001";
-            backTip.Add("1");
             backTip.Add(data.ToJson());
-            backTip.Add("3");
-            WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "已经是最后一步了!", Color.gray, "icon", backTip, false, "自动退出", 5,"","退出巡检","返回").ToJson());
-            chooseXunJian.projectState = "已完成";
+            backTip.Add(data.ToJson());
+            backTip.Add(data.ToJson());
+            WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("巡检项目已完成", "您已完成本项目所有任务，结果将会自动上传", Color.gray, "finish", backTip, true, "秒后返回项目列表", 5,"","退出巡检","返回").ToJson());
+            //chooseXunJian.projectState = "已完成";
+            chooseXunJian.setState(1);
+            chooseXunJian.status = 1;
         }
 
       //  chooseXunJian.nowIndex++;
@@ -916,7 +928,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         /// <summary>
         /// 任务开始时间
         /// </summary>
-        public float startTime { get; set; }
+        public long startTime { get; set; }
       
     }
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/CaoZuoLanManager.cs

@@ -22,6 +22,12 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
 
     public void successItem()
     {
+
+        dazha.GetComponent<Image>().color = Color.gray;
+
+        duigou.GetComponent<Image>().color = Color.green;
+
+        xiayibu.GetComponent<Image>().color = Color.blue;
         JinRuRenwu.Instance.successItem();
         nextInteractable(true);
         //if (XunJianDataManager.Instance.chooseXunJian.itemList.Count > (XunJianDataManager.Instance.chooseXunJian.nowIndex + 1))
@@ -42,13 +48,21 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
     }
     public void failItem()
     {
+
+        dazha.GetComponent<Image>().color = Color.red;
+
+        duigou.GetComponent<Image>().color = Color.gray;
+
+        xiayibu.GetComponent<Image>().color = Color.blue;
         List<string> backTip = new List<string>();
         JsonData data = new JsonData();
         data["type"] = "30002";
-        backTip.Add("1");
+        JsonData data2 = new JsonData();
+        data2["type"] = "30003";
+        backTip.Add(data2.ToJson());
         backTip.Add(data.ToJson());
-        backTip.Add("3");
-        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "是否需要拍照记录?", Color.gray, "icon", backTip, false, "自动退出", 5, "", "需要", "不需要").ToJson());
+        backTip.Add(data2.ToJson());
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("异常上报", "请选择上报类型，立即上报还是拍照后上报?", Color.gray, "icon", backTip, false, "自动退出", 5, "", "拍照后上报", "立即上报").ToJson());
 
         JinRuRenwu.Instance.failItem();
         nextInteractable(true);
@@ -74,6 +88,12 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
     }
     public void gotoNextItem()
     {
+
+        dazha.GetComponent<Image>().color = Color.gray;
+
+        duigou.GetComponent<Image>().color = Color.gray;
+
+        xiayibu.GetComponent<Image>().color = Color.gray;
         Debug.Log("准备进入下一个任务==》总共任务：" + XunJianDataManager.Instance.chooseXunJian.tasksList.Count+ " 当前任务==》"+ XunJianDataManager.Instance.chooseXunJian.nowIndex);
         if (XunJianDataManager.Instance.chooseXunJian.tasksList.Count > (XunJianDataManager.Instance.chooseXunJian.nowIndex + 1))
         {
@@ -103,9 +123,20 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
             JinRuRenwu.Instance.gotoNextItem();
 
         }
-       //
+        //
     }
     public void GotoLieBiao()
+    {
+        List<string> backTip = new List<string>();
+        JsonData data = new JsonData();
+        data["type"] = "30011";
+        backTip.Add("1");
+        backTip.Add(data.ToJson());
+        backTip.Add("3");
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("中断项目", "项目将中断，当前记录不会被保留是否要中断并返回项目列表?", Color.gray, "zhongduan", backTip, false, "自动退出", 5, "", "中断", "取消").ToJson());
+
+    }
+    public void GotoLieBiao2()
     {
         TopManager.Instance.gameObject.SetActive(true);
         JinRuRenwu.Instance.GotoLieBiao();
@@ -117,6 +148,15 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
         isChoose = isActive;
         JinRuRenwu.Instance.rwitem.status = isActive ? 1 : 2;
         xiayibu.GetComponent<Button>().interactable = isActive;
+        if(!isActive)
+        {
+
+            dazha.GetComponent<Image>().color = Color.gray;
+
+            duigou.GetComponent<Image>().color = Color.gray;
+
+            xiayibu.GetComponent<Image>().color = Color.gray;
+        }
 
     }
 }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -125,7 +125,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
                         backTip.Add(data.ToJson());
                         backTip.Add(data.ToJson());
                         backTip.Add(data.ToJson());
-                        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "识别图未找到!" + rw.diagram, Color.gray, "icon", backTip, true, "识别图错误", 5).ToJson());
+                        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "识别图未找到!" + rw.diagram, Color.gray, "stop", backTip, true, "识别图错误", 5).ToJson());
 
                     }
                     else
@@ -155,6 +155,28 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
 
     }
 
+    public void gotoback()
+    {
+        List<string> backTip = new List<string>();
+        JsonData data = new JsonData();
+        data["type"] = "30012";
+        backTip.Add("1");
+        backTip.Add(data.ToJson());
+        backTip.Add("3");
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("中断项目", "项目将中断，当前记录不会被保留是否要中断并返回项目列表?", Color.gray, "zhongduan", backTip, false, "自动退出", 5, "", "中断", "取消").ToJson());
+
+    }
+
+    public void GotoLieBiao()
+    {
+        TopManager.Instance.gameObject.SetActive(true);
+        JinRuRenwu.Instance.GotoLieBiao();
+    }
+    public void gotonext()
+    {
+        JinRuRenwu.Instance.show();
+        ARSaoTuManager.Instance.closeDevice();
+    }
    
 
     public void close()

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/PaiZhaoDataManager.cs

@@ -94,7 +94,7 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
                 backTip.Add(data.ToJson());
                 backTip.Add(data.ToJson());
                 backTip.Add(data.ToJson());
-                WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "采集失败"+ path, Color.white, "icon", backTip, false, "", 5, "知道了.", "", "").ToJson());
+                WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "采集失败"+ path, Color.white, "stop", backTip, false, "", 5, "知道了.", "", "").ToJson());
                 
             }
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuListItemWindow.cs

@@ -92,7 +92,7 @@ public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
                     SuccessGo.SetActive(false);
                     break;
                 case RenWuState.Fail:
-                    info.color = Color.red;
+                    info.color = Color.green;
                     NoneGo.SetActive(false);
                     FailGo.SetActive(true);
                     SuccessGo.SetActive(false);

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/SaoTuManager.cs

@@ -16,7 +16,14 @@ public class SaoTuManager : MonoSingleton<SaoTuManager>
         backTip.Add(data.ToJson());
         backTip.Add(data.ToJson());
         backTip.Add(data.ToJson());
-        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("标识图扫描", "请前往第一个任务点并扫描标识图", Color.white, "icon", backTip, false, "", 5, "我已到达", "", "").ToJson());
+
+        string msg2 = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].diagram.Count == 0 ? "":"并扫描标识图";
+        string msg1 = "第" + (XunJianDataManager.Instance.chooseXunJian.nowIndex+1) + "个任务点"+msg2;
+
+        string titlemsg = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].diagram.Count == 0 ? "提示" : "标识图扫描";
+
+
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData(titlemsg, "请前往"+msg1, Color.white, "dingwei", backTip, false, "", 5, "我已到达", "", "").ToJson());
 
     }
 
@@ -38,7 +45,7 @@ public class SaoTuManager : MonoSingleton<SaoTuManager>
         backTip.Add(data.ToJson());
         backTip.Add(data.ToJson());
         backTip.Add(data.ToJson());
-        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("空间扫描", "请环顾四周,眼镜正在扫描识别环境....", Color.white, "icon", backTip, true, "", 10, "", "", "").ToJson());
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("空间扫描", "请环顾四周,眼镜正在扫描识别环境....", Color.white, "dingwei", backTip, true, "", 10, "", "", "").ToJson());
 
         timeCheck2 = TimerMgr.Instance.CreateTimer(() => {
 
@@ -54,7 +61,7 @@ public class SaoTuManager : MonoSingleton<SaoTuManager>
                 backTip.Add(data.ToJson());
                 backTip.Add(data2.ToJson());
                 backTip.Add(data3.ToJson());
-                WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("空间扫描", "未识别到环境,若已到达巡检区域初始位置,可直接开始", Color.white, "icon", backTip, false, "", 5, "", "重新检测", "直接开始").ToJson());
+                WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("空间扫描", "未识别到环境,若已到达巡检区域初始位置,可直接开始", Color.white, "dingwei", backTip, false, "", 5, "", "重新检测", "直接开始").ToJson());
 
             }
         }, 10);

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoItem.cs

@@ -26,10 +26,53 @@ public class XunJianLieBiaoItem : MonoBehaviour
         inarea.text = data.inarea;
         updateState.text = data.updateState;// data.updateState;
         pType.text = data.projectType;
-        XunJianState.text = data.projectState;
+        XunJianState.text = data.getstate();
         XunTime.text = data.projectTime;
+
+        pName.color = Color.white;
+        inarea.color = Color.white;
+        updateState.color = Color.white;
+        pType.color = Color.white;
+        XunJianState.color = Color.white;
+        XunTime.color = Color.white;
+
+        switch (data.status)
+        {
+            case 1:
+                pName.color = Color.gray;
+                inarea.color = Color.gray;
+                updateState.color = Color.gray;
+                pType.color = Color.gray;
+                XunJianState.color = Color.gray;
+                XunTime.color = Color.gray;
+                //xj.projectState = "已完成";
+                break;
+            case 2:
+                pName.color = Color.gray;
+                inarea.color = Color.gray;
+                updateState.color = Color.gray;
+                pType.color = Color.gray;
+                XunJianState.color = Color.gray;
+                XunTime.color = Color.gray;
+                //xj.projectState = "进行中";
+                break;
+            case 3:
+                //xj.projectState = "未开始";
+                break;
+            case 4:
+                //xj.projectState = "即将开始";
+                break;
+            case 5:
+                XunJianState.color = Color.red;
+                //xj.projectState = "已逾期";
+                break;
+            default:
+                break;
+        }
     }
 
+
+
     public void gotoXunJian()
     {
 

Assets/HotUpdate/Scripts/Scripts/TipAndErrorManager.cs

@@ -33,11 +33,20 @@ public class TipAndErrorManager : WindowSingleton<TipAndErrorManager>
                     JinRuRenwu.Instance.show();
                     break;
                 case "30001":
-                    CaoZuoLanManager.Instance.GotoLieBiao();
+                    CaoZuoLanManager.Instance.GotoLieBiao2();
+                    break;
+                case "30011":
+                    CaoZuoLanManager.Instance.GotoLieBiao2();
+                    break;
+                case "30012":
+                    ChangeCameraSaoMiao.Instance.GotoLieBiao();
                     break;
                 case "30002":
                     JinRuRenwu.Instance.GotoPaiZhao();
                     break;
+                case "30003":
+                    CaoZuoLanManager.Instance.gotoNextItem();
+                    break;
                 case "40001":
                     TopManager.Instance.exitUserOk();
                     break;

Assets/HotUpdate/Scripts/Scripts/TopManager.cs

@@ -21,7 +21,7 @@ public class TopManager : MonoSingleton<TopManager>
         backTip.Add("1");
         backTip.Add(data.ToJson());
         backTip.Add("3");
-        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "是否退出账号?", Color.gray, "icon", backTip, false, "自动退出", 5, "", "退出", "返回").ToJson());
+        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "是否退出账号?", Color.gray, "back", backTip, false, "自动退出", 5, "", "退出", "返回").ToJson());
 
 
     }

Assets/HotUpdate/Scripts/SmallLoginItem.cs

@@ -17,14 +17,10 @@ public class SmallLoginItem : MonoBehaviour, IPointerEnterHandler, IPointerExitH
         this.isChooseBig = isChooseBig;
         this.ad = ad;
         textName.text = ad.name;
-
-        if(ad.avatar==null|| ad.avatar.host=="")
+        
+        iconImg.texture = WindowsManager.Instance.getTexture("usericon");
+        if (ad.avatar==null|| ad.avatar.host=="")
         {
-            ad.avatar.path = Application.streamingAssetsPath + "/icon/1.png";
-            DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData((ad.avatar.host + "/" + ad.avatar.path)), (Texture2D tex) => {
-                texture = tex;
-                iconImg.texture = tex;
-            }, null);
         }
         else
         {

Assets/HotUpdate/UsericonTip.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class UsericonTip : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        ShowInfoTipManager.Instance.showTip(UserManager.Instance.NowChoose.name, false);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        ShowInfoTipManager.Instance.closeTip();
+    }
+}

Assets/HotUpdate/UsericonTip.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9e423d1011b0f43b7983e4d806abd53a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -134,8 +134,17 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.5.0
-  preloadedAssets: []
+  bundleVersion: 0.5.1
+  preloadedAssets:
+  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
+  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
+  - {fileID: 4800000, guid: ea9a295053a0dc440b9698a7f41d9741, type: 3}
+  - {fileID: 4800000, guid: 1499e61b3897c4a4b9318a56ca931b8a, type: 3}
+  - {fileID: 4800000, guid: 798d6e253a35a144d94205b80c8fd48b, type: 3}
+  - {fileID: 4800000, guid: ae539cb2b258bd047a57837fd579cc80, type: 3}
+  - {fileID: 4800000, guid: 58841e6e22debfc43ba09a0cf58cd92d, type: 3}
+  - {fileID: 4800000, guid: a336f422ffebbec4c89b4dac26022d5f, type: 3}
+  - {fileID: 11400000, guid: 852e6bd112d2b174996470390b08d3a7, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -270,7 +279,14 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: b3e3fd6550d0bcc45b07a993a45d63f8, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons:
   - m_BuildTarget: iPhone
     m_Icons: