chenxiangxue
/
FuZhou_Custom_BulkCargo_3D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交日志-20240723-1356： 

1、修改了接口参数；
2、修改了在库总量显示单位；
This commit is contained in:
Afeijia 2024-07-23 13:55:58 +08:00
parent b7108c4aec
commit 286dcc556e
4 changed files with 78 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
BulkCargo_UnityProject/Assets/DatePicker/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long

66
BulkCargo_UnityProject/Assets/Scenes/MainScene.unity
View File

@ -1622,7 +1622,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 9999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f57e7ba67f971a74fa4debc8fe9fd872, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: f57e7ba67f971a74fa4debc8fe9fd872,
@ -1871,9 +1871,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -208, y: 3.2000008}
m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -98.000015, y: 3.2000122}
m_SizeDelta: {x: 105, y: 30}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &189246253
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1894,7 +1894,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f57e7ba67f971a74fa4debc8fe9fd872, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: f57e7ba67f971a74fa4debc8fe9fd872,
@ -1929,7 +1929,7 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 3
m_HorizontalAlignment: 2
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 120.2
@ -2538,7 +2538,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 9999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f57e7ba67f971a74fa4debc8fe9fd872, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: f57e7ba67f971a74fa4debc8fe9fd872,
@ -3152,7 +3152,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 6548
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -4833,7 +4833,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 15
m_text: 00
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -4871,7 +4871,7 @@ MonoBehaviour:
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 50
m_characterSpacing: 48
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
@ -5415,7 +5415,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 6548
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -5919,7 +5919,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 15
m_text: 00
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -5957,7 +5957,7 @@ MonoBehaviour:
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 50
m_characterSpacing: 48
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
@ -7271,7 +7271,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -7930,8 +7930,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -62, y: -1.5}
m_SizeDelta: {x: 62, y: 30}
m_AnchoredPosition: {x: -52, y: -1.5}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &838790294
MonoBehaviour:
@ -7953,7 +7953,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 77
m_text: 00
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -7988,7 +7988,7 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 3
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 116.5
@ -8090,7 +8090,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 848123.22
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -8897,7 +8897,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 9999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f57e7ba67f971a74fa4debc8fe9fd872, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: f57e7ba67f971a74fa4debc8fe9fd872,
@ -9409,7 +9409,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -208, y: 3.2000008}
m_AnchoredPosition: {x: -218, y: 3.2000008}
m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &947476863
@ -9432,7 +9432,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 999
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f57e7ba67f971a74fa4debc8fe9fd872, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: f57e7ba67f971a74fa4debc8fe9fd872,
@ -9467,7 +9467,7 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 3
m_HorizontalAlignment: 2
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 120.2
@ -10651,7 +10651,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u5355\u4F4D\uFF1A\u5341\u4E07\u5428"
m_text: "\u5355\u4F4D\uFF1A\u4E07\u5428"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -13061,7 +13061,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 55, y: 22}
m_SizeDelta: {x: 60, y: 22}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1282531050
MonoBehaviour:
@ -13083,7 +13083,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: (55.55%)
m_text: (0%)
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -15067,8 +15067,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -62, y: -1.5}
m_SizeDelta: {x: 62, y: 30}
m_AnchoredPosition: {x: -53, y: -1.5}
m_SizeDelta: {x: 50, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1541758251
MonoBehaviour:
@ -15090,7 +15090,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 77
m_text: 00
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -15125,7 +15125,7 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 3
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 116.5
@ -18758,7 +18758,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 6548
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,
@ -19417,7 +19417,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 55, y: 22}
m_SizeDelta: {x: 60, y: 22}
m_Pivot: {x: 1, y: 1}
--- !u!114 &1894448750
MonoBehaviour:
@ -19439,7 +19439,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: (55.55%)
m_text: (0%)
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2}
m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63,

42
BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/HomePageData.cs
View File

