unknown 1 månad sedan
förälder
incheckning
38e6639b8f
31 ändrade filer med 6575 tillägg och 13637 borttagningar
  1. 1
    1
      Assembly-CSharp.csproj
  2. 76
    52
      Assets/Script/Main.cs
  3. 3
    127
      Assets/Script/SQL_ele_sys.cs
  4. 1
    1
      GoogleMobileAds.Editor.csproj
  5. Binär
      Library/ArtifactDB
  6. Binär
      Library/Bee/TundraBuildState.state
  7. Binär
      Library/Bee/TundraBuildState.state.map
  8. Binär
      Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.dll
  9. Binär
      Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.pdb
  10. Binär
      Library/Bee/artifacts/1900b0aE.dag/post-processed/Assembly-CSharp.dll
  11. Binär
      Library/Bee/artifacts/1900b0aE.dag/post-processed/Assembly-CSharp.pdb
  12. 1008
    1003
      Library/Bee/backend1.traceevents
  13. 3491
    2371
      Library/Bee/fullprofile.json
  14. Binär
      Library/Bee/tundra.digestcache
  15. 5
    5
      Library/Bee/tundra.log.json
  16. Binär
      Library/BurstCache/JIT/Hashes/a110ffe6b760e4b56cb86ae44bc7857d.bhc
  17. Binär
      Library/SceneVisibilityState.asset
  18. Binär
      Library/ScriptAssemblies/Assembly-CSharp.dll
  19. Binär
      Library/ScriptAssemblies/Assembly-CSharp.pdb
  20. Binär
      Library/Search/transactions.db
  21. Binär
      Library/SourceAssetDB
  22. 1
    1
      Library/StateCache/SceneView/5a/5a8433d8cbd566530e87c91830093f96.json
  23. 1
    1
      Library/ilpp.pid
  24. 0
    3658
      Logs/AssetImportWorker0-prev.log
  25. 998
    1387
      Logs/AssetImportWorker0.log
  26. 0
    3667
      Logs/AssetImportWorker1-prev.log
  27. 944
    1317
      Logs/AssetImportWorker1.log
  28. 43
    43
      UserSettings/Layouts/default-6000.dwlt
  29. 1
    1
      XCharts.Editor.csproj
  30. 1
    1
      XCharts.Examples.csproj
  31. 1
    1
      XCharts.Runtime.csproj

+ 1
- 1
Assembly-CSharp.csproj Visa fil

59
     <UnityVersion>6000.0.9f1</UnityVersion>
59
     <UnityVersion>6000.0.9f1</UnityVersion>
60
   </PropertyGroup>
60
   </PropertyGroup>
61
   <ItemGroup>
61
   <ItemGroup>
62
-    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
62
+    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.1.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />

+ 76
- 52
Assets/Script/Main.cs Visa fil

298
         string message = Encoding.UTF8.GetString(e.Message);
298
         string message = Encoding.UTF8.GetString(e.Message);
299
         // 使用 SimpleJSON 解析訊息
299
         // 使用 SimpleJSON 解析訊息
300
         var jsonMessage = JSON.Parse(message);
300
         var jsonMessage = JSON.Parse(message);
301
-        //Debug.Log(jsonMessage);
301
+        Debug.Log(jsonMessage);
302
         if (jsonMessage != null && jsonMessage["id"] != null && jsonMessage["data"] != null && jsonMessage["number"] != null)
302
         if (jsonMessage != null && jsonMessage["id"] != null && jsonMessage["data"] != null && jsonMessage["number"] != null)
303
         {
303
         {
304
             if (IDname == jsonMessage["id"] && jsonMessage["message"] == "return") {
304
             if (IDname == jsonMessage["id"] && jsonMessage["message"] == "return") {
309
                     if (Global.電表即時資料字典.ContainsKey(電表流水號)) {
309
                     if (Global.電表即時資料字典.ContainsKey(電表流水號)) {
310
                         Global.電表即時資料字典.Remove(電表流水號);
310
                         Global.電表即時資料字典.Remove(電表流水號);
311
                     }
311
                     }
312
-                    Global.電表即時資料字典.Add(電表流水號, dataStringArray);
312
+                    Global.電表即時資料字典.Add(電表流水號, dataStringArray[(0+47*i) ..(46+47*i)]);
313
                 }
313
                 }
314
             }
314
             }
315
         }
315
         }
353
             }
353
             }
354
             Global.載入電表名稱Option = true;
354
             Global.載入電表名稱Option = true;
355
         }
355
         }
