From 871594462e82d6bc1341918d39e11ab036d59563 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 18 九月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Utility/EnumHelper.cs | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 43 deletions(-)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 66ffe05..8b7664c 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -411,29 +411,16 @@
{
Weapon = 1, // 涓绘墜
Weapon2 = 2, // 鍓墜
- Hat = 3, // 甯藉瓙
+ Hat = 3, // 澶寸洈
Clothes = 4, // 琛ｆ湇
Belt = 5, // 鑵板甫
Trousers = 6, // 瑁ゅ瓙
Shoes = 7, // 闉嬪瓙
- Glove = 8, //鎵嬪
- Neck = 9, //椤归摼
- FairyCan1 = 10, //浠欏櫒
- FairyCan2 = 11, //浠欏櫒
- Jade = 12, //鐜変僵
-
- Wing = 13, //缈呰唨
- Guard = 14, //瀹堟姢
-
- PeerlessWeapon1 = 16,//缁濅笘姝﹀櫒
- PeerlessWeapon2 = 17,//缁濅笘鍓墜
-
- Mount = 19, //褰撳墠鐨勫潗楠�
-
- FashionWeapon = 20,//鏃惰姝﹀櫒
- FashionClothes = 21, //鏃惰琛ｆ湇
- FashionWeapon2 = 22,//鏃惰鍓墜
-
+ Wristband = 8, //鎶よ厱
+ Shawl = 9, //鎶偐
+ Neck = 10, //椤归摼
+ Ring= 11, //鎴掓寚
+ Amulet = 12, //鎶ょ
retMax,
};
@@ -449,7 +436,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 +453,7 @@
GoldPaper = 19, //閲戠エ 19,
Silver = 20, //閾跺瓙 20,
SilverPaper = 21, //閾剁エ 21,
- FightPoint = 22, //鎴樻枟鍊� 22,
+ UseHarmerCount = 22, //閿ゅ瓙娑堣�楀�嶆暟 22,
HappyPoint = 23, //濞变箰鍊� 23,
MapID = 24, //瑙掕壊鎵�鍦ㄥ湴鍥� 24,
PosX = 25, //瑙掕壊鍧愭爣 25,
@@ -550,8 +537,8 @@
WarehouseLV = 99, //浠撳簱绛夌骇 99
EquipShowSwitch = 100, //瑁呭鏄鹃殣寮�鍏� 100
LuckValue = 101, //骞歌繍鍊� 101
- ExAttr1 = 102, //鎵╁睍灞炴��1 102榄斾粏浼ゅ24
- ExAttr2 = 103, //鎵╁睍灞炴��2 103缁勯槦鏄惁闇�瑕佸鏍�
+ ExAttr1 = 102, //鎵╁睍灞炴��1 102 涓荤嚎宸查�氬叧鍏冲崱
+ ExAttr2 = 103, //鎵╁睍灞炴��2 103 涓荤嚎褰撳墠鍒锋�墍鍦ㄧ珷鑺傚叧鍗¤褰�
ExAttr3 = 104, //鎵╁睍灞炴��3 104鍏冪礌鏀诲嚮26
ExAttr4 = 105, //鎵╁睍灞炴��4 105鍏冪礌闃插尽27
ExAttr5 = 106, //鎵╁睍灞炴��5 106
@@ -703,14 +690,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 +708,7 @@
default41, // 269 杩囨湡鍨嬩唬閲戝埜
default42, // 270 浠欑紭绉垎
default43, // 271 骞诲闃佺Н鍒�
- default44,
+ default44, // 272 姝﹀皢鎷涘嫙绉垎
default45,
default46,
default47,
@@ -738,6 +725,7 @@
Equip = 1, // 瑁呭
Item = 2, // 鐗╁搧
Warehouse = 5, // 浠撳簱
+ DropItem = 8, // 鎺夎惤鐗╁搧
Horse = 12, // 鍧愰獞鑳屽寘
AnyWhere = 13, // 涓囪兘鑳屽寘
InterimPack = 28,//涓存椂浜ゆ崲鑳屽寘
@@ -791,6 +779,7 @@
Equip_Wing = 113, // 缈呰唨
Guard_1 = 114, // 鐏靛畧 1
Guard_2 = 115, //鐏靛畧 2
+ Hero = 150, //姝﹀皢
}
@@ -806,6 +795,7 @@
RuneCompound = 22,//绗﹀嵃鍚堟垚
GatherSoulCompound = 23,//鑱氶瓊鍚堟垚
GatherSoulDecompose = 24,//鑱氶瓊鍒嗚В
+ EquipOP, // 25 涓荤晫闈㈣澶囧垎瑙�/鏇挎崲鍥炲 瀵瑰簲 B4 15 涓荤嚎鎺夎惤鐗╁搧鎿嶄綔 #tagCSMainDropItemOP
}
@@ -828,14 +818,14 @@
//鍔熻兘寮�鍚檺鍒剁被鍨�
public enum FuncOpenEnum
{
- Strength = 1,//瑁呭寮哄寲
- Gem = 2,//瀹濈煶闀跺祵
- Wing = 3,//缈呰唨
+ Hero = 1,//姝﹀皢
+ Challenge = 2,//鎸戞垬
+ Official = 3,//鍐呮斂
Pet = 6,//鐏靛疇
Treasure = 7,//娉曞疂
Mounts = 8,//鍧愰獞
Rune = 9,//绗﹀嵃
- Realm = 12, //澧冪晫
+ Realm = 12, //澧冪晫 瀹樿亴
Fairy = 15,// 浠欑洘
FairyTask = 16,
GodWeapon = 20, //绁炲叺
@@ -872,7 +862,7 @@
SkillTreasure = 95,//鎶�鑳芥硶瀹�
WingCompose = 97,//缈呰唨鍚堟垚
Demon = 98,//娣蜂贡濡栧煙
- HappyFindTreasure = 99,//娆箰瀵诲疂
+ HappyFindTreasure = 99,// 鑻遍泟鎷涘嫙
FightPromote = 100,//鎴樺姏鎻愬崌
AncientBattleGround = 101,//涓婂彜鎴樺満
Chat = 102,//鑱婂ぉ
@@ -1057,24 +1047,46 @@
}
+//鍝佽川鏂囧瓧鎻忚竟棰滆壊
+public enum QualityTextColType
+{
+ None = 0,
+ itemcucao = 1, //绮楃硻
+ itemputong = 2, //鏅��
+ itemjingliang = 3, //绮捐壇
+ itemxiyou = 4, //绋�鏈�
+ itemshishi = 5, //鍙茶瘲
+ itemchuanqi = 6, //浼犲
+ itemshenhua = 7, //绁炶瘽
+ itemwuxia = 8, //鏃犳殗
+ itemanjin = 9, //鏆楅噾
+ itemjueyi = 10, //缁濊壓
+ itemyuanzu = 11, //鍏冪
+ itembuxiu = 12, //涓嶆溄
+ itemyonghen = 13, //姘告亽
+
+ red = 14, //绾㈣壊
+}
public enum TextColType
{
None = 0,
White = 1,
- Blue = 2,
- Purple = 3,
- Orange = 4,
+ titleSelectColor = 2,
+ titleUnSelectColor = 3,
+ lightYellow = 4, //娴呴粍鑹�
Red = 5,
Pink = 6,
+
/// <summary>
/// 娣辫鑹� 401c06 (64, 28, 6, 255)
/// </summary>
NavyBrown,
+ NavyGray = 8, //娣辩伆鑹� 797979 (121, 121, 121, 255)
Green = 9,//缁胯壊
Black = 10,
/// <summary>
- /// 娣辩豢鑹� 109d06 (16, 157, 6, 255)
+ /// 娣辩豢鑹� 248B12 (36, 187, 18, 255)
/// </summary>
DarkGreen = 12,
NavyYellow = 13,
@@ -1082,14 +1094,25 @@
/// <summary>
/// fff4cd
/// </summary>
- LightYellow = 15,
+ LightWhite = 15,
/// <summary>
/// (204, 204, 204, 255)
/// </summary>
- Gray = 16,
+ 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 +1167,7 @@
Quantity = 2,
Full = 3,
GetReward = 4,
+ New = 5,
}
@@ -1601,8 +1625,8 @@
public enum TitleBtnState
{
- Normal,
- Click,
+ Normal, //闈炵偣鍑荤姸鎬�
+ Click, //鐐瑰嚮鍚庣姸鎬�
Locked,
}
@@ -1902,8 +1926,7 @@
MJXB = 2, //绉樺瀵诲疂
GatherSoulXB = 3, //鑱氶瓊瀵诲疂
TreasurePavilion = 4, //鍙ゅ疂瀵诲疂
- BestXB = 5, //鏋佸搧瀵诲疂
- RuneXB = 6, //绗︽枃瀵诲疂
+ HeroCall = 5, //鑻遍泟鎷涘嫙
}
//鏌ヨ鍏朵粬鐜╁鏁版嵁 鐢ㄩ�旂被鍨�
--
Gitblit v1.8.0