master #75

Closed
Alienjack wants to merge 510 commits from Alienjack/AxibugEmuOnline_old:master into master
3 changed files with 5 additions and 2 deletions
Showing only changes of commit 912ad6b045 - Show all commits

View File

@ -19,7 +19,7 @@ namespace AxibugEmuOnline.Client
var color1 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color1)}", null); var color1 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color1)}", null);
var color2 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color2)}", null); var color2 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color2)}", null);
var name = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.Name)}", null); var name = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.Name)}", null);
if (color1 == null || color2 == null || name == null) if (string.IsNullOrWhiteSpace(color1) || string.IsNullOrWhiteSpace(color2) || string.IsNullOrWhiteSpace(name))
return DEFAULT; return DEFAULT;
else else
return new XMBColor(name, color1, color2); return new XMBColor(name, color1, color2);

View File

@ -8,7 +8,10 @@ using UnityEngine;
namespace AxibugEmuOnline.Client namespace AxibugEmuOnline.Client
{ {
public class BgSetting_Color : MenuItem, IVirtualItem /// <summary>
/// ±³¾°ÑÕÉ«ÉèÖÃUI
/// </summary>
public class UI_BgSettingItem_Color : MenuItem, IVirtualItem
{ {
public int Index { get; set; } public int Index { get; set; }
public BgColorSettings Datacontext { get; private set; } public BgColorSettings Datacontext { get; private set; }