356
-        if (Global.資料來源 == "pi" && timer >= 3f && Global.系統選擇 == "電能監控系統" && !電能報表_pl.activeInHierarchy && Global.PHP_Load_End_電表即時路徑){
356
+        if (Global.資料來源 == "pi" && timer >= 5f && Global.系統選擇 == "電能監控系統" && !電能報表_pl.activeInHierarchy && Global.PHP_Load_End_電表即時路徑){
357
             timer = 0f;
357
             timer = 0f;
358
             
358
             
359
             電表即時();
359
             電表即時();
937
             //Debug.Log(Global.Vavg);Debug.Log(Global.Iavg);
937
             //Debug.Log(Global.Vavg);Debug.Log(Global.Iavg);
938
             平均電壓_tb.text = Global.Vavg + " V";
938
             平均電壓_tb.text = Global.Vavg + " V";
939
             平均電流_tb.text = Global.Iavg + " A";
939
             平均電流_tb.text = Global.Iavg + " A";
940
-            累計用電量_tb.text = Global.Etol + " kWh";
940
+            if(電表編號_tb.text.Contains("小米")){
941
+                string SQL語法;
942
+                string 開始時間=DateTime.Today.ToString().PadLeft(4,'0')+"0100000000";
943
+                string 結束時間=DateTime.Today.ToString().PadLeft(4,'0')+"1232235959";
944
+                SQL語法 = @"SELECT SUM(CAST(EP1_2 AS FLOAT)) AS Expr1
945
+                                    FROM ["+DateTime.Today.ToString().PadLeft(4,'0')+@"-GCM-SCADA-DATA1].dbo.電表資料表 
946
+                                    WHERE (電表編號 LIKE N'"+電表編號+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+"')";
947
+                SQL_ele_sys.SQL_載入年度電費表格_改(SQL語法);
948
+                if(SQL_Module.dr.Read()){
949
+                    累計用電量_tb.text = SQL_Module.dr[0].ToString() +" kWh";
950
+                }else{
951
+                    累計用電量_tb.text = "0 kWh";
952
+                }
953
+            }else{
954
+                累計用電量_tb.text = Global.Etol + " kWh";
955
+            }
941
             if(Global.COSdata <=0){
956
             if(Global.COSdata <=0){
942
                 Global.功率因素數值  = Global.COSdata+100;
957
                 Global.功率因素數值  = Global.COSdata+100;
943
             }else{
958
             }else{
980
             電表資料(Global.電表ID2,電表編號,電表迴路);
995
             電表資料(Global.電表ID2,電表編號,電表迴路);
981
             副平均電壓_tb.text = Global.Vavg + " V";
996
             副平均電壓_tb.text = Global.Vavg + " V";
982
             副平均電流_tb.text = Global.Iavg + " A";
997
             副平均電流_tb.text = Global.Iavg + " A";
983
-            副累計用電量_tb.text = Global.Etol + " kWh";
998
+            if(副電表編號_tb.text.Contains("小米")){
999
+                string SQL語法;
1000
+                string 開始時間=DateTime.Today.Year.ToString().PadLeft(4,'0')+"0100000000";
1001
+                string 結束時間=DateTime.Today.Year.ToString().PadLeft(4,'0')+"1232235959";
1002
+                SQL語法 = @"SELECT SUM(CAST(EP1_2 AS FLOAT)) AS Expr1
1003
+                                    FROM ["+DateTime.Today.Year.ToString().PadLeft(4,'0')+@"-GCM-SCADA-DATA1].dbo.電表資料表 
1004
+                                    WHERE (電表編號 LIKE N'"+電表編號+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+"')";
1005
+                //Debug.Log(SQL語法);
1006
+                SQL_ele_sys.SQL_載入年度電費表格_改(SQL語法);
1007
+                if(SQL_Module.dr.Read()){
1008
+                    副累計用電量_tb.text = SQL_Module.dr[0].ToString() +" kWh";
1009
+                }else{
1010
+                    副累計用電量_tb.text = "0 kWh";
1011
+                }
1012
+            }else{
1013
+                副累計用電量_tb.text = Global.Etol + " kWh";
1014
+            }
984
             if(Global.COSdata <=0){
1015
             if(Global.COSdata <=0){
985
                 Global.副功率因素數值  = Global.COSdata+100;
1016
                 Global.副功率因素數值  = Global.COSdata+100;
986
             }else{
1017
             }else{
1134
         }
1165
         }
1135
     }
1166
     }
1136
     private void 電表資料(int num,string 電表編號,string 電表迴路){
1167
     private void 電表資料(int num,string 電表編號,string 電表迴路){
1168
+        Debug.Log(電表編號);
1137
         if(Global.資料來源=="PLC" && Global.PHP_Load_End){
1169
         if(Global.資料來源=="PLC" && Global.PHP_Load_End){
1138
             int index = num-1;
1170
             int index = num-1;
1139
             string[] PLC_data = new string[]{Global.PHP_Report,Global.PHP_Report3,Global.PHP_Report4,Global.PHP_Report5,Global.PHP_Report6,Global.PHP_Report7,Global.PHP_Report8};
1171
             string[] PLC_data = new string[]{Global.PHP_Report,Global.PHP_Report3,Global.PHP_Report4,Global.PHP_Report5,Global.PHP_Report6,Global.PHP_Report7,Global.PHP_Report8};
1663
                                         GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1695
                                         GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1664
                                 }else{
1696
                                 }else{
1665
                                     string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1697
                                     string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1666
-                                    SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1698
+                                    if(電表編號.Contains("小米")) {
1699
+                                        SQL語法+="(SELECT SUM(CAST(" + p2 + @" AS FLOAT)) AS Expr1
1700
+                                        FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1701
+                                        WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS 總P"+n.ToString()+",";
1702
+                                    }else{
1703
+                                        SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1667
                                         FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1704
                                         FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1668
                                         WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1705
                                         WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1706
+                                    }
1669
                                 }
1707
                                 }
1670
                             }
1708
                             }
1671
                         }
1709
                         }
1717
                 }
1755
                 }
1718
             }
1756
             }
1719
             年用電_chart.GetSerie<Line>(0).itemStyle.color=new Color(0.97f, 0.48f, 0.99f, 1f);
1757
             年用電_chart.GetSerie<Line>(0).itemStyle.color=new Color(0.97f, 0.48f, 0.99f, 1f);
1720
-            foreach (var series in 年用電_chart.series)
1721
-            {
1758
+            foreach (var series in 年用電_chart.series){
1722
                 series.symbol.type = SymbolType.Circle;
1759
                 series.symbol.type = SymbolType.Circle;
1723
             }
1760
             }
1724
         }
1761
         }
1791
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1828
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString()+") AS 總P"+n.ToString()+",";
1792
                         }else{
1829
                         }else{
1793
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1830
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1794
-                            SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1795
-                                FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1796
-                                WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1831
+                            if(電表編號.Contains("小米")) {
1832
+                                SQL語法+="(SELECT SUM(CAST(" + p2 + @" AS FLOAT)) AS Expr1
1833
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1834
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1835
+                            }else{
1836
+                                SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1837
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1838
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1839
+                            }
1840
+                            
1797
                         }
1841
                         }
1798
                     }
1842
                     }
1799
                 }
1843
                 }
