界面基本数据

BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab

@@ -260,7 +260,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255972620222497
 CanvasRenderer:
@@ -324,7 +324,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -396,7 +396,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255972635946492
 CanvasRenderer:
@@ -460,7 +460,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -714,7 +714,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255972663171959
 CanvasRenderer:
@@ -778,7 +778,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -2665,7 +2665,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255973012104146
 CanvasRenderer:
@@ -2729,7 +2729,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -3237,7 +3237,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 023e80ce33ca6b74d9254cc9439c8162, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  current_panel: {fileID: 0}
   MeasureScaleButton: {fileID: 0}
   CollectDataButton: {fileID: 0}
   MSPage: {fileID: 0}
@@ -3256,6 +3255,11 @@ MonoBehaviour:
   TableToggle: {fileID: 0}
   LineChart: {fileID: 0}
   Table: {fileID: 0}
+  MeasuringScaleItemContent: {fileID: 0}
+  MeasuringScaleItemPrefab: {fileID: 0}
+  MeasuringScaleItems: []
+  StartTime: 
+  EndTime: 
 --- !u!1 &4429255973153589261
 GameObject:
   m_ObjectHideFlags: 0
@@ -8979,8 +8983,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 7023963978842396236}
   m_Father: {fileID: 4429255973438302452}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9629,7 +9632,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255974066691049
 CanvasRenderer:
@@ -9693,7 +9696,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -10057,7 +10060,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255974164574900
 CanvasRenderer:
@@ -10121,7 +10124,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -10193,7 +10196,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255974179010389
 CanvasRenderer:
@@ -10257,7 +10260,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -11925,7 +11928,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255974369155104
 CanvasRenderer:
@@ -11989,7 +11992,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -12246,7 +12249,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: " \u8BA1\u91CF\u79E4\u7F16\u7801\uFF1A"
+  m_text: " \u8BA1\u91CF\u79E4\u540D\u79F0\uFF1A"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 7189cdc95f54eb84ba6a7b8655aebb40, type: 2}
   m_sharedMaterial: {fileID: 1594732787684875815, guid: 7189cdc95f54eb84ba6a7b8655aebb40,
@@ -13252,7 +13255,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 5, y: -24}
-  m_SizeDelta: {x: 100, y: 30}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4429255974596728884
 CanvasRenderer:
@@ -13316,7 +13319,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 2
+  m_fontStyle: 0
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -14228,168 +14231,3 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1001 &9125726373714193387
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 4429255973940726693}
-    m_Modifications:
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: BillNo
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: Voyage
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: ShipName
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: LastUpdateDate
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: BillGrossWeight
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: RemainingInventory
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: OneTradeReleaseVolume
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548194, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: OneTradeUnreleaseVolume
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 34
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2296613499577548200, guid: 6faebbfe8b1f48143a470b43da813bb4,
-        type: 3}
-      propertyPath: m_Name
-      value: MeasuringScaleItem
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 6faebbfe8b1f48143a470b43da813bb4, type: 3}
---- !u!224 &7023963978842396236 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2296613499577548199, guid: 6faebbfe8b1f48143a470b43da813bb4,
-    type: 3}
-  m_PrefabInstance: {fileID: 9125726373714193387}
-  m_PrefabAsset: {fileID: 0}

BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScaleItem.prefab

@@ -285,7 +285,7 @@ GameObject:
   - component: {fileID: 2296613499577548198}
   - component: {fileID: 2296613499577548195}
   - component: {fileID: 2296613499577548196}
-  - component: {fileID: 2296613499577548194}
+  - component: {fileID: 815848929620452669}
   m_Layer: 0
   m_Name: MeasuringScaleItem
   m_TagString: Untagged
@@ -394,7 +394,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 1
---- !u!114 &2296613499577548194
+--- !u!114 &815848929620452669
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -403,23 +403,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 2296613499577548200}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 08a996e48fbf94b438c10f6f0d4ceb10, type: 3}
+  m_Script: {fileID: 11500000, guid: edb26114d5357784b8250a16e078b63d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   SpriteOne: {fileID: 21300000, guid: 521cc1223874b564cb85d84f6e78ed8c, type: 3}
   SpriteTwo: {fileID: 21300000, guid: c8a2b6f46c5f0a747b238dc41b660e8b, type: 3}
   Background: {fileID: 2296613499577548198}
-  GoodsName: {fileID: 2296613499298097983}
+  MSCode: {fileID: 2296613499298097983}
-  StorageDate: {fileID: 2296613499142231615}
+  CDTime: {fileID: 2296613499142231615}
-  TransportationWay: {fileID: 2296613499967739660}
+  RealTime: {fileID: 2296613499967739660}
-  ShipName: {fileID: 0}
-  Voyage: {fileID: 0}
-  BillNo: {fileID: 0}
-  BillGrossWeight: {fileID: 0}
-  OneTradeReleaseVolume: {fileID: 0}
-  OneTradeUnreleaseVolume: {fileID: 0}
-  RemainingInventory: {fileID: 0}
-  LastUpdateDate: {fileID: 0}
 --- !u!1 &2296613499967739662
 GameObject:
   m_ObjectHideFlags: 0

BulkCargo_UnityProject/Assets/Scenes/MainScene.unity

@@ -1080,6 +1080,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eff5a1c311306da46a536141a937112b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  SearchedYard: []
 --- !u!114 &550376135
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -14909,6 +14910,111 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 151840903}
     m_Modifications:
