From 8d06932ebf186837e048da4822bd837dbf90e212 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ViewOtherPlayer
---
Utility/UIHelper.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 7cee7ac..67405bd 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -440,7 +440,7 @@
public static readonly Color s_DarkPinkColor = new Color32(255, 124, 124, 255);
public static readonly Color s_DarkRedColor = new Color32(250, 1, 1, 255);
public static readonly Color s_DarkPurpleColor = new Color32(236, 75, 246, 255);
- public static readonly Color s_DarkBlueColor = new Color32(49, 206, 251, 255);
+ public static readonly Color s_DarkBlueColor = new Color32(49, 206, 251, 255);//31cefb
public static readonly Color s_DarkOrangeColor = new Color32(248, 152, 59, 255);
public static readonly Color s_DarkWhiteColor = new Color32(247, 247, 247, 255);
public static readonly Color s_DarkGreenColor = new Color32(53, 225, 34, 255); //35e122
@@ -448,9 +448,11 @@
public static readonly Color s_NavyBrown = new Color32(64, 28, 6, 255);//401c06
public static readonly Color s_Black = new Color32(0, 0, 0, 255);
public static readonly Color s_NavyYellow = new Color32(255, 239, 71, 255);
- public static readonly Color s_LightGreen = new Color32(141, 220, 17, 255);
+ public static readonly Color s_LightGreen = new Color32(141, 220, 17, 255);//8ddc11
public static readonly Color s_LightYellow = new Color32(255, 244, 205, 255); //fff4cd
public static readonly Color s_Gray = new Color32(204, 204, 204, 255);
+ public static readonly Color s_Gold = new Color32(255, 239, 71, 255);//ffef47
+ public static readonly Color s_EarthYellow = new Color32(248, 152, 59, 255);//f8983b
public static readonly Color s_BrightDanLV0 = new Color32(102, 102, 102, 255); //666666
public static readonly Color s_BrightDanLV1 = new Color32(148, 96, 255, 255); //9460ff
@@ -692,6 +694,24 @@
}
return _itemColor;
}
+
+ public static Color GetPropertyColor(int property)
+ {
+ switch ((PropertyType)property)
+ {
+ case PropertyType.Mater:
+ return s_Gold;
+ case PropertyType.Wood:
+ return s_LightGreen;
+ case PropertyType.Water:
+ return s_DarkBlueColor;
+ case PropertyType.Fire:
+ return s_GrayDanLV5;
+ case PropertyType.Earth:
+ return s_EarthYellow;
+ }
+ return s_NavyBrown;
+ }
#endregion
#region 璁＄畻鎴樻枟鍔�
--
Gitblit v1.8.0