完成所有修改
parent
8c532233fa
commit
772060c95e
|
@ -2917,7 +2917,7 @@ RectTransform:
|
||||||
- {fileID: 2100251364}
|
- {fileID: 2100251364}
|
||||||
- {fileID: 1789761868}
|
- {fileID: 1789761868}
|
||||||
m_Father: {fileID: 869582408}
|
m_Father: {fileID: 869582408}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -3604,8 +3604,8 @@ RectTransform:
|
||||||
- {fileID: 1408369545}
|
- {fileID: 1408369545}
|
||||||
- {fileID: 592466492}
|
- {fileID: 592466492}
|
||||||
- {fileID: 783929353}
|
- {fileID: 783929353}
|
||||||
- {fileID: 404723614}
|
|
||||||
- {fileID: 705208796}
|
- {fileID: 705208796}
|
||||||
|
- {fileID: 404723614}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -8270,7 +8270,7 @@ PrefabInstance:
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3}
|
- target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 4
|
value: 5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3}
|
- target: {fileID: 6584365350701771760, guid: ca90929f4cdc64c43bf77cacd7af730f, type: 3}
|
||||||
propertyPath: m_AnchorMax.x
|
propertyPath: m_AnchorMax.x
|
||||||
|
|
|
@ -17,7 +17,8 @@ public class ExcelManager : SingleManager<ExcelManager>
|
||||||
|
|
||||||
public List<string> GetAllPlayerID => _playerData.GetAllID();
|
public List<string> 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 TeamData_DataInfo GetTeamRandomInfo => _teamData.RandomGet();
|
||||||
public int GetTeamInfoCount => _teamData.data.Count;
|
public int GetTeamInfoCount => _teamData.data.Count;
|
||||||
|
|
|
@ -20,14 +20,19 @@ namespace ZXL.Excel
|
||||||
Player_DataInfo info = null;
|
Player_DataInfo info = null;
|
||||||
if (_list.Count > 0)
|
if (_list.Count > 0)
|
||||||
{
|
{
|
||||||
var range = Random.Range(0, _list.Count - 1);
|
// var range = Random.Range(0, _list.Count - 1);
|
||||||
info = _list[range];
|
info = _list[0];
|
||||||
_list.Remove(info);
|
_list.Remove(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int GetCount()
|
||||||
|
{
|
||||||
|
return _list.Count;
|
||||||
|
}
|
||||||
|
|
||||||
public List<string> GetAllID()
|
public List<string> GetAllID()
|
||||||
{
|
{
|
||||||
List<string> list = new List<string>();
|
List<string> list = new List<string>();
|
||||||
|
|
|
@ -146,7 +146,7 @@ namespace Script.UI
|
||||||
sb.AppendLine($"\n");
|
sb.AppendLine($"\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalManager.Instance.list = list;
|
// GlobalManager.Instance.list = list;
|
||||||
|
|
||||||
FileManager.Instance.SavePlayerTeamData(sb.ToString());
|
FileManager.Instance.SavePlayerTeamData(sb.ToString());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
@ -57,6 +58,13 @@ namespace Script.UI
|
||||||
|
|
||||||
private void ClickClose()
|
private void ClickClose()
|
||||||
{
|
{
|
||||||
|
var count = ExcelManager.Instance.GetPlayerCount;
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
UIManager.Instance.OpenPanel(PanelType.Finish);
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
|
||||||
SaveExcelData();
|
SaveExcelData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,6 +75,8 @@ namespace Script.UI
|
||||||
|
|
||||||
IEnumerator Roll()
|
IEnumerator Roll()
|
||||||
{
|
{
|
||||||
|
var playerInfo = ExcelManager.Instance.GetPlayerInfo;
|
||||||
|
|
||||||
while (isRoll)
|
while (isRoll)
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(0.02f);
|
yield return new WaitForSeconds(0.02f);
|
||||||
|
@ -80,13 +90,26 @@ namespace Script.UI
|
||||||
txt_TeamContent.text = teamData1.teamName;
|
txt_TeamContent.text = teamData1.teamName;
|
||||||
var cultureData1 = ExcelManager.Instance.GetCultureRandomInfo;
|
var cultureData1 = ExcelManager.Instance.GetCultureRandomInfo;
|
||||||
txt_CultureContent.text = cultureData1.cultureName;
|
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<SaveExcelData.SaveExcelDataInfo> _list = new List<SaveExcelData.SaveExcelDataInfo>();
|
||||||
|
|
||||||
void SaveExcelData()
|
void SaveExcelData()
|
||||||
{
|
{
|
||||||
SaveExcelData.SaveExcelDataInfo dataInfo = new SaveExcelData.SaveExcelDataInfo(new string[4]);
|
SaveExcelData.SaveExcelDataInfo dataInfo = new SaveExcelData.SaveExcelDataInfo(new string[4]);
|
||||||
dataInfo.strings = new[] { "", "", txt_TeamContent.text, txt_CultureContent.text };
|
dataInfo.strings = new[] { "", "", txt_TeamContent.text, txt_CultureContent.text };
|
||||||
ExcelManager.Instance.SaveAndExpIndex(dataInfo, index);
|
// ExcelManager.Instance.SaveAndExpIndex(dataInfo, index);
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,7 +156,7 @@ namespace Script.UI
|
||||||
sb.AppendLine($"\n");
|
sb.AppendLine($"\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalManager.Instance.list = list;
|
// GlobalManager.Instance.list = list;
|
||||||
|
|
||||||
FileManager.Instance.SavePlayerTeamData(sb.ToString());
|
FileManager.Instance.SavePlayerTeamData(sb.ToString());
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2a1de101014005e4c99abbf3e96688d1
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue