diff --git a/build/24-亮金装备价值提示.txt b/build/24-亮金装备价值提示.txt
index 7b2b219..f801525 100644
--- a/build/24-亮金装备价值提示.txt
+++ b/build/24-亮金装备价值提示.txt
@@ -1,42 +1,42 @@
 //                                       ++++++  5.5，亮金/手工装备价值提示 ++++++
 //首饰价值提示
 //防御戒指
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>632 OR (FCR>9 FORMULARC>532) OR (AR>70 FORMULARC>562))]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>574 OR (FCR>9 FORMULARC>474) OR (AR>70 FORMULARC>504))]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>517 OR (FCR>9 FORMULARC>417) OR (AR>70 FORMULARC>442))]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>459 OR (FCR>9 FORMULARC>359) OR (AR>70 FORMULARC>389))]:%DOT-0A%%WHITE%※ YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %CORAL%攻坚戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>632 OR (FCR>9 FORMULARC>532) OR (AR>70 FORMULARC>562)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>574 OR (FCR>9 FORMULARC>474) OR (AR>70 FORMULARC>504)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>517 OR (FCR>9 FORMULARC>417) OR (AR>70 FORMULARC>442)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID (STR+DEX+STAT3>24 OR STR+DEX+STAT3+LIFE>50 OR FRES+CRES+LRES+PRES>59) (FORMULARC>459 OR (FCR>9 FORMULARC>359) OR (AR>70 FORMULARC>389)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %CORAL%攻坚戒指}
 //战系戒指
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>659]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %TAN%战系戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>599]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %TAN%战系戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>539]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %TAN%战系戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>479]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %TAN%战系戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>419]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%高级 %TAN%战系戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>659 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %TAN%战系戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>599 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %TAN%战系戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>539 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %TAN%战系戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>479 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %TAN%战系戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID MINDMG+MAXDMG>9 FORMULARA>419 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%高级 %TAN%战系戒指}
 //法系戒指
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>632]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %PURPLE%施法戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>574]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 施法戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19)  FORMULARB>517]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %PURPLE%施法戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>459]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %PURPLE%施法戒指}
-ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>402]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%高级 %PURPLE%施法戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>632 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %PURPLE%施法戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>574 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 施法戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19)  FORMULARB>517 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %PURPLE%施法戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>459 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %PURPLE%施法戒指}
+ItemDisplay[RARE_NOTE rin (RARE OR CRAFT) ID FCR>0 (MANA>60 OR STR+DEX+STAT1+STAT3>19) FORMULARB>402 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%高级 %PURPLE%施法戒指}
 
 //防御项链
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>659 OR (FCR>9 FORMULAAC>559))]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>599 OR (FCR>9 FORMULAAC>499))]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>539 OR (FCR>9 FORMULAAC>439))]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>659 OR (EDAM>29 FORMULAAC>539) OR (AR>119 FORMULAAC>559))]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>599 OR (EDAM>29 FORMULAAC>479) OR (AR>119 FORMULAAC>499))]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>539 OR (EDAM>29 FORMULAAC>419) OR (AR>119 FORMULAAC>439))]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>659 OR (FCR>9 FORMULAAC>559)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>599 OR (FCR>9 FORMULAAC>499)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID CASTERSKILL STAT110>49 (FORMULAAC>539 OR (FCR>9 FORMULAAC>439)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>659 OR (EDAM>29 FORMULAAC>539) OR (AR>119 FORMULAAC>559)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>599 OR (EDAM>29 FORMULAAC>479) OR (AR>119 FORMULAAC>499)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 %CORAL%攻坚项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL STAT110>49 (FORMULAAC>539 OR (EDAM>29 FORMULAAC>419) OR (AR>119 FORMULAAC>439)) !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %CORAL%攻坚项链}
 //战系项链
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>659]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %TAN%战系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>599]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说  %TAN%战系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>539]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗  %TAN%战系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>479]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有  %TAN%战系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>419]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%BLUE%高级 %TAN%战系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>659 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 %TAN%战系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>599 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说  %TAN%战系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>539 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗  %TAN%战系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>479 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有  %TAN%战系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID PHYSISKILL FORMULAAA>419 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%BLUE%高级 %TAN%战系项链}
 //法系项链
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>659]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 法系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>599]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 法系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>539]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %PURPLE%法系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>479]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %PURPLE%法系项链}
-ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>419]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%BLUE%高级 %PURPLE%法系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>659 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %ORANGE%★★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%ORANGE%神话 法系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>599 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %PURPLE%★★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%PURPLE%传说 法系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>539 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %RED%★★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%RED%史诗 %PURPLE%法系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>479 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %YELLOW%★★☆ %WHITE%※%CL%%NAME%{%NAME%%CL%%YELLOW%稀有 %PURPLE%法系项链}
+ItemDisplay[RARE_NOTE amu (RARE OR CRAFT) ID FCR>0 CASTERSKILL FORMULAAB>419 !EQUIPPED !MERC]:%DOT-0A%%WHITE%※ %BLUE%★★ %WHITE%※%CL%%NAME%{%NAME%%CL%%BLUE%高级 %PURPLE%法系项链}
 
 //珠宝价值提示
 //战系珠宝