From f4bb83fc7902cf87ba43b918c87c1d96ee5dbc14 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 07 八月 2025 15:01:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Utility/EnumHelper.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 66ffe05..837e293 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -449,7 +449,7 @@
PlayerName = 2, //瑙掕壊鍚�,size , 14 2,
Sex = 3, //鎬у埆 3,
Hair = 4, //鍙戝瀷 1.鏍囧噯鍨嬶紙鐢凤級 2.鍚嶄粫鍨� 3.娴瓙鍨� 4.鏍囧噯鍨嬶紙濂筹級 5.椹鍨� 6.濡╁獨鍨� 4,
- HairColor = 5, //澶村彂棰滆壊 5绉� 5,
+ FacePic = 5, //澶村儚妗� 5, 锛堟棫鐨凥airColor锛�
Face = 6, //鍩烘湰鑴稿瀷 6,
Job = 7, //鑱屼笟
LV = 8, //绛夌骇 8,
@@ -466,7 +466,7 @@
GoldPaper = 19, //閲戠エ 19,
Silver = 20, //閾跺瓙 20,
SilverPaper = 21, //閾剁エ 21,
- FightPoint = 22, //鎴樻枟鍊� 22,
+ FightPoint = 22, //鎴樻枟鍊�(閿ゅ瓙) 22,
HappyPoint = 23, //濞变箰鍊� 23,
MapID = 24, //瑙掕壊鎵�鍦ㄥ湴鍥� 24,
PosX = 25, //瑙掕壊鍧愭爣 25,
@@ -703,14 +703,14 @@
default23,
default24,
default25,
- default26,
- default27,
+ default26, // 254 鎴橀敜
+ default27,
default28,
default29,
default30,
default31,
default32,
- default33,
+ default33, // 261 缁撴櫠
default34, // 262 鍑瘉绉垎
default35, // 263 鑱氶瓊绮惧崕
default36, // 264 Boss鏈�缁堜激瀹冲姞鎴�
@@ -721,7 +721,7 @@
default41, // 269 杩囨湡鍨嬩唬閲戝埜
default42, // 270 浠欑紭绉垎
default43, // 271 骞诲闃佺Н鍒�
- default44,
+ default44, // 272 姝﹀皢鎷涘嫙绉垎
default45,
default46,
default47,
@@ -738,6 +738,7 @@
Equip = 1, // 瑁呭
Item = 2, // 鐗╁搧
Warehouse = 5, // 浠撳簱
+ DropItem = 8, // 鎺夎惤鐗╁搧
Horse = 12, // 鍧愰獞鑳屽寘
AnyWhere = 13, // 涓囪兘鑳屽寘
InterimPack = 28,//涓存椂浜ゆ崲鑳屽寘
@@ -791,6 +792,7 @@
Equip_Wing = 113, // 缈呰唨
Guard_1 = 114, // 鐏靛畧 1
Guard_2 = 115, //鐏靛畧 2
+ Hero = 150, //姝﹀皢
}
@@ -1057,14 +1059,34 @@
}
+//鍝佽川鏂囧瓧鎻忚竟棰滆壊
+public enum QualityTextColType
+{
+ None = -1,
+ itemcucao = 0, //绮楃硻
+ itemputong = 1, //鏅��
+ itemjingliang = 2, //绮捐壇
+ itemxiyou = 3, //绋�鏈�
+ itemshishi = 4, //鍙茶瘲
+ itemchuanqi = 5, //浼犲
+ itemshenhua = 6, //绁炶瘽
+ itemwuxia = 7, //鏃犳殗
+ itemanjin = 8, //鏆楅噾
+ itemjueyi = 9, //缁濊壓
+ itemyuanzu = 10, //鍏冪
+ itembuxiu = 11, //涓嶆溄
+ itemyonghen = 12, //姘告亽
+
+ red = 13, //绾㈣壊
+}
public enum TextColType
{
None = 0,
White = 1,
- Blue = 2,
- Purple = 3,
- Orange = 4,
+ titleSelectColor = 2,
+ titleUnSelectColor = 3,
+ lightYellow = 4, //娴呴粍鑹�
Red = 5,
Pink = 6,
/// <summary>
@@ -1082,14 +1104,25 @@
/// <summary>
/// fff4cd
/// </summary>
- LightYellow = 15,
+ LightWhite = 15,
/// <summary>
/// (204, 204, 204, 255)
/// </summary>
Gray = 16,
+ //鐗╁搧鍝佽川棰滆壊
+ itemjingliang = 17, //绮捐壇
+ itemxiyou = 18, //绋�鏈�
+ itemshishi = 19, //鍙茶瘲
+ itemchuanqi = 20, //浼犲
+ itemshenhua = 21, //绁炶瘽
+ itemwuxia = 22, //鏃犳殗
+ itemanjin = 23, //鏆楅噾
+ itemjueyi = 24, //缁濊壓
+ itemyuanzu = 25, //鍏冪
+ itembuxiu = 26, //涓嶆溄
+ itemyonghen = 27, //姘告亽
}
-
public enum E_ModelResType
{
@@ -1144,6 +1177,7 @@
Quantity = 2,
Full = 3,
GetReward = 4,
+ New = 5,
}
@@ -1601,8 +1635,8 @@
public enum TitleBtnState
{
- Normal,
- Click,
+ Normal, //闈炵偣鍑荤姸鎬�
+ Click, //鐐瑰嚮鍚庣姸鎬�
Locked,
}
--
Gitblit v1.8.0