1809
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1853
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1810
                         }else{
1854
                         }else{
1811
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1855
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1812
-                            SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1813
-                                FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1814
-                                WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1856
+                            if(電表編號.Contains("小米")) {
1857
+                                SQL語法+="(SELECT SUM(CAST(" + p2 + @" AS FLOAT)) AS Expr1
1858
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1859
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1860
+                            }else{
1861
+                                SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1
1862
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1863
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1864
+                            }
1865
+                            
1815
                         }
1866
                         }
1816
                         
1867
                         
1817
                     }
1868
                     }
1828
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1879
                                 GROUP BY CONVERT(VARCHAR(10), 上傳時間, 120)) AS DailyAverages_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1829
                         }else{
1880
                         }else{
1830
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1881
                             string p1,p2;if(電表迴路=="迴路1"){p1="EP1_1";p2="EP1_2";}else{p1="EP2_1";p2="EP2_2";}
1831
-                            SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1,上傳時間
1832
-                                FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1833
-                                WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1882
+                            if(電表編號.Contains("小米")) {
1883
+                                SQL語法+="(SELECT SUM(CAST(" + p2 + @" AS FLOAT)) AS Expr1
1884
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1885
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1886
+                            }else{
1887
+                                SQL語法+="(SELECT MAX(Expr1) - MIN(Expr1) AS Expr1_Difference FROM (SELECT CAST("+ p1 +" AS FLOAT) * 10000 + CAST("+p2+@" AS FLOAT) AS Expr1,上傳時間
1888
+                                    FROM ["+清單[j]+"].dbo.電表資料表  AS 電表資料表_"+n.ToString()+@"
1889
+                                    WHERE (電表編號 LIKE N'"+電表編號改+ "') AND (上傳時間 BETWEEN '"+開始時間+"' AND '"+結束時間+@"')) AS DailyAverages_"+n.ToString()+") AS 總P_"+n.ToString().PadLeft(2,'0')+"_"+j.ToString().PadLeft(2,'0')+",";
1890
+                            }
1834
                         }
1891
                         }
1835
                     }
1892
                     }
1836
                 }
1893
                 }
1837
             }
1894
             }
1838
             
1895
             
1839
             SQL語法 = SQL語法[..^",".Length];
1896
             SQL語法 = SQL語法[..^",".Length];
1840
-            Debug.Log(SQL語法);
1897
+            //Debug.Log(SQL語法);
1841
             SQL_ele_sys.SQL_載入區間表格_月_改(SQL語法);
1898
             SQL_ele_sys.SQL_載入區間表格_月_改(SQL語法);
1842
-            /*SQL_Module.da.Fill(ds1);
1843
-            string EP1_1,EP2_1, EP1_末,EP2_末;
1844
-            if (ds1.Tables[0].Rows.Count > 0){
1845
-                EP1_1 = ds1.Tables[0].Rows[0][0].ToString();
1846
-                EP2_1 = ds1.Tables[0].Rows[0][1].ToString();
1847
-                EP1_末 = ds1.Tables[0].Rows[^1][0].ToString();
1848
-                EP2_末 = ds1.Tables[0].Rows[^1][1].ToString();
1849
-            }else{
1850
-                EP1_1 = "0";
1851
-                EP2_1 = "0";
1852
-                EP1_末 = "0";
1853
-                EP2_末 = "0";
1854
-            }
1855
-            float 電1 = float.Parse(EP1_1) * 10000 + float.Parse(EP2_1);
1856
-            float 電2 = float.Parse(EP1_末) * 10000 + float.Parse(EP2_末);
1857
-            float 度數 = 電1-電2;
1858
-            Global.區間_總和 += 度數;*/
1859
-
1899
+            
1860
             if(SQL_Module.dr.Read()){
1900
             if(SQL_Module.dr.Read()){
1861
                 if(Global.電能報表區間時間選擇=="小時"){
1901
                 if(Global.電能報表區間時間選擇=="小時"){
1862
                     for(int n=0;n<=23;n++){
1902
                     for(int n=0;n<=23;n++){
1873
                         }
1913
                         }
1874
                         Global.區間_總和 += 度數;
1914
                         Global.區間_總和 += 度數;
1875
                         row["度數"]  = 度數.ToString("#,##0.##");
1915
                         row["度數"]  = 度數.ToString("#,##0.##");
1876
-                        /*if(Global.電表功率單位[電表編號_cb.GetComponent<TMP_Dropdown>().value] == "W"){
1877
-                            row["度數"] = (度數 / 1000).ToString("#,##0.##");
1878
-                        }else{
1879
-                            row["度數"]  = 度數.ToString("#,##0.##");
1880
-                        }*/
1881
                         ds3.Rows.Add(row);
1916
                         ds3.Rows.Add(row);
1882
                     }
1917
                     }
1883
                 }else if(Global.電能報表區間時間選擇=="日"){
1918
                 }else if(Global.電能報表區間時間選擇=="日"){
1895
                         }
1930
                         }
1896
                         Global.區間_總和 += 度數;
1931
                         Global.區間_總和 += 度數;
1897
                         row["度數"]  = 度數.ToString("#,##0.##");
1932
                         row["度數"]  = 度數.ToString("#,##0.##");
1898
-                        /*if(Global.電表功率單位[電表編號_cb.GetComponent<TMP_Dropdown>().value] == "W"){
1899
-                            row["度數"] = (度數 / 1000).ToString("#,##0.##");
1900
-                        }else{
1901
-                            row["度數"]  = 度數.ToString("#,##0.##");
1902
-                        }*/
1903
                         ds3.Rows.Add(row);
1933
                         ds3.Rows.Add(row);
1904
                     }
1934
                     }
1905
                 }else{
1935
                 }else{
1917
                         }
1947
                         }
1918
                         Global.區間_總和 += 度數;
1948
                         Global.區間_總和 += 度數;
1919
                         row["度數"]  = 度數.ToString("#,##0.##");
1949
                         row["度數"]  = 度數.ToString("#,##0.##");
