Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

Assets/Resources/Prefabs/Objects/步骤状态.prefab

@@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &486551547517944353
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2907290617931699133}
+  m_Layer: 0
+  m_Name: 10001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2907290617931699133
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 486551547517944353}
+  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
+  m_Children: []
+  m_Father: {fileID: 1817104531314915914}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1817104531314915916
 GameObject:
   m_ObjectHideFlags: 0
@@ -30,6 +61,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2907290617931699133}
   - {fileID: 1817104532306234130}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -117,6 +149,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8897a2609da37744e94a004f97f53e6a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  systemId: 0
+  schemeId: 0
 --- !u!1 &1817104532306234131
 GameObject:
   m_ObjectHideFlags: 0
@@ -147,5 +181,5 @@ Transform:
   m_Children:
   - {fileID: 1817104532282105278}
   m_Father: {fileID: 1817104531314915914}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/Editor/Tools/Tools.cs

@@ -157,6 +157,10 @@ public class Tools
                 {
                     case "int":
                         Debug.Log($"当前表{dataTable.TableName},当前行列:{i}_______{j}");
+                        if(dataTable.TableName== "TB_SubProcessStep" && i==61)
+                        {
+                            Debug.Log("aa");
+                        }
                         fs.Write(BitConverter.GetBytes(int.Parse(row[j].ToString())), 0, 4);
                         break;
                     case "bool":

Assets/Scripts/Project/Manager/ProcessManager.cs

@@ -156,6 +156,8 @@ public class ProcessManager : BaseManager<ProcessManager>
                     else
                     {
                         Debug.Log($"<color=red>完成所有</color>");
+                        //HQB 20240828完成后展示学习完成Tips
+                        GameManager.UIMgr.ShowPanel<UI_TipsForPracticePanel>(E_UI_Layer.System);
                         return false;
                     }