diff --git a/Assets/BingoBrain/ModuleUI/Exchange/ExchangeUI.cs b/Assets/BingoBrain/ModuleUI/Exchange/ExchangeUI.cs index f323d92..1a2b30f 100644 --- a/Assets/BingoBrain/ModuleUI/Exchange/ExchangeUI.cs +++ b/Assets/BingoBrain/ModuleUI/Exchange/ExchangeUI.cs @@ -159,10 +159,11 @@ namespace BingoBrain Debug.Log(JsonConvert.SerializeObject(PreferencesMgr.Instance.MakeupTaskHistory)); for (int i = 0; i < btn_list.Count; i++) { + int index=i; MakeupTaskData makeupTaskData = null; for (int j = PreferencesMgr.Instance.MakeupTaskHistory.Count - 1; j >= 0; j--) { - if (PreferencesMgr.Instance.MakeupTaskHistory[j].tableId == (i + 1)) + if (PreferencesMgr.Instance.MakeupTaskHistory[j].tableId == (index + 1)) { makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory[j]; // now_selectindex = index; @@ -171,10 +172,10 @@ namespace BingoBrain } if (makeupTaskData == null) { - makeup makeupVo = makeup_list[i]; + makeup makeupVo = makeup_list[index]; makeupTaskData = new MakeupTaskData(); - makeupTaskData.tableId = i + 1; + makeupTaskData.tableId = index + 1; makeupTaskData.id = PreferencesMgr.Instance.MakeupTaskHistory.Count + 1; makeupTaskData.amountStr = $"{makeupVo.item_need}"; makeupTaskData.amount = makeupVo.item_need; @@ -185,21 +186,23 @@ namespace BingoBrain } - btn_list[i].btn_makeup.SetClick(() => + btn_list[index].btn_makeup.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData); }); - btn_list[i].text_makeup.text = (GameHelper.isRDExchangeMode() ? "" : "") + + + btn_list[index].text_makeup.text = (GameHelper.isRDExchangeMode() ? "" : "") + GameHelper.Get102Str_new((decimal)makeupTaskData.amount); + if (makeupTaskData.status > MakeupTaskStatus.None) { - btn_list[i].text_progress.text = $"{makeupTaskData.amount:N}" + "/" + $"{makeupTaskData.amount:N}"; - btn_list[i].progress_makeup.value = 100; + btn_list[index].text_progress.text = $"{makeupTaskData.amount:N}" + "/" + $"{makeupTaskData.amount:N}"; + btn_list[index].progress_makeup.value = 100; } else { - btn_list[i].text_progress.text = $"{PreferencesMgr.Instance.Currency102:N}" + "/" + $"{makeupTaskData.amount:N}"; - btn_list[i].progress_makeup.value = (double)(PreferencesMgr.Instance.Currency102 / makeupTaskData.amount) * 100; + btn_list[index].text_progress.text = $"{PreferencesMgr.Instance.Currency102:N}" + "/" + $"{makeupTaskData.amount:N}"; + btn_list[index].progress_makeup.value = (double)(PreferencesMgr.Instance.Currency102 / makeupTaskData.amount) * 100; } diff --git a/Assets/BingoBrain/System/Game/BingoDataSystem.cs b/Assets/BingoBrain/System/Game/BingoDataSystem.cs index 098eb9b..7bae2b3 100644 --- a/Assets/BingoBrain/System/Game/BingoDataSystem.cs +++ b/Assets/BingoBrain/System/Game/BingoDataSystem.cs @@ -112,7 +112,7 @@ namespace BingoBrain if (PreferencesMgr.Instance.MakeupTaskHistory.Count == 0) { - AddMakeupTaskData(); + // AddMakeupTaskData(); } else {