1920
-                        /*if(Global.電表功率單位[電表編號_cb.GetComponent<TMP_Dropdown>().value] == "W"){
1921
-                            row["度數"] = (度數 / 1000).ToString("#,##0.##");
1922
-                           
1923
-                        }else{
1924
-                            row["度數"]  = 度數.ToString("#,##0.##");
1925
-                        }*/
1926
                         ds3.Rows.Add(row);
1950
                         ds3.Rows.Add(row);
1927
                     }
1951
                     }
1928
                 }
1952
                 }

+ 3
- 127
Assets/Script/SQL_ele_sys.cs Visa fil

49
     SQL_Module.SQL1 = "SELECT 資料庫名稱 FROM 資料庫控制表 WHERE 區域 LIKE N'"+區域+"' ";
49
     SQL_Module.SQL1 = "SELECT 資料庫名稱 FROM 資料庫控制表 WHERE 區域 LIKE N'"+區域+"' ";
50
     SQL_Module.CmdSet_For_DGV();
50
     SQL_Module.CmdSet_For_DGV();
51
   }
51
   }
52
-  /*public static void SQL_取得電表內容(){
53
-    SQL_Module.ConnOpen_電控SQL() ; SQL_Module.SQL1 = "SELECT  * FROM 電表一覽表 WHERE 電表編號=N'" + Main.Global.PA + "' ORDER BY id"; SQL_Module.CmdSet_For_dr();
54
-  }*/
55
-  /*public static void SQL_電表內容資料_dgv(){
56
-    SQL_Module.ConnOpen_電控資料SQL() ; SQL_Module.SQL1 = "SELECT TOP(10) * FROM 電表資料表 WHERE 電表編號 ='" + Main.Global.PA + "' ORDER BY 時間_年 DESC,時間_月 DESC,時間_日 DESC,時間_小時 DESC,時間_分 DESC,時間_秒 DESC" ; SQL_Module.CmdSet_For_DGV();
57
-  }*/
58
   public static void SQL_電表內容資料清單載入_月(string SQL語法){
52
   public static void SQL_電表內容資料清單載入_月(string SQL語法){
59
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV();
53
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV();
60
-    /*SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 , 時間_日 ,AVG(CONVERT(float,總平均功率 )) 
61
-                        FROM (
62
-                        SELECT * FROM [" + Main.Global.電表資料資料庫清單.Rows[0][0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
63
-                        UNION ALL
64
-                        SELECT * FROM [" + Main.Global.電表資料資料庫清單.Rows[1][0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
65
-                        UNION ALL
66
-                        SELECT * FROM [" + Main.Global.電表資料資料庫清單.Rows[2][0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
67
-                        ) AS all_data
68
-                        GROUP BY 時間_年, 時間_月, 時間_日
69
-                        ORDER BY 時間_年, 時間_月, 時間_日";*/
70
   }
54
   }
71
   public static void SQL_電力排碳試算(string SQL語法){
55
   public static void SQL_電力排碳試算(string SQL語法){
72
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV_C();
56
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV_C();
73
   }
57
   }
74
-  /*public static void SQL_取得電表編號_dr(){
75
-    SQL_Module.ConnOpen_電控SQL() ; SQL_Module.SQL1 = "SELECT  電表編號 FROM 電表一覽表 WHERE ( id = '" + Main.Global.PK + "' )" ; SQL_Module.CmdSet_For_dr();
76
-  }*/
77
-  /*public static void SQL_取得電表名稱_A(){
78
-    SQL_Module.ConnOpen_電控SQL() ; SQL_Module.SQL1 = "SELECT  DISTINCT 電表編號,id FROM 電表一覽表 order by id" ; SQL_Module.CmdSet_For_DGV();
79
-  }*/
80
-  /*public static void SQL_電表內容資料_dr(){
81
-    SQL_Module.ConnOpen_電控資料SQL() ; SQL_Module.SQL1 = "SELECT TOP(10) * FROM 電表資料表 WHERE 電表編號 ='" + Main.Global.PA + "' ORDER BY 時間_年 DESC,時間_月 DESC,時間_日 DESC,時間_小時 DESC,時間_分 DESC,時間_秒 DESC" ; SQL_Module.CmdSet_For_dr();
82
-  }*/
83
-  /*public static void SQL_電表內容資料清單載入_小時(){
84
-    SQL_Module.ConnOpen_電控資料SQL();
85
-    SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 , 時間_日 , 時間_小時 ,時間_分, 電壓L_L_Avg ,電流Avg , 總平均功率 
86
-                        FROM (
87
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + @"' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_開始時間 + @"5959')
88
-                        UNION ALL
89
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_開始時間 + @"5959')
90
-                        UNION ALL
91
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_開始時間 + @"5959')
92
-                        ) AS all_data
93
-                        GROUP BY 時間_年, 時間_月, 時間_日, 時間_小時,時間_分, 電壓L_L_Avg ,電流Avg , 總平均功率
94
-                        ORDER BY 時間_年, 時間_月, 時間_日, 時間_小時,時間_分, 電壓L_L_Avg ,電流Avg , 總平均功率";
95
-    SQL_Module.CmdSet_For_DGV_B();
96
-  }*/
97
-  /*public static void SQL_電表內容資料詳細載入_日(){
98
-    SQL_Module.ConnOpen_電控資料SQL();
99
-    SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 , 時間_日 , 時間_小時 , AVG(CONVERT(float,電壓L_L_Avg)),AVG(CONVERT(float,電流Avg )),AVG(CONVERT(float,總平均功率 ))
100
-                        FROM (
101
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + @"' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
102
-                        UNION ALL
103
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
104
-                        UNION ALL
105
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
106
-                        ) AS all_data
107
-                        GROUP BY 時間_年, 時間_月, 時間_日, 時間_小時
108
-                        ORDER BY 時間_年, 時間_月, 時間_日, 時間_小時";
109
-    SQL_Module.CmdSet_For_DGV_B();
110
-  }*/
58
+ 
111
   public static void SQL_電表內容資料詳細載入_月(string SQL語法){
59
   public static void SQL_電表內容資料詳細載入_月(string SQL語法){
112
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV();
60
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_DGV();
113
-    /*SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 , 時間_日 , AVG(CONVERT(float,電壓L_L_Avg)),AVG(CONVERT(float,電流Avg )),AVG(CONVERT(float,總平均功率 ))
114
-                        FROM (
115
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
116
-                        UNION ALL
117
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
118
-                        UNION ALL
119
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
120
-                        ) AS all_data
121
-                        GROUP BY 時間_年, 時間_月, 時間_日
122
-                        ORDER BY 時間_年, 時間_月, 時間_日";*/
123
   }
61
   }
