From 6a105ff34adac6be5e71e17554e9eb3a3bc1b86c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 20 十月 2025 11:50:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Utility/EnumHelper.cs | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index b6bcfc4..fde5a01 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -419,7 +419,7 @@
Wristband = 8, //鎶よ厱
Shawl = 9, //鎶偐
Neck = 10, //椤归摼
- Ring= 11, //鎴掓寚
+ Ring = 11, //鎴掓寚
Amulet = 12, //鎶ょ
retMax,
@@ -557,7 +557,7 @@
ModelMark = 119, //鍙樺舰妯″瀷Mark 119
PrizeCoin = 120, //濂栧姳鐐瑰埜鏁� 120
ExAttr11 = 121, //鎵╁睍灞炴��11 121 鐜伴噾浠ｅ竵锛堜唬閲戝埜锛�
- ExAttr12 = 122, //鎵╁睍灞炴��12 閫�鍑轰粰鐩熸椂闂�
+ ExAttr12 = 122, //鎵╁睍灞炴��12 璁板綍绂诲紑淇℃伅锛屼富鍔ㄧ寮�娆℃暟*100 + 琚涪娆℃暟*10 + 鏈�鍚庝竴娆℃槸鍚︿富鍔ㄧ寮�鐨勶紝鏆傛椂鏈�澶氱疮璁¤褰曞埌9娆�
ExAttr13 = 123, //鎵╁睍灞炴��13 鏈嶅姟鍣ㄧ粍ID
ExAttr14 = 124, //鎵╁睍灞炴��14 124
@@ -671,10 +671,10 @@
default4, // 鐜繚鍊� 232
default5, // 233浠欑帀璐熸暟
default6, // 234鐏电煶璐熸暟
- default7,
+ default7,
default8,
default9, // 237 鍦板浘澧冪晫闅惧害
- default10, // 238 绂诲紑浠欑洘鏃堕棿鎴筹紙鍖呭惈涓诲姩閫�鍑烘垨琚涪
+ default10, // 238 璁板綍绂诲紑鏃堕棿鎴筹紝琚涪鎴栦富鍔ㄩ��鍑哄潎浼氭洿鏂拌鍊�
default11, // 239 浠ｈ〃榄呭姏绛夌骇
default12,
default13, // 241 鍙ょ璐у竵
@@ -691,7 +691,7 @@
default24,
default25,
default26, // 254 鎴橀敜
- default27,
+ default27,
default28,
default29,
default30,
@@ -710,6 +710,7 @@
default43, // 271 骞诲闃佺Н鍒�
default44, // 272 姝﹀皢鎷涘嫙绉垎
GoldRush = 285, // 娣橀噾浠�
+ ChallengeVoucher = 286,//鎸戞垬鍑瘉
};
@@ -775,7 +776,7 @@
Guard_1 = 114, // 鐏靛畧 1
Guard_2 = 115, //鐏靛畧 2
Hero = 150, //姝﹀皢
-
+
}
@@ -1152,7 +1153,7 @@
BatchAlchemyFairy = 36,//鎵归噺鐐煎埗浠欎腹
BossHomeBuyTimes = 37,//boss涔嬪璐拱娆℃暟
SelfBossBuyTims = 38, //涓汉boss璐拱娆℃暟
-
+
}
@@ -1229,7 +1230,7 @@
Def_RewardType_HolidayLogin = 37,//鑺傛棩鐧诲綍濂栧姳
Def_RewardType_HolidayTravel = 38,//鑺傛棩娓稿巻濂栧姳
-
+
}
@@ -1282,7 +1283,7 @@
FashionDress = 24,//鏃惰
JadeDynastyEquip = 25, //璇涗粰瑁呭
-
+
}
@@ -1343,7 +1344,7 @@
RushAttack = 34,//34 鍐查攱+浼ゅ锛岀劧鍚庢晥鏋滃崐寰勯厤0鏃�=鍗曟敾浼ゅ锛岄厤>0鏃�=缇ゆ敾鏍煎瓙鏁帮紝閰�5灏辩瓑浜庤缇ゆ敾5*5
//35 钃勫姏妯℃澘锛屾惌閰嶆晥鏋滃�� 鏁堟灉ID 1206 A鍊间负鑳介噺娆℃暟
default35,
-
+
}
@@ -1649,7 +1650,7 @@
default1, //鍗囬樁
default2,
default3,
-
+
}
@@ -1817,16 +1818,7 @@
//鏌ヨ鍏朵粬鐜╁鏁版嵁 鐢ㄩ�旂被鍨�
public enum ViewPlayerType
{
- viewPlayerEquip = 0, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛堣澶囩敱璇锋眰澶у鐣岄樁鍐冲畾锛夛紝骞舵墦寮�鐣岄潰
- viewPlayerFightPower = 1, //鏌ョ湅鐜╁鎴樺姏璇︽儏锛屽苟鎵撳紑鐣岄潰
- viewPlayerData = 2, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛屽叕鐢�
- viewPlayerDataZZ = 3, //鍔╂垬鍦烘櫙浣跨敤
- viewPlayerDataArena = 4, //鏈湇绔炴妧鍦哄満鏅娇鐢�
- viewPlayerDataFairyKing = 5, //浠欑洘鑱旇禌鐜嬭�匲I浣跨敤
+ viewPlayerData = 0, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛屽叕鐢ㄦ墦寮�鐣岄潰
+ viewGuildLeader = 1, //鏌ョ湅鐜╁鐨勫叕浼氭棌闀夸俊鎭�
- //鏌ヨ璺ㄦ湇鏁版嵁浠�100寮�濮�
- viewCrossPlayerEquip = 100, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛堣澶囩敱璇锋眰澶у鐣岄樁鍐冲畾锛夛紝骞舵墦寮�鐣岄潰
- viewCrossPlayerFightPower = 101, //鏌ョ湅鐜╁鎴樺姏璇︽儏锛屽苟鎵撳紑鐣岄潰
- viewCrossPlayerData = 102, //鏌ョ湅鐜╁鍩烘湰淇℃伅锛屽叕鐢�
- viewCrossPlayerDataBlessedLand = 103, //绂忓湴椹辫刀
}
\ No newline at end of file
--
Gitblit v1.8.0