From 772060c95e0fc22c30866267f81fdf1ee0246b43 Mon Sep 17 00:00:00 2001 From: zc <1062808664@qq.com> Date: Sat, 30 Dec 2023 18:22:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=80=E6=9C=89=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 6 ++-- Assets/Script/Excel/ExcelManager.cs | 5 ++-- Assets/Script/Excel/Read/Player_Data.cs | 9 ++++-- Assets/Script/UI/Panel/CulturePanel.cs | 2 +- Assets/Script/UI/Panel/DrawPanel.cs | 27 ++++++++++++++++-- Assets/Script/UI/Panel/TeamPanel.cs | 2 +- Assets/StreamingAssets/Excel/PlayerData.xlsx | Bin 10527 -> 10296 bytes .../程序输出数据638395570652508952.xlsx | Bin 0 -> 2768 bytes ...输出数据638395570652508952.xlsx.meta | 7 +++++ 9 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 Assets/StreamingAssets/程序输出数据638395570652508952.xlsx create mode 100644 Assets/StreamingAssets/程序输出数据638395570652508952.xlsx.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a88f333..349e885 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2917,7 +2917,7 @@ RectTransform: - {fileID: 2100251364} - {fileID: 1789761868} m_Father: {fileID: 869582408} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3604,8 +3604,8 @@ RectTransform: - {fileID: 1408369545} - {fileID: 592466492} - {fileID: 783929353} - - {fileID: 404723614} - {fileID: 705208796} + - {fileID: 404723614} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8270,7 +8270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Script/Excel/ExcelManager.cs b/Assets/Script/Excel/ExcelManager.cs index 454ae70..c0c15be 100644 --- a/Assets/Script/Excel/ExcelManager.cs +++ b/Assets/Script/Excel/ExcelManager.cs @@ -16,8 +16,9 @@ public class ExcelManager : SingleManager private CultrueData_Data _cultrueData; public List GetAllPlayerID => _playerData.GetAllID(); - - // public Player_DataInfo GetPlayerInfo => _playerData.GetAndRemove(); + + public Player_DataInfo GetPlayerInfo => _playerData.GetAndRemove(); + public int GetPlayerCount => _playerData.GetCount(); public TeamData_DataInfo GetTeamRandomInfo => _teamData.RandomGet(); public int GetTeamInfoCount => _teamData.data.Count; diff --git a/Assets/Script/Excel/Read/Player_Data.cs b/Assets/Script/Excel/Read/Player_Data.cs index c6583c1..6328122 100644 --- a/Assets/Script/Excel/Read/Player_Data.cs +++ b/Assets/Script/Excel/Read/Player_Data.cs @@ -20,14 +20,19 @@ namespace ZXL.Excel Player_DataInfo info = null; if (_list.Count > 0) { - var range = Random.Range(0, _list.Count - 1); - info = _list[range]; + // var range = Random.Range(0, _list.Count - 1); + info = _list[0]; _list.Remove(info); } return info; } + public int GetCount() + { + return _list.Count; + } + public List GetAllID() { List list = new List(); diff --git a/Assets/Script/UI/Panel/CulturePanel.cs b/Assets/Script/UI/Panel/CulturePanel.cs index ba371d7..6a906ff 100644 --- a/Assets/Script/UI/Panel/CulturePanel.cs +++ b/Assets/Script/UI/Panel/CulturePanel.cs @@ -146,7 +146,7 @@ namespace Script.UI sb.AppendLine($"\n"); } - GlobalManager.Instance.list = list; + // GlobalManager.Instance.list = list; FileManager.Instance.SavePlayerTeamData(sb.ToString()); } diff --git a/Assets/Script/UI/Panel/DrawPanel.cs b/Assets/Script/UI/Panel/DrawPanel.cs index f0cad74..b1c32b8 100644 --- a/Assets/Script/UI/Panel/DrawPanel.cs +++ b/Assets/Script/UI/Panel/DrawPanel.cs @@ -1,4 +1,5 @@ using System.Collections; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -26,7 +27,7 @@ namespace Script.UI btn_Close.gameObject.SetActive(false); index = 0; isRoll = false; - + txt_TeamContent.text = ""; txt_CultureContent.text = ""; } @@ -57,6 +58,13 @@ namespace Script.UI private void ClickClose() { + var count = ExcelManager.Instance.GetPlayerCount; + if (count == 0) + { + UIManager.Instance.OpenPanel(PanelType.Finish); + Close(); + } + SaveExcelData(); } @@ -67,6 +75,8 @@ namespace Script.UI IEnumerator Roll() { + var playerInfo = ExcelManager.Instance.GetPlayerInfo; + while (isRoll) { yield return new WaitForSeconds(0.02f); @@ -80,13 +90,26 @@ namespace Script.UI txt_TeamContent.text = teamData1.teamName; var cultureData1 = ExcelManager.Instance.GetCultureRandomInfo; txt_CultureContent.text = cultureData1.cultureName; + + SaveExcelData.SaveExcelDataInfo dataInfo = new SaveExcelData.SaveExcelDataInfo(new string[4]); + dataInfo.strings = new[] { playerInfo.id, playerInfo.name, txt_TeamContent.text, txt_CultureContent.text }; + + var summaryInfo = new SummaryInfo(); + summaryInfo.id = int.Parse(playerInfo.id); + summaryInfo.team = txt_TeamContent.text; + summaryInfo.culture = txt_CultureContent.text; + GlobalManager.Instance.list.Add(summaryInfo); + + _list.Add(dataInfo); } + private List _list = new List(); + void SaveExcelData() { SaveExcelData.SaveExcelDataInfo dataInfo = new SaveExcelData.SaveExcelDataInfo(new string[4]); dataInfo.strings = new[] { "", "", txt_TeamContent.text, txt_CultureContent.text }; - ExcelManager.Instance.SaveAndExpIndex(dataInfo, index); + // ExcelManager.Instance.SaveAndExpIndex(dataInfo, index); index++; } } diff --git a/Assets/Script/UI/Panel/TeamPanel.cs b/Assets/Script/UI/Panel/TeamPanel.cs index 3edb39e..5072fed 100644 --- a/Assets/Script/UI/Panel/TeamPanel.cs +++ b/Assets/Script/UI/Panel/TeamPanel.cs @@ -156,7 +156,7 @@ namespace Script.UI sb.AppendLine($"\n"); } - GlobalManager.Instance.list = list; + // GlobalManager.Instance.list = list; FileManager.Instance.SavePlayerTeamData(sb.ToString()); } diff --git a/Assets/StreamingAssets/Excel/PlayerData.xlsx b/Assets/StreamingAssets/Excel/PlayerData.xlsx index cef7b6460d72ed2e8e0658a5b2600b39be64d45a..60531da1022e1fb8208cc37af91a064a98ef7b33 100644 GIT binary patch delta 1794 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 diff --git a/Assets/StreamingAssets/程序输出数据638395570652508952.xlsx b/Assets/StreamingAssets/程序输出数据638395570652508952.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..c60c3820cc8647afc64654784af89305050d9d32 GIT binary patch literal 2768 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