124
   public static void SQL_取得電費試算資料(){
62
   public static void SQL_取得電費試算資料(){
125
     SQL_Module.ConnOpen_電控資料SQL();
63
     SQL_Module.ConnOpen_電控資料SQL();
126
     SQL_Module.SQL1 = "SELECT AVG(CONVERT(float,電壓L_L_Avg)),AVG(CONVERT(float,電流Avg )),AVG(CONVERT(float,總平均功率 )) FROM 電表資料表 WHERE 電表編號='" + Main.Global.PA + "' and (上傳時間 BETWEEN '" + Main.Global.試算_開始時間 + "000000' AND '" + Main.Global.試算_結束時間 +"235959' )";
64
     SQL_Module.SQL1 = "SELECT AVG(CONVERT(float,電壓L_L_Avg)),AVG(CONVERT(float,電流Avg )),AVG(CONVERT(float,總平均功率 )) FROM 電表資料表 WHERE 電表編號='" + Main.Global.PA + "' and (上傳時間 BETWEEN '" + Main.Global.試算_開始時間 + "000000' AND '" + Main.Global.試算_結束時間 +"235959' )";
127
     SQL_Module.CmdSet_For_dr();
65
     SQL_Module.CmdSet_For_dr();
128
   }
66
   }
129
-  /*public static void SQL_電表內容資料清單載入_日(){
130
-    SQL_Module.ConnOpen_電控資料SQL();
131
-    SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 , 時間_日 , 時間_小時 , AVG(CONVERT(float,電壓L_L_Avg)),AVG(CONVERT(float,電流Avg )),AVG(CONVERT(float,總平均功率 ))
132
-                        FROM (
133
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + @"' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
134
-                        UNION ALL
135
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
136
-                        UNION ALL
137
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "0000' AND '" + Main.Global.區間_結束時間 + @"5959')
138
-                        ) AS all_data
139
-                        GROUP BY 時間_年, 時間_月, 時間_日, 時間_小時
140
-                        ORDER BY 時間_年, 時間_月, 時間_日, 時間_小時";
141
-    SQL_Module.CmdSet_For_DGV_B();
142
-  }*/
143
-  
144
-  /*public static void SQL_載入年度資料(){
145
-    SQL_Module.ConnOpen_電控資料SQL();
146
-    SQL_Module.SQL1 = @"SELECT DISTINCT 時間_年 , 時間_月 ,  AVG(CONVERT(float, 總平均功率)) 
147
-                        FROM (
148
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
149
-                        UNION ALL
150
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
151
-                        UNION ALL
152
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
153
-                        ) AS all_data
154
-                        GROUP BY 時間_年, 時間_月
155
-                        ORDER BY 時間_年, 時間_月";
156
-    SQL_Module.CmdSet_For_DGV_B();
157
-  }*/
158
   public static void SQL_載入年度電費表格_改(string SQL語法){
67
   public static void SQL_載入年度電費表格_改(string SQL語法){
159
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_dr();
68
     SQL_Module.ConnOpen_電控SQL();SQL_Module.SQL1 = SQL語法;SQL_Module.CmdSet_For_dr();
160
   }
69
   }
165
     SQL_Module.ConnOpen_電控資料SQL();
74
     SQL_Module.ConnOpen_電控資料SQL();
166
     SQL_Module.CmdSet_For_DGV_B();
75
     SQL_Module.CmdSet_For_DGV_B();
167
   }
76
   }
168
-  
169
   public static void SQL_載入電費表格_日(){
77
   public static void SQL_載入電費表格_日(){
170
-    SQL_Module.ConnOpen_電控資料SQL();
171
-    /*SQL_Module.SQL1 = "SELECT DISTINCT 時間_年 AS '" + Main.Global.表頭[14] + "', 時間_月 AS '" + Main.Global.表頭[15] + "', 時間_日 AS '" + Main.Global.表頭[16] + "', AVG(CONVERT(float, 總平均功率)) * 24 AS '" + Main.Global.表頭[18] + "' , 時間_日 AS '" + Main.Global.表頭[19] + @"'
172
-                        FROM (
173
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
174
-                        UNION ALL
175
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
176
-                        UNION ALL
177
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
178
-                        ) AS all_data
179
-                        GROUP BY 時間_年, 時間_月, 時間_日
180
-                        ORDER BY 時間_年, 時間_月, 時間_日";*/
181
-    SQL_Module.CmdSet_For_DGV_B();
78
+    SQL_Module.ConnOpen_電控資料SQL();SQL_Module.CmdSet_For_DGV_B();
182
   }
79
   }
183
   public static void SQL_載入電費表格_月(){
80
   public static void SQL_載入電費表格_月(){
184
-    SQL_Module.ConnOpen_電控資料SQL();
185
-    /*SQL_Module.SQL1 = "SELECT DISTINCT 時間_年 AS '" + Main.Global.表頭[14] + "', 時間_月 AS '" + Main.Global.表頭[15] + "',  AVG(CONVERT(float, 總平均功率)) AS '" + Main.Global.表頭[18] + "' , 時間_月 AS '" + Main.Global.表頭[19] + @"'
186
-                        FROM (
187
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[0] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
188
-                        UNION ALL
189
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[1] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
190
-                        UNION ALL
191
-                        SELECT * FROM [" + Main.Global.電表資料資料庫名稱[2] + "].dbo.電表資料表 WHERE 電表編號='" + Main.Global.PA7 + "' AND (上傳時間 BETWEEN '" + Main.Global.區間_開始時間 + "000000' AND '" + Main.Global.區間_結束時間 + @"235959')
192
-                        ) AS all_data
193
-                        GROUP BY 時間_年, 時間_月
194
-                        ORDER BY 時間_年, 時間_月";*/
195
-    SQL_Module.CmdSet_For_DGV_B();
81
+    SQL_Module.ConnOpen_電控資料SQL();SQL_Module.CmdSet_For_DGV_B();
196
   }
82
   }