+    - target: {fileID: 4429255972613017464, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972641847839, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972641847839, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972641847839, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 316.9999
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972867189631, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -27.999996
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972905115252, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255972998966839, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973001932278, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
     - target: {fileID: 4429255973136742853, guid: a4a7b5dfbd396014a86e6429b859c417,
         type: 3}
       propertyPath: m_Name
@@ -15024,6 +15130,316 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4429255973222742713, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973231283246, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973231283246, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973231283246, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973254873008, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973368941162, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973368941162, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973368941162, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973384953674, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973514215626, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973514215626, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973514215626, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973644199770, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973644199770, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973644199770, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973720827114, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973775791246, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973826219899, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -314.36
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973826219899, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 98.880005
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973921979966, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973921979966, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973921979966, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973940726693, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973943098249, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973983485185, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973987286041, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973988315728, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973988315728, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255973988315728, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 316.9999
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974035410575, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -27.999996
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974046030280, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974186933867, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -24
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974201311953, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974346327784, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974346327784, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974346327784, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974359234373, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974359234373, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974359234373, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974536337049, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974626209011, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974626209011, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4429255974626209011, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7023963978842396236, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7023963978842396236, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7023963978842396236, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 682
+      objectReference: {fileID: 0}
+    - target: {fileID: 7023963978842396236, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 341
+      objectReference: {fileID: 0}
+    - target: {fileID: 7023963978842396236, guid: a4a7b5dfbd396014a86e6429b859c417,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -17
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a4a7b5dfbd396014a86e6429b859c417, type: 3}
 --- !u!1 &4432356494526894953

BulkCargo_UnityProject/Assets/Scripts/Data/EnumBase.cs

@@ -17,3 +17,8 @@ public enum DeviceType
     /// </summary>
     YARD,
 }
+
+public enum TransformMode
+{
+    ˮ·ÔËÊä = 2
+}

BulkCargo_UnityProject/Assets/Scripts/Data/RequestBase.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
 using UnityEngine.Networking;
 
 public class DataBase<T>
@@ -87,26 +89,21 @@ public static class RequestBase
         }
     }
 