@ -99,6 +99,11 @@ public class HomePageData : UITool
Debug.Log(_value);
GetTotalShips();
});
Dropdown_Total.onValueChanged.AddListener((_value) =>
{
Debug.Log(_value);
GetTotalInStock();
});
Dropdown_Import.onValueChanged.AddListener((_value) =>
{
Debug.Log(_value);
@ -119,7 +124,7 @@ public class HomePageData : UITool
private void GetYardTotalData()
{
var _url = ApiManager.Instance.GetUrl("GetYardAllInfo");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -140,7 +145,7 @@ public class HomePageData : UITool
private void GetGoodsTypeData()
{
var _url = ApiManager.Instance.GetUrl("GetGoodNumByYear");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = "2024", ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = "2024", ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -152,11 +157,16 @@ public class HomePageData : UITool
GoodsTypeCount.text = _jobject["data"]["allNum"].ToString();
var _gd = JsonConvert.DeserializeObject<List<GoodsData>>(_jobject["data"]["showData"].ToString());
CoalCount.text = (float.Parse(_gd.Find(x => x.goodName == "ú̿").wt) / 1000 / 10000).ToString("F2");//Íò¶Ö
CoalPercent.text = "(" + (float.Parse(_gd.Find(x => x.goodName == "ú̿").percent) * 100).ToString("F2") + "%)";//Íò¶Ö
NickelCount.text = (float.Parse(_gd.Find(x => x.goodName == "Äø¿ó").wt) / 1000 / 10000).ToString("F2");//Íò¶Ö
NickelPercent.text = "(" + (float.Parse(_gd.Find(x => x.goodName == "Äø¿ó").percent) * 100).ToString("F2") + "%)";//Íò¶Ö
if (_gd.Find(x => x.goodName == "ú̿") != null)
{
CoalCount.text = (float.Parse(_gd.Find(x => x.goodName == "ú̿").wt) / 1000 / 10000).ToString("F2");//Íò¶Ö
CoalPercent.text = "(" + (float.Parse(_gd.Find(x => x.goodName == "ú̿").percent) * 100).ToString("F2") + "%)";//Íò¶Ö
}
if (_gd.Find(x => x.goodName == "Äø¿ó") != null)
{
NickelCount.text = (float.Parse(_gd.Find(x => x.goodName == "Äø¿ó").wt) / 1000 / 10000).ToString("F2");//Íò¶Ö
NickelPercent.text = "(" + (float.Parse(_gd.Find(x => x.goodName == "Äø¿ó").percent) * 100).ToString("F2") + "%)";//Íò¶Ö
}
}
}));
}
@ -179,7 +189,7 @@ public class HomePageData : UITool
private void GetTotalInStock()
{
var _url = ApiManager.Instance.GetUrl("GetLastNum");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Total.options[Dropdown_Total.value].text, ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Total.options[Dropdown_Total.value].text, ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -188,9 +198,9 @@ public class HomePageData : UITool
else
{
var _jobject = JObject.Parse(_data);
var _value = float.Parse(_jobject["data"]["num"].ToString()) / 1000 / 100000;
var _value = float.Parse(_jobject["data"]["num"].ToString()) / 1000 / 10000;
TotalInStock_Integer.text = ((int)_value).ToString();
TotalInStock_Decimal.text = ((int)((_value - (int)_value) * 100)).ToString();
TotalInStock_Decimal.text = ((int)((_value - (int)_value) * 100)).ToString("00");
}
}));
}
@ -201,7 +211,7 @@ public class HomePageData : UITool
private void GetTotalShips()
{
var _url = ApiManager.Instance.GetUrl("GetBoCiByYear");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Ships.options[Dropdown_Ships.value].text, ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Ships.options[Dropdown_Ships.value].text, ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -226,7 +236,7 @@ public class HomePageData : UITool
private void GetTotalImport()
{
var _url = ApiManager.Instance.GetUrl("GetInNumByYear");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Import.options[Dropdown_Import.value].text, ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["year"] = Dropdown_Import.options[Dropdown_Import.value].text, ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -242,7 +252,7 @@ public class HomePageData : UITool
}
float _change_value = _total / 1000 / 10000;
TotalImport_Integer.text = ((int)_change_value).ToString();
TotalImport_Decimal.text = ((int)((_change_value - (int)_change_value) * 100)).ToString();
TotalImport_Decimal.text = ((int)((_change_value - (int)_change_value) * 100)).ToString("00");
}
}));
}
@ -253,7 +263,7 @@ public class HomePageData : UITool
private void TotalYearAndQuarter()
{
var _url = ApiManager.Instance.GetUrl("GetInNumWithCurrent");
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["monotorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
StartCoroutine(RequestBase.Get(_url, new Dictionary<string, string>() { ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) =>
{
if (!string.IsNullOrEmpty(_error))
{
@ -266,10 +276,10 @@ public class HomePageData : UITool
var _quarter_value = float.Parse(_jobject["data"]["currentQuarterSum"].ToString()) / 1000 / 10000;
TotalYear_Integer.text = ((int)_year_value).ToString();
TotalYear_Decimal.text = ((int)((_year_value - (int)_year_value) * 100)).ToString();
TotalYear_Decimal.text = ((int)((_year_value - (int)_year_value) * 100)).ToString("00");
Quarter_Integer.text = ((int)_quarter_value).ToString();
Quarter_Decimal.text = ((int)((_quarter_value - (int)_quarter_value) * 100)).ToString();
Quarter_Decimal.text = ((int)((_quarter_value - (int)_quarter_value) * 100)).ToString("00");
}
}));
}

459
BulkCargo_UnityProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long