197
-  /*public static void SQL_電表資料寫入(){
198
-    SQL_Module.ConnOpen_電控SQL();
199
-    SQL_Module.SQL1 = Main.Global.PC;
200
-    SQL_Module.CmdSet_For_dr();
201
-  }*/
202
-  /*public static void SQL_載入系統權限(){
203
-    SQL_Module.ConnOpen_電控SQL();
204
-    SQL_Module.SQL1 =  "SELECT " + SQL_Module.系統功能權限 + " FROM GCM資料表 WHERE id='" + Main.Global.權限編號 + "'";
205
-    SQL_Module.CmdSet_For_dr();
206
-  }*/
207
 }
83
 }

+ 1
- 1
GoogleMobileAds.Editor.csproj Visa fil

59
     <UnityVersion>6000.0.9f1</UnityVersion>
59
     <UnityVersion>6000.0.9f1</UnityVersion>
60
   </PropertyGroup>
60
   </PropertyGroup>
61
   <ItemGroup>
61
   <ItemGroup>
62
-    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
62
+    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.1.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />

Binär
Library/ArtifactDB Visa fil


Binär
Library/Bee/TundraBuildState.state Visa fil


Binär
Library/Bee/TundraBuildState.state.map Visa fil


Binär
Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.dll Visa fil


Binär
Library/Bee/artifacts/1900b0aE.dag/Assembly-CSharp.pdb Visa fil


Binär
Library/Bee/artifacts/1900b0aE.dag/post-processed/Assembly-CSharp.dll Visa fil


Binär
Library/Bee/artifacts/1900b0aE.dag/post-processed/Assembly-CSharp.pdb Visa fil


+ 1008
- 1003
Library/Bee/backend1.traceevents
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 3491
- 2371
Library/Bee/fullprofile.json
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


Binär
Library/Bee/tundra.digestcache Visa fil


+ 5
- 5
Library/Bee/tundra.log.json
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


Binär
Library/BurstCache/JIT/Hashes/a110ffe6b760e4b56cb86ae44bc7857d.bhc Visa fil


Binär
Library/SceneVisibilityState.asset Visa fil


Binär
Library/ScriptAssemblies/Assembly-CSharp.dll Visa fil


Binär
Library/ScriptAssemblies/Assembly-CSharp.pdb Visa fil


Binär
Library/Search/transactions.db Visa fil


Binär
Library/SourceAssetDB Visa fil


+ 1
- 1
Library/StateCache/SceneView/5a/5a8433d8cbd566530e87c91830093f96.json Visa fil

1
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":598.139404296875,"y":303.9681396484375,"z":-4.5570387840271},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":465.7135314941406,"orthographic":true}
1
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":true,"pivot":{"x":964.5087280273438,"y":515.9642333984375,"z":-5.790218353271484},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":589.0311889648438,"orthographic":true}

+ 1
- 1
Library/ilpp.pid Visa fil

1
-17984
1
+17196

+ 0
- 3658
Logs/AssetImportWorker0-prev.log
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 998
- 1387
Logs/AssetImportWorker0.log
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 0
- 3667
Logs/AssetImportWorker1-prev.log
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 944
- 1317
Logs/AssetImportWorker1.log
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 43
- 43
UserSettings/Layouts/default-6000.dwlt Visa fil

19
     width: 1920
19
     width: 1920
20
     height: 989
20
     height: 989
21
   m_ShowMode: 4
21
   m_ShowMode: 4
22
-  m_Title: "\u904A\u6232"
22
+  m_Title: "\u63A7\u5236\u53F0"
23
   m_RootView: {fileID: 2}
23
   m_RootView: {fileID: 2}
24
   m_MinSize: {x: 875, y: 306}
24
   m_MinSize: {x: 875, y: 306}
25
   m_MaxSize: {x: 10000, y: 10000}
25
   m_MaxSize: {x: 10000, y: 10000}
141
     serializedVersion: 2
141
     serializedVersion: 2
142
     x: 0
142
     x: 0
143
     y: 0
143
     y: 0
144
-    width: 1103
144
+    width: 1102
145
     height: 933
145
     height: 933
146
   m_MinSize: {x: 100, y: 100}
146
   m_MinSize: {x: 100, y: 100}
147
   m_MaxSize: {x: 8096, y: 16192}
147
   m_MaxSize: {x: 8096, y: 16192}
165
     serializedVersion: 2
165
     serializedVersion: 2
166
     x: 0
166
     x: 0
167
     y: 0
167
     y: 0
168
-    width: 1103
169
-    height: 297
168
+    width: 1102
169
+    height: 372
170
   m_MinSize: {x: 200, y: 200}
170
   m_MinSize: {x: 200, y: 200}
171
   m_MaxSize: {x: 4000, y: 4000}
171
   m_MaxSize: {x: 4000, y: 4000}
172
   m_ActualView: {fileID: 14}
172
   m_ActualView: {fileID: 14}
191
   m_Position:
191
   m_Position:
192
     serializedVersion: 2
192
     serializedVersion: 2
193
     x: 0
193
     x: 0
194
-    y: 297
195
-    width: 1103
196
-    height: 636
194
+    y: 372
195
+    width: 1102
196
+    height: 561
197
   m_MinSize: {x: 201, y: 226}
197
   m_MinSize: {x: 201, y: 226}
