优化数据输出

Funny-ppt · Mar 23, 2024 · db0c063 · db0c063
1 parent 087fb16
commit db0c063
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/InfrastSim/TimeDriven/FacilityBase.cs b/InfrastSim/TimeDriven/FacilityBase.cs
@@ -163,7 +163,7 @@ public void ToJson(Utf8JsonWriter writer, bool detailed = false) {
 
         if (detailed) {
             writer.WriteNumber("base-efficiency", (100 + EffiencyModifier) / 100.0);
-            writer.WriteNumber("operators-efficiency", WorkingOperators.Sum(op => op.EfficiencyModifier));
+            writer.WriteNumber("operators-efficiency", WorkingOperators.Sum(op => op.EfficiencyModifier) / 100.0);
         }
 
         writer.WriteEndObject();

diff --git a/InfrastSim/TimeDriven/ManufacturingStation.cs b/InfrastSim/TimeDriven/ManufacturingStation.cs
@@ -89,8 +89,8 @@ public int ApplyDrones(Simulator simu, int amount) {
 
     protected override void WriteDerivedContent(Utf8JsonWriter writer, bool detailed = false) {
         writer.WriteNumber("product-index", Array.IndexOf(Product.AllProducts, Product));
-        writer.WriteNumber("progress", Progress);
         writer.WriteNumber("product-count", ProductCount);
+        writer.WriteNumber("progress", Progress);
 
         if (detailed) {
             if (Product != null) writer.WriteString("product", Product.Name);

diff --git a/InfrastSim/TimeDriven/Simulator.cs b/InfrastSim/TimeDriven/Simulator.cs
@@ -361,15 +361,15 @@ public void ToJson(Utf8JsonWriter writer, bool detailed = false) {
         Random.ToJson(writer);
         writer.WriteNumber("drones", _drones);
         writer.WriteNumber("refresh", _refresh);
-        writer.WriteNumber("total-manu-product", _totalManuProgress);
-        writer.WriteNumber("total-trad-product", _totalTradProgress);
-        writer.WriteNumber("total-office-product", _totalOfficeProgress);
-        writer.WriteNumber("total-drones-product", _totalDronesProgress);
+        writer.WriteNumber("total-manu-progress", _totalManuProgress);
+        writer.WriteNumber("total-trad-progress", _totalTradProgress);
+        writer.WriteNumber("total-office-progress", _totalOfficeProgress);
+        writer.WriteNumber("total-drones-progress", _totalDronesProgress);
         if (detailed) {
-            writer.WriteNumber("drones-efficiency", DronesEfficiency);
-            writer.WriteNumber("office-efficiency", OfficeEfficiency);
-            writer.WriteNumber("manufacturing-efficiency", ManufacturingEfficiency);
-            writer.WriteNumber("trading-efficiency", TradingEfficiency);
+            writer.WriteNumber("drones-efficiency", DronesEfficiency / 100.0);
+            writer.WriteNumber("office-efficiency", OfficeEfficiency / 100.0);
+            writer.WriteNumber("manufacturing-efficiency", ManufacturingEfficiency / 100.0);
+            writer.WriteNumber("trading-efficiency", TradingEfficiency / 100.0);
         }
 
         writer.WritePropertyName("operators");

diff --git a/InfrastSim/TimeDriven/TradingStation.cs b/InfrastSim/TimeDriven/TradingStation.cs
@@ -140,9 +140,9 @@ public int ApplyDrones(Simulator simu, int amount) {
 
 
     protected override void WriteDerivedContent(Utf8JsonWriter writer, bool detailed = false) {
+        writer.WriteString("strategy", Strategy.ToString());
         writer.WriteItem("current-order", CurrentOrder, detailed);
         writer.WriteNumber("progress", Progress); ;
-        writer.WriteString("strategy", Strategy.ToString());
         writer.WritePropertyName("orders");
         writer.WriteStartArray();
         foreach (var order in Orders) {