-    public static IEnumerator Post(string _url, Dictionary<string, string> _quary_datas, Action<string, string> _callback)
+    public static IEnumerator Post(string _url, string _post_json_str, Action<string, string> _callback)
     {
         using (UnityWebRequest webRequest = new UnityWebRequest())
         {
-            if (_quary_datas != null)
-            {
-                _url = _url + "?";
-                foreach (var item in _quary_datas)
-                {
-                    _url = string.Format("{0}{1}={2}&", _url, item.Key, item.Value);
-                }
-            }
-            _url = _url.TrimEnd('&');
-
             UnityEngine.Debug.Log(_url);
 
             webRequest.url = _url;
-            webRequest.method = "GET";
+            webRequest.method = "POST";
 
             webRequest.downloadHandler = new DownloadHandlerBuffer();
+
+            webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(_post_json_str);
+            webRequest.uploadHandler = new UploadHandlerRaw(bodyRaw);
+
             yield return webRequest.SendWebRequest();
             switch (webRequest.result)
             {

BulkCargo_UnityProject/Assets/Scripts/wj/DeviceUIBase.cs

@@ -19,11 +19,11 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler
                 break;
             case DeviceType.BELT_SCALE:
                 //打开皮带秤窗口
-                UIManager.Instance.ShowBeltScalePage(DeviceBase.DeviceIndex);
+                UIManager.Instance.ShowBeltScalePage(DeviceBase.T_BAS_ELEC_WEIGHTER);
                 break;
             case DeviceType.YARD:
                 //打开堆区窗口
-                UIManager.Instance.ShowYardInformationPage(DeviceBase.DeviceIndex);
+                UIManager.Instance.ShowYardInformationPage(DeviceBase.T_BAS_YARD);
                 break;
             default:
                 break;

BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs

@@ -1,11 +1,12 @@
 using System.Collections;
 using System.Collections.Generic;
+using System;
 using System.IO;
 using UnityEngine;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Competition.Mysql.Model;
-using Unity.VisualScripting;
+using static ZenFulcrum.EmbeddedBrowser.Browser;
 
 public class ApiManager : Singleton<ApiManager>
 {
@@ -90,7 +91,7 @@ public class ApiManager : Singleton<ApiManager>
         }));
 
         var _yard_dic_url = Path.Combine(Application.streamingAssetsPath, "configure_yard.json");
-        StartCoroutine(RequestBase.Get(_cam_dic_url, (_data, _error) =>
+        StartCoroutine(RequestBase.Get(_yard_dic_url, (_data, _error) =>
         {
             if (_error != null)
             {
@@ -158,7 +159,7 @@ public class ApiManager : Singleton<ApiManager>
         }
 #endif
 
-        StartCoroutine(RequestBase.Get(_get_yard_information, new Dictionary<string, string>() { ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
+        StartCoroutine(RequestBase.Get(_get_yard_information, new Dictionary<string, string>() { ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
         {
             if (_error != null)
             {
@@ -187,7 +188,7 @@ public class ApiManager : Singleton<ApiManager>
         }
 #endif
 
-        StartCoroutine(RequestBase.Get(_get_belt_scale, new Dictionary<string, string>() { ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
+        StartCoroutine(RequestBase.Get(_get_belt_scale, new Dictionary<string, string>() { ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
         {
             if (_error != null)
             {
@@ -200,19 +201,117 @@ public class ApiManager : Singleton<ApiManager>
         }));
     }
 
+    /// <summary>
+    /// 获取堆场库存信息
+    /// </summary>
+    /// <returns></returns>
+    public IEnumerator GetYardStorage<T>(string _SILO_CODE, Action<List<T>> _callback)
+    {
+        yield return null;
+        var _get_yard_storage = IpAddress + ApiDic["GetYardStorage"];
+
+        StartCoroutine(RequestBase.Get(_get_yard_storage, new Dictionary<string, string>() { ["SILO_CODE"] = _SILO_CODE }, (_data, _error) =>
+        {
+            if (_error != null)
+            {
+
+            }
+            else
+            {
+                Debug.Log(_data);
+                var _t_object = JsonConvert.DeserializeObject<DataBase<List<T>>>(_data).data;
+                _callback?.Invoke(_t_object);
+            }
+        }));
+    }
+
+    /// <summary>
+    /// 获取皮带秤实时数据信息
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="_pipeCode"></param>
+    /// <param name="_callback"></param>
+    /// <returns></returns>
+    public IEnumerator GetMeasureScaleRealTimeData<T>(string _pipeCode, Action<T> _callback)
+    {
+        yield return null;
+        var _get_real_time_data = IpAddress + ApiDic["GetWeighterRealTimeData"];
+
+        StartCoroutine(RequestBase.Get(_get_real_time_data, new Dictionary<string, string>() { ["pipeCode"] = _pipeCode }, (_data, _error) =>
+        {
+            if (_error != null)
+            {
+
+            }
+            else
+            {
+                Debug.Log(_data);
+                var _t_object = JsonConvert.DeserializeObject<DataBase<T>>(_data).data;
+                _callback?.Invoke(_t_object);
+            }
+        }));
+    }
+
+    /// <summary>
+    /// 获取皮带秤历史数据
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="_pipeCode"></param>
+    /// <param name="_callback"></param>
+    /// <returns></returns>
+    public IEnumerator PostMeasureScaleHistroyData<T>(string _pipeCode, string _start_time, string _end_time, Action<List<T>> _callback)
+    {
+        yield return null;
+        var _get_real_time_data = IpAddress + ApiDic["PostHistroyData"];
+        if(string.IsNullOrEmpty(_start_time))
+        {
+            
+            _start_time = DateTime.Now.AddDays(-1).ToString("O");
+            Debug.Log($"起始时间为空，使用测试时间{_start_time}");
+        }
+        if (string.IsNullOrEmpty(_end_time))
+        {
+            _end_time = DateTime.Now.ToString("O");
+            Debug.Log($"结束时间为空，使用测试时间{_end_time}");
+
+        }
+        var _post_data = $"{{\"pipeCode\":\"{_pipeCode}\",\"startTime\":\"{_start_time}\",\"endTime\":\"{_end_time}\"}}";
+        StartCoroutine(RequestBase.Post(_get_real_time_data, _post_data, (_data, _error) =>
+        {
+            if (_error != null)
+            {
+
+            }
+            else
+            {
+                Debug.Log(_data);
+                var _t_object = JsonConvert.DeserializeObject<DataBase<List<T>>>(_data).data;
+                _callback?.Invoke(_t_object);
+            }
+        }));
+    }
+
     /// <summary>
     /// Ä£ºý²éѯ
     /// </summary>
     /// <returns></returns>
-    public IEnumerator PostCheckYard(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_CODE)
+    public IEnumerator PostCheckYard<T>(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_CODE,Action<List<T>> _callback)
     {
-        //        {
-        //            "SHIP_NAME_EN": "SV AURORA",
-        //    "VOYAGE_NO": "2402L1",
-        //    "STANDARD_NAME": "ú̿",
-        //"SILO_CODE":"YARD000227"
-        //}
         yield return null;
-        var _get_belt_scale = IpAddress + ApiDic["PostCheckYard"];
+        var _post_check_yard = IpAddress + ApiDic["PostCheckYard"];
+        var _post_data = $"{{ \"SHIP_NAME_EN\": \"{_SHIP_NAME_EN}\",\"VOYAGE_NO\": \"{_VOYAGE_NO}\",\"STANDARD_NAME\": \"{_SHIP_NAME_EN}\",\"SILO_CODE\":\"{_SILO_CODE}\"}}";
+        StartCoroutine(RequestBase.Post(_post_check_yard, _post_data, (_data, _error) =>
+        {
+            if (_error != null)
+            {
+
+            }
+            else
+            {
+                Debug.Log(_data);
+                var _t_object = JsonConvert.DeserializeObject<DataBase<List<T>>>(_data).data;
+                _callback?.Invoke(_t_object);
+            }
+        }));
     }
 }

BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs

@@ -1,3 +1,4 @@
+using Competition.Mysql.Model;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -26,6 +27,11 @@ public class UIManager : Singleton<UIManager>
     /// </summary>
     string m_SearchGoodsName;
 
+    /// <summary>
+    /// ËÑË÷½á¹û
+    /// </summary>
+    public List<DeviceBase> SearchedYard = new List<DeviceBase>();
+
     // Start is called before the first frame update
     void Start()
     {
@@ -93,21 +99,50 @@ public class UIManager : Singleton<UIManager>
     /// </summary>
     void Search()
     {
+        ClaerSearch(false);
         //搜索场景内的物体，并高亮展示
+        StartCoroutine(ApiManager.Instance.PostCheckYard<T_BAS_SILO>(_SHIP_NAME_EN: m_SearchShipName, _VOYAGE_NO: m_SearchVoyage, _STANDARD_NAME: m_SearchGoodsName, _SILO_CODE: m_SearchDischargeLocation, (_T_BAS_SILO_List) =>
+        {
+            for (int i = 0; i < _T_BAS_SILO_List.Count; i++)
+            {
+                var _yard = DeviceBase.YardList.Find(x => x.T_BAS_YARD.YARD_ID.Equals(_T_BAS_SILO_List[i].SILO_CODE));
+                if (_yard != null)
+                {
+                    Debug.Log(_yard.T_BAS_YARD.YARD_NAME);
+                    SearchedYard.Add(_yard);
 
+                    _yard.GetComponent<MeshRenderer>().material.EnableKeyword("_ENABLE");
+                    _yard.GetComponent<MeshRenderer>().material.SetFloat("_Strength", 1);
+                }
+            }
+        }));
+    }
+
+    void ClaerSearch()
+    {
+        ClaerSearch(true);
     }
 
     /// <summary>
     /// 清空搜索
     /// </summary>
-    void ClaerSearch()
+    void ClaerSearch(bool _clear_input = true)
     {
-        UIRoot.Instance.ShipNameInputField.text = "";
+        if (_clear_input)
-        UIRoot.Instance.VoyageInputField.text = "";
+        {
-        UIRoot.Instance.DischargeLocationInputField.text = "";
+            UIRoot.Instance.ShipNameInputField.text = "";
-        UIRoot.Instance.GoodsNameInputField.text = "";
+            UIRoot.Instance.VoyageInputField.text = "";
+            UIRoot.Instance.DischargeLocationInputField.text = "";
+            UIRoot.Instance.GoodsNameInputField.text = "";
+        }
 
         //同时清空场景中的高亮
+        for (int i = 0; i < SearchedYard.Count; i++)
+        {
+            SearchedYard[i].GetComponent<MeshRenderer>().material.DisableKeyword("_ENABLE");
+            SearchedYard[i].GetComponent<MeshRenderer>().material.SetFloat("_Strength", 0);
+        }
+        SearchedYard.Clear();
     }
 
     /// <summary>
@@ -126,16 +161,20 @@ public class UIManager : Singleton<UIManager>
     /// <summary>
     /// 打开皮带秤窗口
     /// </summary>
-    /// <param name="_index"></param>
+    /// <param name="_T_BAS_ELEC_WEIGHTER"></param>
-    public void ShowBeltScalePage(string _index)
+    public void ShowBeltScalePage(T_BAS_ELEC_WEIGHTER _T_BAS_ELEC_WEIGHTER)
     {
         //UIRoot.Instance.MeasuringScale.ShowPanel();
-        UIRoot.Instance.MeasuringScale.UpdatePageData(_index);
+        UIRoot.Instance.MeasuringScale.UpdatePageData(_T_BAS_ELEC_WEIGHTER);
     }
 
-    public void ShowYardInformationPage(string _index)
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="_yard_id"></param>
+    public void ShowYardInformationPage(T_BAS_YARD _T_BAS_YARD)
     {
         //UIRoot.Instance.YardInformation.ShowPanel();
-        UIRoot.Instance.YardInformation.UpdatePageData(_index);
+        UIRoot.Instance.YardInformation.UpdatePageData(_T_BAS_YARD);
     }
 }

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs

@@ -5,6 +5,9 @@ using TMPro;
 using UnityEngine.UI;
 using XCharts.Runtime;
 using System;
+using Competition.Mysql.Model;
+using DG.Tweening;
+using W.UI;
 
 /// <summary>
 /// 计量秤Page
@@ -96,6 +99,33 @@ public class MeasuringScale : PanelBase
     /// </summary>
     public RectTransform Table;
 
+    /// <summary>
+    /// 实例根节点
+    /// </summary>
+    public RectTransform MeasuringScaleItemContent;
+
+    /// <summary>
+    /// 预制体
+    /// </summary>
+    [Manual]
+    public MeasuringScaleItem MeasuringScaleItemPrefab;
+
+    /// <summary>
+    /// 实例集合
+    /// </summary>
+    public List<MeasuringScaleItem> MeasuringScaleItems = new List<MeasuringScaleItem>();
+
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    [Manual]
+    public string StartTime;
+    /// <summary>
+    /// 结束时间
+    /// </summary>
+    [Manual]
+    public string EndTime;
+
     #endregion
     // Start is called before the first frame update
     protected override void Start()
@@ -121,6 +151,7 @@ public class MeasuringScale : PanelBase
         });
 
         CloseButton.onClick.AddListener(HidePanel);
+        MeasuringScaleItemPrefab = Resources.Load<MeasuringScaleItem>("Prefabs/UI/MeasuringScaleInfo/MeasuringScaleItem");
     }
     public override void ShowPanel(bool _hide_last_panel = true)
     {
@@ -136,12 +167,45 @@ public class MeasuringScale : PanelBase
     /// <summary>
     /// 更新面板信息
     /// </summary>
-    /// <param name="index"></param>
+    /// <param name="_T_BAS_ELEC_WEIGHTER"></param>
-    public void UpdatePageData(string index)
+    public void UpdatePageData(T_BAS_ELEC_WEIGHTER _T_BAS_ELEC_WEIGHTER)
     {
-        //调取接口更新界面
-
-        //接口返回后显示节目
         ShowPanel();
+        transform.localScale = Vector3.zero;
+
+        MeasuringScaleName.text = _T_BAS_ELEC_WEIGHTER.WEIGHTER_NAME;
+        MeasuringScaleNO.text = _T_BAS_ELEC_WEIGHTER.PIPE_CODE;
+        ModelNO.text = _T_BAS_ELEC_WEIGHTER.WEIGHTER_NO;
+        FactoryNO.text = _T_BAS_ELEC_WEIGHTER.FACTORY_NO;
+        ProduceName.text = _T_BAS_ELEC_WEIGHTER.FACTORY;
+        FactoryDate.text = _T_BAS_ELEC_WEIGHTER.FACTORY_DATE.ToString();
+
+        MeasuringScaleNO_RealTime.text = _T_BAS_ELEC_WEIGHTER.WEIGHTER_NAME;
+        StartCoroutine(ApiManager.Instance.GetMeasureScaleRealTimeData<T_ALM_PIPECOLLDATA>(_T_BAS_ELEC_WEIGHTER.PIPE_CODE, (_T_ALM_PIPECOLLDATA) =>
+        {
+            CollectTime.text = _T_ALM_PIPECOLLDATA.COLL_TIME.ToString();
+            RealTimeCumulativeQuality.text = float.Parse(_T_ALM_PIPECOLLDATA.STAN_PRESENT_FLOWMETER_TOTAL_QUALITY.ToString()).ToString("F2");
+
+            DOTween.To(() => transform.localScale, _scale => transform.localScale = _scale, Vector3.one, 0.5f);
+        }));
+
+        for (int i = 0; i < MeasuringScaleItems.Count; i++)
+        {
+            Destroy(MeasuringScaleItems[i].gameObject);
+        }
+        MeasuringScaleItems.Clear();
+
+        StartCoroutine(ApiManager.Instance.PostMeasureScaleHistroyData<T_ALM_PIPECOLLDATACOMPARE>(_T_BAS_ELEC_WEIGHTER.PIPE_CODE, StartTime, EndTime, (_T_ALM_PIPECOLLDATACOMPARE_List) =>
+        {
+            for (int i = 0; i < _T_ALM_PIPECOLLDATACOMPARE_List.Count; i++)
+            {
+                var _item = Instantiate(MeasuringScaleItemPrefab);
+                _item.transform.parent = MeasuringScaleItemContent;
+                _item.transform.localScale = Vector3.one;
+
+                _item.Init(_T_ALM_PIPECOLLDATACOMPARE_List[i]);
+                MeasuringScaleItems.Add(_item);
+            }
+        }));
     }
 }

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScaleItem.cs

@@ -0,0 +1,23 @@
+using Competition.Mysql.Model;
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MeasuringScaleItem : MonoBehaviour
+{
+    public Sprite SpriteOne, SpriteTwo;
+    public Image Background;
+
+    public TextMeshProUGUI MSCode;
+    public TextMeshProUGUI CDTime;
+    public TextMeshProUGUI RealTime;
+
+    public void Init(T_ALM_PIPECOLLDATACOMPARE _T_ALM_PIPECOLLDATACOMPARE)
+    {
+        MSCode.text = _T_ALM_PIPECOLLDATACOMPARE.PIPE_CODE;
+        CDTime.text = _T_ALM_PIPECOLLDATACOMPARE.COLL_TIME.ToString();
+        RealTime.text = float.Parse(_T_ALM_PIPECOLLDATACOMPARE.STAN_PRESENT_FLOWMETER_TOTAL_QUALITY.ToString()).ToString("F2");
+    }
+}

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScaleItem.cs.meta

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

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs

@@ -4,6 +4,8 @@ using UnityEngine;
 using TMPro;
 using UnityEngine.UI;
 using System;
+using Competition.Mysql.Model;
+using DG.Tweening;
 
 /// <summary>
 /// ¶Ñ³¡ÐÅÏ¢±í
@@ -24,12 +26,23 @@ public class YardInformation : PanelBase
     /// </summary>
     public RectTransform YardItemContent;
 
+    /// <summary>
+    /// 预制体
+    /// </summary>
+    public YardItem YardItemsPrefab;
+
+    /// <summary>
+    /// 堆场数据项
+    /// </summary>
+    public List<YardItem> YardItems = new List<YardItem>();
+
     public Button CloseButton;
 
     // Start is called before the first frame update
     protected override void Start()
     {
         CloseButton.onClick.AddListener(HidePanel);
+        YardItemsPrefab = Resources.Load<YardItem>("Prefabs/UI/YardInfo/YardItem");
     }
     public override void ShowPanel(bool _hide_last_panel = true)
     {
@@ -42,11 +55,34 @@ public class YardInformation : PanelBase
         gameObject.SetActive(false);
     }
 
-    public void UpdatePageData(string index)
+    /// <summary>
+    /// 更新页面上展示的数据
+    /// </summary>
+    /// <param name="_T_BAS_YARD">堆场信息</param>
+    public void UpdatePageData(T_BAS_YARD _T_BAS_YARD)
     {
-        //
+        ShowPanel();//先打开面板以启动接口协程
+        transform.localScale = Vector3.zero;
 
+        YardName.text = _T_BAS_YARD.YARD_NAME;
+        YardArea.text = _T_BAS_YARD.YARD_AREA;
+        //
+        StartCoroutine(ApiManager.Instance.GetYardStorage<T_STK_STORAGE>(_SILO_CODE: _T_BAS_YARD.YARD_ID, _callback: (_storage_list) =>
+        {
+            for (int i = 0; i < YardItems.Count; i++)
+            {
+                Destroy(YardItems[i].gameObject);
+            }
+            YardItems.Clear();
+
+            for (int i = 0; i < _storage_list.Count; i++)
+            {
+                var _yard = Instantiate(YardItemsPrefab);
+                _yard.transform.parent = YardItemContent;
+                _yard.Init(_storage_list[i]);
+            }
+            DOTween.To(() => transform.localScale, _scale => transform.localScale = _scale, Vector3.one, 0.5f);
+        }));
         //
-        ShowPanel();
     }
 }

BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardItem.cs

@@ -3,12 +3,17 @@ using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
 using UnityEngine.UI;
+using Competition.Mysql.Model;
 
 public class YardItem : MonoBehaviour
 {
     public Sprite SpriteOne, SpriteTwo;
     public Image Background;
 
+    /// <summary>
+    /// ¶Ñ³¡ItemÊý¾Ý
+    /// </summary>
+    public T_STK_STORAGE T_STK_STORAGE;
     /// <summary>
     /// ÉÌÆ·Ãû³Æ
     /// </summary>
@@ -55,19 +60,22 @@ public class YardItem : MonoBehaviour
     public TextMeshProUGUI LastUpdateDate;
 
     string testdata = "²âÊÔ";
-    public void Init()
+    public void Init(T_STK_STORAGE _T_STK_STORAGE)
     {
-        GoodsName.text = testdata;
+        transform.localScale = Vector3.one;
-        StorageDate.text = testdata;
+
-        TransportationWay.text = testdata;
+        T_STK_STORAGE = _T_STK_STORAGE;
-        ShipName.text = testdata;
+        GoodsName.text = T_STK_STORAGE.STANDARD_NAME;
-        Voyage.text = testdata;
+        StorageDate.text = T_STK_STORAGE.INSTRG_DATE.ToString();
-        BillNo.text = testdata;
+        TransportationWay.text = ((TransformMode)int.Parse(T_STK_STORAGE.TRAF_MODE)).ToString();
-        BillGrossWeight.text = testdata;
+        ShipName.text = T_STK_STORAGE.SHIP_NAME_EN;
-        OneTradeReleaseVolume.text = testdata;
+        Voyage.text = T_STK_STORAGE.VOYAGE_NO;
-        OneTradeUnreleaseVolume.text = testdata;
+        BillNo.text = T_STK_STORAGE.BILL_NO;
-        RemainingInventory.text = testdata;
+        BillGrossWeight.text =float.Parse( T_STK_STORAGE.BILL_GROSS_WT.ToString()).ToString("F2");
-        LastUpdateDate.text = testdata;
+        OneTradeReleaseVolume.text = float.Parse(T_STK_STORAGE.TRADE_RELEASE.ToString()).ToString("F2");
+        OneTradeUnreleaseVolume.text = float.Parse(T_STK_STORAGE.TRADE_UNRELEASE.ToString()).ToString("F2");
+        RemainingInventory.text = float.Parse(T_STK_STORAGE.STOCK_BALANCE.ToString()).ToString("F2");
+        LastUpdateDate.text = T_STK_STORAGE.MODIFY_DATE.ToString();
 
         Background.sprite = transform.GetSiblingIndex() % 2 == 0 ? SpriteOne : SpriteTwo;
     }

BulkCargo_UnityProject/Assets/ShaderGraphs/ShaderGraph_OutLine.shadergraph

@@ -13,10 +13,14 @@
             "m_Id": "4364c30667774120aa9e4bbf301eb732"
         },
         {
-            "m_Id": "7f185bf47319495199ac6ae1f17e8886"
+            "m_Id": "5d365a59cb1f4f40b65630d12b160e4e"
+        }
+    ],
+    "m_Keywords": [
+        {
+            "m_Id": "6a46e00b2abe45f2b49b86da238a5609"
         }
     ],
-    "m_Keywords": [],
     "m_Dropdowns": [],
     "m_CategoryData": [
         {
@@ -69,33 +73,16 @@
         {
             "m_Id": "4e01760629094ada90b991292750f0b2"
         },
-        {
-            "m_Id": "356c263a16ba4e5599d8384cb4dad37f"
-        },
-        {
-            "m_Id": "6d48be02b56d43e4a864a7feb35bd3a0"
-        },
         {
             "m_Id": "c38c52ea61bb4611b9dce6c932a4ff15"
+        },
+        {
+            "m_Id": "bdb2c7921f404e0cafbb95aeefa1246b"
         }
     ],
     "m_GroupDatas": [],
     "m_StickyNoteDatas": [],
     "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "356c263a16ba4e5599d8384cb4dad37f"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "6d48be02b56d43e4a864a7feb35bd3a0"
-                },
-                "m_SlotId": 0
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -124,20 +111,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "6d48be02b56d43e4a864a7feb35bd3a0"
-                },
-                "m_SlotId": 3
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "c38c52ea61bb4611b9dce6c932a4ff15"
-                },
-                "m_SlotId": 0
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -166,6 +139,20 @@
                 "m_SlotId": 2
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "bdb2c7921f404e0cafbb95aeefa1246b"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "c38c52ea61bb4611b9dce6c932a4ff15"
+                },
+                "m_SlotId": 0
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -323,6 +310,30 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "0ac4e14a82e9487283cb3806bc2b5c86",
+    "m_Id": 2,
+    "m_DisplayName": "Off",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Off",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -388,36 +399,25 @@
 
 {
     "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "356c263a16ba4e5599d8384cb4dad37f",
+    "m_ObjectId": "2cd1d37e3c684870af326ec53312e367",
-    "m_Group": {
+    "m_Id": 1,
-        "m_Id": ""
+    "m_DisplayName": "On",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "On",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
     },
-    "m_Name": "Property",
+    "m_DefaultValue": {
-    "m_DrawState": {
+        "x": 0.0,
-        "m_Expanded": true,
+        "y": 0.0,
-        "m_Position": {
+        "z": 0.0,
-            "serializedVersion": "2",
+        "w": 0.0
-            "x": -866.8948364257813,
-            "y": 16.090858459472658,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "6cbf533a8d794e059dca786b1dd2958d"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "7f185bf47319495199ac6ae1f17e8886"
     }
 }
 
@@ -499,30 +499,6 @@
     "m_SerializedDescriptor": "VertexDescription.Tangent"
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "38e72987b3e94dbfbd8d4fe12a5473c7",
-    "m_Id": 3,
-    "m_DisplayName": "Out",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -808,7 +784,10 @@
             "m_Id": "4364c30667774120aa9e4bbf301eb732"
         },
         {
-            "m_Id": "7f185bf47319495199ac6ae1f17e8886"
+            "m_Id": "5d365a59cb1f4f40b65630d12b160e4e"
+        },
+        {
+            "m_Id": "6a46e00b2abe45f2b49b86da238a5609"
         }
     ]
 }
@@ -894,6 +873,33 @@
     "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
 }
 
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+    "m_ObjectId": "5d365a59cb1f4f40b65630d12b160e4e",
+    "m_Guid": {
+        "m_GuidSerialized": "d9334cbf-3baa-4e2c-b036-4620ebea0a03"
+    },
+    "m_Name": "Strength",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Strength",
+    "m_DefaultReferenceName": "_Strength",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 2,
+    "m_Hidden": false,
+    "m_Value": 0.0,
+    "m_FloatType": 0,
+    "m_RangeValues": {
+        "x": 0.0,
+        "y": 1.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
@@ -976,62 +982,27 @@
 }
 
 {
-    "m_SGVersion": 0,
+    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
+    "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword",
-    "m_ObjectId": "6cbf533a8d794e059dca786b1dd2958d",
+    "m_ObjectId": "6a46e00b2abe45f2b49b86da238a5609",
-    "m_Id": 0,
+    "m_Guid": {
-    "m_DisplayName": "EnableOutLine",
+        "m_GuidSerialized": "483f7689-c9b7-4a00-a6ae-b63380cd285c"
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": false,
-    "m_DefaultValue": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BranchNode",
-    "m_ObjectId": "6d48be02b56d43e4a864a7feb35bd3a0",
-    "m_Group": {
-        "m_Id": ""
     },
-    "m_Name": "Branch",
+    "m_Name": "Enable",
-    "m_DrawState": {
+    "m_DefaultRefNameVersion": 1,
-        "m_Expanded": true,
+    "m_RefNameGeneratedByDisplayName": "Enable",
-        "m_Position": {
+    "m_DefaultReferenceName": "_ENABLE",
-            "serializedVersion": "2",
+    "m_OverrideReferenceName": "",
-            "x": -647.0,
+    "m_GeneratePropertyBlock": true,
-            "y": 15.999998092651368,
+    "m_UseCustomSlotLabel": false,
-            "width": 208.00003051757813,
+    "m_CustomSlotLabel": "",
-            "height": 326.0000305175781
+    "m_KeywordType": 0,
-        }
+    "m_KeywordDefinition": 0,
-    },
+    "m_KeywordScope": 0,
-    "m_Slots": [
+    "m_KeywordStages": 63,
-        {
+    "m_Entries": [],
-            "m_Id": "8f9d9d18805346a0af8cc156ea6b3f11"
+    "m_Value": 0,
-        },
+    "m_IsEditable": true
-        {
-            "m_Id": "96e419aabfc2449299a29ab22cc68c8d"
-        },
-        {
-            "m_Id": "9a92b899b0084422ae30b56c55ca1dba"
-        },
-        {
-            "m_Id": "38e72987b3e94dbfbd8d4fe12a5473c7"
-        }
-    ],
-    "synonyms": [
-        "switch",
-        "if",
-        "else"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    }
 }
 
 {
@@ -1133,28 +1104,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty",
-    "m_ObjectId": "7f185bf47319495199ac6ae1f17e8886",
-    "m_Guid": {
-        "m_GuidSerialized": "09280983-93fa-4414-8894-e7eb81885b58"
-    },
-    "m_Name": "EnableOutLine",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "EnableOutLine",
-    "m_DefaultReferenceName": "_EnableOutLine",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": false
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
@@ -1275,68 +1224,6 @@
     }
 }
 
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
-    "m_ObjectId": "8f9d9d18805346a0af8cc156ea6b3f11",
-    "m_Id": 0,
-    "m_DisplayName": "Predicate",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Predicate",
-    "m_StageCapability": 3,
-    "m_Value": false,
-    "m_DefaultValue": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "96e419aabfc2449299a29ab22cc68c8d",
-    "m_Id": 1,
-    "m_DisplayName": "True",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "True",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 1.0,
-        "y": 1.0,
-        "z": 1.0,
-        "w": 1.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
-    "m_ObjectId": "9a92b899b0084422ae30b56c55ca1dba",
-    "m_Id": 2,
-    "m_DisplayName": "False",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "False",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    }
-}
-
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1444,6 +1331,47 @@
     "m_SupportVFX": false
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.KeywordNode",
+    "m_ObjectId": "bdb2c7921f404e0cafbb95aeefa1246b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Enable",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -618.0000610351563,
+            "y": 153.00001525878907,
+            "width": 208.00003051757813,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "c737aa3f80d64f8dab99106645d26517"
+        },
+        {
+            "m_Id": "2cd1d37e3c684870af326ec53312e367"
+        },
+        {
+            "m_Id": "0ac4e14a82e9487283cb3806bc2b5c86"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Keyword": {
+        "m_Id": "6a46e00b2abe45f2b49b86da238a5609"
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@@ -1576,6 +1504,30 @@
     "m_SerializedDescriptor": "SurfaceDescription.Metallic"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c737aa3f80d64f8dab99106645d26517",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",

BulkCargo_UnityProject/Assets/StreamingAssets/configure_api.json

@@ -2,8 +2,8 @@
   "GetCameraList": "/api/Camera/GetList",
   "GetCorporationInfo": "/api/Corporation/GetInfo",
   "GetYardList": "/api/Yard/GetYardList",
-  "GetYardStorage": "api/Yard/GetYardStorage",
+  "GetYardStorage": "/api/Yard/GetYardStorage",
-  "PostCheckYard": "api/Yard/CheckYard",
+  "PostCheckYard": "/api/Yard/CheckYard",
   "GetWeighterInfo": "/api/Weighter/GetInfo",
   "GetWeighterList": "/api/Weighter/GetList",
   "GetWeighterRealTimeData": "/api/Weighter/GetRealTimeData",