198
   m_MaxSize: {x: 4001, y: 4026}
198
   m_MaxSize: {x: 4001, y: 4026}
199
   m_ActualView: {fileID: 16}
199
   m_ActualView: {fileID: 16}
220
   - {fileID: 11}
220
   - {fileID: 11}
221
   m_Position:
221
   m_Position:
222
     serializedVersion: 2
222
     serializedVersion: 2
223
-    x: 1103
223
+    x: 1102
224
     y: 0
224
     y: 0
225
     width: 401
225
     width: 401
226
     height: 933
226
     height: 933
227
   m_MinSize: {x: 100, y: 100}
227
   m_MinSize: {x: 100, y: 100}
228
   m_MaxSize: {x: 8096, y: 16192}
228
   m_MaxSize: {x: 8096, y: 16192}
229
   vertical: 1
229
   vertical: 1
230
-  controlID: 71
230
+  controlID: 50
231
   draggingID: 0
231
   draggingID: 0
232
 --- !u!114 &10
232
 --- !u!114 &10
233
 MonoBehaviour:
233
 MonoBehaviour:
296
   m_Children: []
296
   m_Children: []
297
   m_Position:
297
   m_Position:
298
     serializedVersion: 2
298
     serializedVersion: 2
299
-    x: 1504
299
+    x: 1503
300
     y: 0
300
     y: 0
301
-    width: 416
301
+    width: 417
302
     height: 933
302
     height: 933
303
   m_MinSize: {x: 276, y: 76}
303
   m_MinSize: {x: 276, y: 76}
304
   m_MaxSize: {x: 4001, y: 4026}
304
   m_MaxSize: {x: 4001, y: 4026}
329
   m_Pos:
329
   m_Pos:
330
     serializedVersion: 2
330
     serializedVersion: 2
331
     x: 0
331
     x: 0
332
-    y: 635
333
-    width: 1102
334
-    height: 351
332
+    y: 451
333
+    width: 1101
334
+    height: 535
335
   m_SerializedDataModeController:
335
   m_SerializedDataModeController:
336
     m_DataMode: 0
336
     m_DataMode: 0
337
     m_PreferredDataMode: 0
337
     m_PreferredDataMode: 0
366
     serializedVersion: 2
366
     serializedVersion: 2
367
     x: 0
367
     x: 0
368
     y: 79
368
     y: 79
369
-    width: 1102
370
-    height: 271
369
+    width: 1101
370
+    height: 346
371
   m_SerializedDataModeController:
371
   m_SerializedDataModeController:
372
     m_DataMode: 0
372
     m_DataMode: 0
373
     m_PreferredDataMode: 0
373
     m_PreferredDataMode: 0
922
   m_AudioPlay: 0
922
   m_AudioPlay: 0
923
   m_DebugDrawModesUseInteractiveLightBakingData: 0
923
   m_DebugDrawModesUseInteractiveLightBakingData: 0
924
   m_Position:
924
   m_Position:
925
-    m_Target: {x: 598.1394, y: 303.96814, z: -4.557039}
925
+    m_Target: {x: 964.5087, y: 515.96423, z: -5.7902184}
926
     speed: 2
926
     speed: 2
927
-    m_Value: {x: 598.1394, y: 303.96814, z: -4.557039}
927
+    m_Value: {x: 964.5087, y: 515.96423, z: -5.7902184}
928
   m_RenderMode: 0
928
   m_RenderMode: 0
929
   m_CameraMode:
929
   m_CameraMode:
930
     drawMode: 0
930
     drawMode: 0
974
     speed: 2
974
     speed: 2
975
     m_Value: {x: 0, y: 0, z: 0, w: 1}
975
     m_Value: {x: 0, y: 0, z: 0, w: 1}
976
   m_Size:
976
   m_Size:
977
-    m_Target: 465.71353
977
+    m_Target: 589.0312
978
     speed: 2
978
     speed: 2
979
-    m_Value: 465.71353
979
+    m_Value: 589.0312
980
   m_Ortho:
980
   m_Ortho:
981
     m_Target: 1
981
     m_Target: 1
982
     speed: 2
982
     speed: 2
1288
   m_Pos:
1288
   m_Pos:
1289
     serializedVersion: 2
1289
     serializedVersion: 2
1290
     x: 0
1290
     x: 0
1291
-    y: 376
1292
-    width: 1102
1293
-    height: 610
1291
+    y: 451
1292
+    width: 1101
1293
+    height: 535
1294
   m_SerializedDataModeController:
1294
   m_SerializedDataModeController:
1295
     m_DataMode: 0
1295
     m_DataMode: 0
1296
     m_PreferredDataMode: 0
1296
     m_PreferredDataMode: 0
1346
       serializedVersion: 2
1346
       serializedVersion: 2
1347
       x: 0
1347
       x: 0
1348
       y: 21
1348
       y: 21
1349
-      width: 1102
1350
-      height: 589
1351
-    m_Scale: {x: 0.5453704, y: 0.5453704}
1352
-    m_Translation: {x: 551, y: 294.50003}
1349
+      width: 1101
1350
+      height: 514
1351
+    m_Scale: {x: 0.47592592, y: 0.47592592}
1352
+    m_Translation: {x: 550.5, y: 257}
1353
     m_MarginLeft: 0
1353
     m_MarginLeft: 0
1354
     m_MarginRight: 0
1354
     m_MarginRight: 0
1355
     m_MarginTop: 0
1355
     m_MarginTop: 0
1356
     m_MarginBottom: 0
1356
     m_MarginBottom: 0
1357
     m_LastShownAreaInsideMargins:
1357
     m_LastShownAreaInsideMargins:
1358
       serializedVersion: 2
1358
       serializedVersion: 2
1359
-      x: -1010.3225
1359
+      x: -1156.6926
1360
       y: -540
1360
       y: -540
1361
-      width: 2020.645
1361
+      width: 2313.3853
1362
       height: 1080
1362
       height: 1080
