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 | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index e4f43ec..8b7664c 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -453,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,
@@ -537,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
@@ -697,7 +697,7 @@
default30,
default31,
default32,
- default33, // 261 缁撴櫠
+ default33, // 261 鐜夐珦
default34, // 262 鍑瘉绉垎
default35, // 263 鑱氶瓊绮惧崕
default36, // 264 Boss鏈�缁堜激瀹冲姞鎴�
@@ -818,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, //绁炲叺
@@ -862,7 +862,7 @@
SkillTreasure = 95,//鎶�鑳芥硶瀹�
WingCompose = 97,//缈呰唨鍚堟垚
Demon = 98,//娣蜂贡濡栧煙
- HappyFindTreasure = 99,//娆箰瀵诲疂
+ HappyFindTreasure = 99,// 鑻遍泟鎷涘嫙
FightPromote = 100,//鎴樺姏鎻愬崌
AncientBattleGround = 101,//涓婂彜鎴樺満
Chat = 102,//鑱婂ぉ
@@ -1077,14 +1077,16 @@
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,
@@ -1096,7 +1098,7 @@
/// <summary>
/// (204, 204, 204, 255)
/// </summary>
- Gray = 16,
+ Gray = 16, // 绮楃硻 鐏拌壊
//鐗╁搧鍝佽川棰滆壊
itemjingliang = 17, //绮捐壇
itemxiyou = 18, //绋�鏈�
@@ -1924,8 +1926,7 @@
MJXB = 2, //绉樺瀵诲疂
GatherSoulXB = 3, //鑱氶瓊瀵诲疂
TreasurePavilion = 4, //鍙ゅ疂瀵诲疂
- BestXB = 5, //鏋佸搧瀵诲疂
- RuneXB = 6, //绗︽枃瀵诲疂
+ HeroCall = 5, //鑻遍泟鎷涘嫙
}
//鏌ヨ鍏朵粬鐜╁鏁版嵁 鐢ㄩ�旂被鍨�
--
Gitblit v1.8.0