Browse Source

改一波巡检任务的

Void_F 5 days ago
parent
commit
cb6052db96

+ 14 - 9
Assets/Prefabs/UI/Item/xunJianRenWuItem.prefab

@@ -115,8 +115,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 277.6, y: -19.700012}
-  m_SizeDelta: {x: 48, y: 16}
+  m_AnchoredPosition: {x: 267.1, y: -19.700012}
+  m_SizeDelta: {x: 80, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6092926312370697893
 CanvasRenderer:
@@ -268,12 +268,17 @@ MonoBehaviour:
   PointItems: []
   itemContent: {fileID: 2753270198851302937}
   InfoData:
-    task_id: 
-    type: 
+    xjId: 
+    fanganId: 
+    projectId: 
+    xunjianScope: 
+    taskExecutor: 0
+    fanganName: 
     xunjian_scope: 
     status: 
-    start_time: 
-    task_items: []
+    startTime: 
+    finishedTime: 
+    items: []
   gcywLayer: {fileID: 0}
 --- !u!1 &3468084397990988624
 GameObject:
@@ -551,7 +556,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -797,7 +802,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: 217.5, y: -19.700012}
+  m_AnchoredPosition: {x: 205.5, y: -19.700012}
   m_SizeDelta: {x: 24, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5138472236347755085
@@ -860,7 +865,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &885078420693354308
 RectTransform:
   m_ObjectHideFlags: 0

+ 5 - 4
Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -10988,7 +10988,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1944683656838900344}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
@@ -44677,7 +44677,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: 220, y: -12}
+  m_AnchoredPosition: {x: 200, y: -12}
   m_SizeDelta: {x: 24, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5377418936768656727
@@ -46854,7 +46854,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: 279.6, y: -12}
+  m_AnchoredPosition: {x: 260, y: -12}
   m_SizeDelta: {x: 48, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1202774136160736880
@@ -50230,7 +50230,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9052107157716564033
 RectTransform:
   m_ObjectHideFlags: 0
@@ -50390,6 +50390,7 @@ MonoBehaviour:
   task_items: []
   currentIndex: 0
   dateText: {fileID: 7027562595760644759}
+  _timeInfo: 
 --- !u!1 &8800537368483757876
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/HttpGetData.cs

@@ -350,7 +350,7 @@ public class B08_TaskInfoData
     [FormerlySerializedAs("type")] public string fanganName;
     public string xunjian_scope;
     public string status;
-    public string start_time;
+    public string startTime;
     public string finishedTime;
     [FormerlySerializedAs("task_items")] public B08_TaskItems[] items;
 }

+ 3 - 3
Assets/Scripts/UI/Item/B08_TaskListItem.cs

@@ -59,7 +59,7 @@ public class B08_TaskListItem : MonoBehaviour
             ctrlText.text = "<color=#00FF3F>收起</color>";
             rect.sizeDelta = new Vector2(360,354);
             more.SetActive(true);
-            gcywLayer.SetTaskImgPanelData(InfoData.items);
+            gcywLayer.SetTaskImgPanelData(InfoData.items,InfoData.startTime);
         }
 
         moreMessage = !moreMessage;
@@ -91,7 +91,7 @@ public class B08_TaskListItem : MonoBehaviour
         typeText.text = typeStr;
         titleText.text = data.fanganName;
         stateText.text = data.status;
-        dateText.text = data.start_time;
+        dateText.text = data.startTime;
         for (int i = 0; i < PointItems.Count; i++)
         {
             Destroy(PointItems[i].gameObject);
@@ -100,7 +100,7 @@ public class B08_TaskListItem : MonoBehaviour
         for (int i = 0; i < data.items.Length; i++)
         {
             B08_TaskPointItem tempItem = Instantiate(pointItemPrefab,itemContent).GetComponent<B08_TaskPointItem>();
-            tempItem.SetData(baseLayer,data.items[i],i,data.start_time);
+            tempItem.SetData(baseLayer,data.items[i],i,data.startTime);
             var button = tempItem.GetComponent<ExtendedButton_PointItem>();
             button.index = i;
             button.onPointerEnter += baseLayer.SetTaskPointIconHeightLight;

+ 1 - 1
Assets/Scripts/UI/UIView/GCYW/B08_TaskPointItem.cs

@@ -17,7 +17,7 @@ public class B08_TaskPointItem : MonoBehaviour
     {
         imgButton.onClick.AddListener(() =>
         {
-            gcywLayer.OpenTaskImgPanel();
+            gcywLayer.OpenTaskImgPanel(itemIndex);
         });
     }
 

+ 4 - 3
Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -365,9 +365,9 @@ public class GCYWLayer : YZTRootLayer
         TaskListPanelObj.SetActive(true);
     }
 
-    public void SetTaskImgPanelData(B08_TaskItems[] itemsArray)
+    public void SetTaskImgPanelData(B08_TaskItems[] itemsArray,string _time)
     {
-        taskPhotoPanel.SetData(itemsArray);
+        taskPhotoPanel.SetData(itemsArray,_time);
         taskPointLineRenderer.positionCount = 0;
         for (int i = 0; i < taskPointIcons.Count; i++)
         {
@@ -399,8 +399,9 @@ public class GCYWLayer : YZTRootLayer
         }
     }
 
-    public void OpenTaskImgPanel()
+    public void OpenTaskImgPanel(int openPage)
     {
+        taskPhotoPanel.ChangePage(openPage);
         taskPhotoPanelObj.SetActive(true);
     }
 }

+ 4 - 2
Assets/Scripts/UI/UIView/GCYW/TaskPhotoPanel.cs

@@ -17,6 +17,7 @@ public class TaskPhotoPanel : MonoBehaviour
     public int currentIndex = 0;
 
     public Text dateText;
+    public string _timeInfo;
 
     private void Awake()
     {
@@ -24,10 +25,11 @@ public class TaskPhotoPanel : MonoBehaviour
         nextItem.onClick.AddListener(Next);
     }
 
-    public void SetData(B08_TaskItems[] items)
+    public void SetData(B08_TaskItems[] items,string _time)
     {
         currentIndex = 0;
         task_items = items;
+        _timeInfo = _time;
         ChangePage(currentIndex);
     }
 
@@ -58,6 +60,6 @@ public class TaskPhotoPanel : MonoBehaviour
         posText.text = currentData.faItemName;
         messageText.text = currentData.faItemName;
         pageText.text = $"{pageIndex + 1}/{task_items.Length}";
-        dateText.text = currentData.startTime;
+        dateText.text = _timeInfo;
     }
 }