1363
     m_MinimalGUI: 1
1363
     m_MinimalGUI: 1
1364
-  m_defaultScale: 0.5453704
1365
-  m_LastWindowPixelSize: {x: 1102, y: 610}
1364
+  m_defaultScale: 0.47592592
1365
+  m_LastWindowPixelSize: {x: 1101, y: 535}
1366
   m_ClearInEditMode: 1
1366
   m_ClearInEditMode: 1
1367
   m_NoCameraWarning: 1
1367
   m_NoCameraWarning: 1
1368
   m_LowResolutionForAspectRatios: 01000101000000000000
1368
   m_LowResolutionForAspectRatios: 01000101000000000000
1390
   m_Pos:
1390
   m_Pos:
1391
     serializedVersion: 2
1391
     serializedVersion: 2
1392
     x: 0
1392
     x: 0
1393
-    y: 369
1394
-    width: 1102
1395
-    height: 617
1393
+    y: 727
1394
+    width: 1101
1395
+    height: 259
1396
   m_SerializedDataModeController:
1396
   m_SerializedDataModeController:
1397
     m_DataMode: 0
1397
     m_DataMode: 0
1398
     m_PreferredDataMode: 0
1398
     m_PreferredDataMode: 0
1406
     m_OverlaysVisible: 1
1406
     m_OverlaysVisible: 1
1407
   m_LockTracker:
1407
   m_LockTracker:
1408
     m_IsLocked: 0
1408
     m_IsLocked: 0
1409
-  m_LastSelectedObjectID: 45270
1409
+  m_LastSelectedObjectID: 41652
1410
 --- !u!114 &18
1410
 --- !u!114 &18
1411
 MonoBehaviour:
1411
 MonoBehaviour:
1412
   m_ObjectHideFlags: 52
1412
   m_ObjectHideFlags: 52
1428
     m_TextWithWhitespace: "\u968E\u5C64\u200B"
1428
     m_TextWithWhitespace: "\u968E\u5C64\u200B"
1429
   m_Pos:
1429
   m_Pos:
1430
     serializedVersion: 2
1430
     serializedVersion: 2
1431
-    x: 1103
1431
+    x: 1102
1432
     y: 79
1432
     y: 79
1433
     width: 399
1433
     width: 399
1434
     height: 379
1434
     height: 379
1445
     m_OverlaysVisible: 1
1445
     m_OverlaysVisible: 1
1446
   m_SceneHierarchy:
1446
   m_SceneHierarchy:
1447
     m_TreeViewState:
1447
     m_TreeViewState:
1448
-      scrollPos: {x: 0, y: 426}
1449
-      m_SelectedIDs: 
1450
-      m_LastClickedID: 0
1451
-      m_ExpandedIDs: c0faffff48920000d4990000be9c00005a9d000020a2000090a300001ca40000d0a500003ca9000068b10000ceb900000cbb0000cabe000034bf00005cbf0000
1448
+      scrollPos: {x: 0, y: 16}
1449
+      m_SelectedIDs: b4a20000
1450
+      m_LastClickedID: 41652
1451
+      m_ExpandedIDs: c0faffff48920000f8920000d49900003a9a0000be9c00005a9d0000b4a20000d0a500003ca90000c8aa0000eaab00004ab00000b6b40000a4b70000f8b8000082b90000cabe0000
1452
       m_RenameOverlay:
1452
       m_RenameOverlay:
1453
         m_UserAcceptedRename: 0
1453
         m_UserAcceptedRename: 0
1454
         m_Name: 
1454
         m_Name: 
1494
     m_TextWithWhitespace: "\u5C08\u6848\u200B"
1494
     m_TextWithWhitespace: "\u5C08\u6848\u200B"
1495
   m_Pos:
1495
   m_Pos:
1496
     serializedVersion: 2
1496
     serializedVersion: 2
1497
-    x: 1103
1497
+    x: 1102
1498
     y: 484
1498
     y: 484
1499
     width: 399
1499
     width: 399
1500
     height: 502
1500
     height: 502
1647
     m_TextWithWhitespace: "\u6AA2\u67E5\u5668\u200B"
1647
     m_TextWithWhitespace: "\u6AA2\u67E5\u5668\u200B"
1648
   m_Pos:
1648
   m_Pos:
1649
     serializedVersion: 2
1649
     serializedVersion: 2
1650
-    x: 1504
1650
+    x: 1503
1651
     y: 79
1651
     y: 79
1652
-    width: 415
1652
+    width: 416
1653
     height: 907
1653
     height: 907
1654
   m_SerializedDataModeController:
1654
   m_SerializedDataModeController:
1655
     m_DataMode: 0
1655
     m_DataMode: 0

+ 1
- 1
XCharts.Editor.csproj Visa fil

59
     <UnityVersion>6000.0.9f1</UnityVersion>
59
     <UnityVersion>6000.0.9f1</UnityVersion>
60
   </PropertyGroup>
60
   </PropertyGroup>
61
   <ItemGroup>
61
   <ItemGroup>
62
-    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
62
+    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.1.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />

+ 1
- 1
XCharts.Examples.csproj Visa fil

59
     <UnityVersion>6000.0.9f1</UnityVersion>
59
     <UnityVersion>6000.0.9f1</UnityVersion>
60
   </PropertyGroup>
60
   </PropertyGroup>
61
   <ItemGroup>
61
   <ItemGroup>
62
-    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
62
+    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.1.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />

+ 1
- 1
XCharts.Runtime.csproj Visa fil

59
     <UnityVersion>6000.0.9f1</UnityVersion>
59
     <UnityVersion>6000.0.9f1</UnityVersion>
60
   </PropertyGroup>
60
   </PropertyGroup>
61
   <ItemGroup>
61
   <ItemGroup>
62
-    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
62
+    <Analyzer Include="C:\Users\tlton\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.1.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
63
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
64
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
65
     <Analyzer Include="D:\Unity\6000.0.9f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />

Loading…
Avbryt
Spara