diff --git a/public/img/colorful.gif b/public/img/colorful.gif
new file mode 100644
index 0000000..3331fec
Binary files /dev/null and b/public/img/colorful.gif differ
diff --git a/public/img/equips/bracers/人参果裹布.png b/public/img/equips/bracers/人参果裹布.png
new file mode 100644
index 0000000..b9cab48
Binary files /dev/null and b/public/img/equips/bracers/人参果裹布.png differ
diff --git a/public/img/equips/bracers/四不像.png b/public/img/equips/bracers/四不像.png
new file mode 100644
index 0000000..27bb485
Binary files /dev/null and b/public/img/equips/bracers/四不像.png differ
diff --git a/public/img/equips/bracers/多情腕.png b/public/img/equips/bracers/多情腕.png
new file mode 100644
index 0000000..287ef11
Binary files /dev/null and b/public/img/equips/bracers/多情腕.png differ
diff --git a/public/img/equips/bracers/新手.png b/public/img/equips/bracers/新手.png
new file mode 100644
index 0000000..e5c3941
Binary files /dev/null and b/public/img/equips/bracers/新手.png differ
diff --git a/public/img/equips/bracers/毒蛇.png b/public/img/equips/bracers/毒蛇.png
new file mode 100644
index 0000000..5f153af
Binary files /dev/null and b/public/img/equips/bracers/毒蛇.png differ
diff --git a/public/img/equips/bracers/火晶环.png b/public/img/equips/bracers/火晶环.png
new file mode 100644
index 0000000..67698a3
Binary files /dev/null and b/public/img/equips/bracers/火晶环.png differ
diff --git a/public/img/equips/bracers/火神腕.png b/public/img/equips/bracers/火神腕.png
new file mode 100644
index 0000000..f511411
Binary files /dev/null and b/public/img/equips/bracers/火神腕.png differ
diff --git a/public/img/equips/bracers/狸猫足印.png b/public/img/equips/bracers/狸猫足印.png
new file mode 100644
index 0000000..cc8b939
Binary files /dev/null and b/public/img/equips/bracers/狸猫足印.png differ
diff --git a/public/img/equips/bracers/玩藕.png b/public/img/equips/bracers/玩藕.png
new file mode 100644
index 0000000..dded4ab
Binary files /dev/null and b/public/img/equips/bracers/玩藕.png differ
diff --git a/public/img/equips/bracers/绣与骨.png b/public/img/equips/bracers/绣与骨.png
new file mode 100644
index 0000000..df82868
Binary files /dev/null and b/public/img/equips/bracers/绣与骨.png differ
diff --git a/public/img/equips/bracers/美菩萨.png b/public/img/equips/bracers/美菩萨.png
new file mode 100644
index 0000000..cce0083
Binary files /dev/null and b/public/img/equips/bracers/美菩萨.png differ
diff --git a/public/img/equips/bracers/裹尸布.png b/public/img/equips/bracers/裹尸布.png
new file mode 100644
index 0000000..0f0cc0f
Binary files /dev/null and b/public/img/equips/bracers/裹尸布.png differ
diff --git a/public/img/equips/bracers/降龙.png b/public/img/equips/bracers/降龙.png
new file mode 100644
index 0000000..499dc9e
Binary files /dev/null and b/public/img/equips/bracers/降龙.png differ
diff --git a/public/img/equips/bracers/障目.png b/public/img/equips/bracers/障目.png
new file mode 100644
index 0000000..0d656d4
Binary files /dev/null and b/public/img/equips/bracers/障目.png differ
diff --git a/public/img/equips/bracers/鹦鹉杯.png b/public/img/equips/bracers/鹦鹉杯.png
new file mode 100644
index 0000000..053c5dd
Binary files /dev/null and b/public/img/equips/bracers/鹦鹉杯.png differ
diff --git a/public/img/equips/bracers/黑手.png b/public/img/equips/bracers/黑手.png
new file mode 100644
index 0000000..3b6a419
Binary files /dev/null and b/public/img/equips/bracers/黑手.png differ
diff --git a/public/img/equips/jewelry/勾魂夺魂.png b/public/img/equips/jewelry/勾魂夺魂.png
new file mode 100644
index 0000000..001308c
Binary files /dev/null and b/public/img/equips/jewelry/勾魂夺魂.png differ
diff --git a/public/img/equips/jewelry/太乙神器·四面塔.png b/public/img/equips/jewelry/太乙神器·四面塔.png
new file mode 100644
index 0000000..4a9698b
Binary files /dev/null and b/public/img/equips/jewelry/太乙神器·四面塔.png differ
diff --git a/public/img/equips/jewelry/寒晶佩.png b/public/img/equips/jewelry/寒晶佩.png
new file mode 100644
index 0000000..27c4af0
Binary files /dev/null and b/public/img/equips/jewelry/寒晶佩.png differ
diff --git a/public/img/equips/jewelry/月灵幻梦.png b/public/img/equips/jewelry/月灵幻梦.png
new file mode 100644
index 0000000..5387ed1
Binary files /dev/null and b/public/img/equips/jewelry/月灵幻梦.png differ
diff --git a/public/img/equips/jewelry/未婚.png b/public/img/equips/jewelry/未婚.png
new file mode 100644
index 0000000..e6c1fdf
Binary files /dev/null and b/public/img/equips/jewelry/未婚.png differ
diff --git a/public/img/equips/jewelry/梳妆镜.png b/public/img/equips/jewelry/梳妆镜.png
new file mode 100644
index 0000000..6827829
Binary files /dev/null and b/public/img/equips/jewelry/梳妆镜.png differ
diff --git a/public/img/equips/jewelry/沙旦头饰.png b/public/img/equips/jewelry/沙旦头饰.png
new file mode 100644
index 0000000..7d24edf
Binary files /dev/null and b/public/img/equips/jewelry/沙旦头饰.png differ
diff --git a/public/img/equips/jewelry/狮王手印.png b/public/img/equips/jewelry/狮王手印.png
new file mode 100644
index 0000000..fe12d91
Binary files /dev/null and b/public/img/equips/jewelry/狮王手印.png differ
diff --git a/public/img/equips/jewelry/琉璃盘.png b/public/img/equips/jewelry/琉璃盘.png
new file mode 100644
index 0000000..78d2f12
Binary files /dev/null and b/public/img/equips/jewelry/琉璃盘.png differ
diff --git a/public/img/equips/jewelry/白骨夫人的右耳环.png b/public/img/equips/jewelry/白骨夫人的右耳环.png
new file mode 100644
index 0000000..b5eb531
Binary files /dev/null and b/public/img/equips/jewelry/白骨夫人的右耳环.png differ
diff --git a/public/img/equips/jewelry/真经.png b/public/img/equips/jewelry/真经.png
new file mode 100644
index 0000000..4252c4e
Binary files /dev/null and b/public/img/equips/jewelry/真经.png differ
diff --git a/public/img/equips/jewelry/督战.png b/public/img/equips/jewelry/督战.png
new file mode 100644
index 0000000..1b93406
Binary files /dev/null and b/public/img/equips/jewelry/督战.png differ
diff --git a/public/img/equips/jewelry/紫金钵盂.png b/public/img/equips/jewelry/紫金钵盂.png
new file mode 100644
index 0000000..3a5d4ef
Binary files /dev/null and b/public/img/equips/jewelry/紫金钵盂.png differ
diff --git a/public/img/equips/jewelry/良人.png b/public/img/equips/jewelry/良人.png
new file mode 100644
index 0000000..4c2587b
Binary files /dev/null and b/public/img/equips/jewelry/良人.png differ
diff --git a/public/img/equips/jewelry/谎言.png b/public/img/equips/jewelry/谎言.png
new file mode 100644
index 0000000..e37656f
Binary files /dev/null and b/public/img/equips/jewelry/谎言.png differ
diff --git a/public/img/equips/jewelry/赤羚天禧.png b/public/img/equips/jewelry/赤羚天禧.png
new file mode 100644
index 0000000..9dfa375
Binary files /dev/null and b/public/img/equips/jewelry/赤羚天禧.png differ
diff --git a/public/img/equips/jewelry/金钵盂.png b/public/img/equips/jewelry/金钵盂.png
new file mode 100644
index 0000000..d63b010
Binary files /dev/null and b/public/img/equips/jewelry/金钵盂.png differ
diff --git a/public/img/equips/jewelry/马鸣玉佩.png b/public/img/equips/jewelry/马鸣玉佩.png
new file mode 100644
index 0000000..e22adb1
Binary files /dev/null and b/public/img/equips/jewelry/马鸣玉佩.png differ
diff --git a/public/img/equips/pants/五味.png b/public/img/equips/pants/五味.png
new file mode 100644
index 0000000..a7d382c
Binary files /dev/null and b/public/img/equips/pants/五味.png differ
diff --git a/public/img/equips/pants/囚徒.png b/public/img/equips/pants/囚徒.png
new file mode 100644
index 0000000..bbdc5b1
Binary files /dev/null and b/public/img/equips/pants/囚徒.png differ
diff --git a/public/img/equips/pants/奎英的百褶裙.png b/public/img/equips/pants/奎英的百褶裙.png
new file mode 100644
index 0000000..ee5d034
Binary files /dev/null and b/public/img/equips/pants/奎英的百褶裙.png differ
diff --git a/public/img/equips/pants/新手.png b/public/img/equips/pants/新手.png
new file mode 100644
index 0000000..6c908a7
Binary files /dev/null and b/public/img/equips/pants/新手.png differ
diff --git a/public/img/equips/pants/梦回龙宫.png b/public/img/equips/pants/梦回龙宫.png
new file mode 100644
index 0000000..42ec4b9
Binary files /dev/null and b/public/img/equips/pants/梦回龙宫.png differ
diff --git a/public/img/equips/pants/泣甲.png b/public/img/equips/pants/泣甲.png
new file mode 100644
index 0000000..a257cf9
Binary files /dev/null and b/public/img/equips/pants/泣甲.png differ
diff --git a/public/img/equips/pants/管家服.png b/public/img/equips/pants/管家服.png
new file mode 100644
index 0000000..a6da3ed
Binary files /dev/null and b/public/img/equips/pants/管家服.png differ
diff --git a/public/img/equips/pants/藏经甲.png b/public/img/equips/pants/藏经甲.png
new file mode 100644
index 0000000..770e96a
Binary files /dev/null and b/public/img/equips/pants/藏经甲.png differ
diff --git a/public/img/equips/pants/饿鬼.png b/public/img/equips/pants/饿鬼.png
new file mode 100644
index 0000000..63f24a4
Binary files /dev/null and b/public/img/equips/pants/饿鬼.png differ
diff --git a/public/img/equips/pants/鱼蓝.png b/public/img/equips/pants/鱼蓝.png
new file mode 100644
index 0000000..5a61485
Binary files /dev/null and b/public/img/equips/pants/鱼蓝.png differ
diff --git a/public/img/equips/pants/龙鳞胫甲.png b/public/img/equips/pants/龙鳞胫甲.png
new file mode 100644
index 0000000..af4e5f5
Binary files /dev/null and b/public/img/equips/pants/龙鳞胫甲.png differ
diff --git a/public/img/equips/shoes/九万里.png b/public/img/equips/shoes/九万里.png
new file mode 100644
index 0000000..15851e5
Binary files /dev/null and b/public/img/equips/shoes/九万里.png differ
diff --git a/public/img/equips/shoes/新手.png b/public/img/equips/shoes/新手.png
new file mode 100644
index 0000000..691def1
Binary files /dev/null and b/public/img/equips/shoes/新手.png differ
diff --git a/public/img/equips/shoes/昆仑履.png b/public/img/equips/shoes/昆仑履.png
new file mode 100644
index 0000000..474db72
Binary files /dev/null and b/public/img/equips/shoes/昆仑履.png differ
diff --git a/public/img/equips/shoes/浅夏紫灵.png b/public/img/equips/shoes/浅夏紫灵.png
new file mode 100644
index 0000000..d9250c5
Binary files /dev/null and b/public/img/equips/shoes/浅夏紫灵.png differ
diff --git a/public/img/equips/shoes/灵官靴.png b/public/img/equips/shoes/灵官靴.png
new file mode 100644
index 0000000..147959b
Binary files /dev/null and b/public/img/equips/shoes/灵官靴.png differ
diff --git a/public/img/equips/shoes/灵韵集能器.png b/public/img/equips/shoes/灵韵集能器.png
new file mode 100644
index 0000000..f6f5297
Binary files /dev/null and b/public/img/equips/shoes/灵韵集能器.png differ
diff --git a/public/img/equips/shoes/犬齿鞋.png b/public/img/equips/shoes/犬齿鞋.png
new file mode 100644
index 0000000..df097b1
Binary files /dev/null and b/public/img/equips/shoes/犬齿鞋.png differ
diff --git a/public/img/equips/shoes/私奔.png b/public/img/equips/shoes/私奔.png
new file mode 100644
index 0000000..12cd682
Binary files /dev/null and b/public/img/equips/shoes/私奔.png differ
diff --git a/public/img/equips/shoes/红尘.png b/public/img/equips/shoes/红尘.png
new file mode 100644
index 0000000..de9a07c
Binary files /dev/null and b/public/img/equips/shoes/红尘.png differ
diff --git a/public/img/equips/shoes/蛙将足.png b/public/img/equips/shoes/蛙将足.png
new file mode 100644
index 0000000..6ef5f1f
Binary files /dev/null and b/public/img/equips/shoes/蛙将足.png differ
diff --git a/public/img/equips/shoes/血遁靴.png b/public/img/equips/shoes/血遁靴.png
new file mode 100644
index 0000000..28d40d7
Binary files /dev/null and b/public/img/equips/shoes/血遁靴.png differ
diff --git a/public/img/equips/shoes/踏浪.jpg b/public/img/equips/shoes/踏浪.jpg
new file mode 100644
index 0000000..824cd16
Binary files /dev/null and b/public/img/equips/shoes/踏浪.jpg differ
diff --git a/public/img/equips/weapon/丈三.png b/public/img/equips/weapon/丈三.png
new file mode 100644
index 0000000..2d4c1f9
Binary files /dev/null and b/public/img/equips/weapon/丈三.png differ
diff --git a/public/img/equips/weapon/九灵·元圣.png b/public/img/equips/weapon/九灵·元圣.png
new file mode 100644
index 0000000..e8ee1cf
Binary files /dev/null and b/public/img/equips/weapon/九灵·元圣.png differ
diff --git a/public/img/equips/weapon/伤心刺.png b/public/img/equips/weapon/伤心刺.png
new file mode 100644
index 0000000..8232727
Binary files /dev/null and b/public/img/equips/weapon/伤心刺.png differ
diff --git a/public/img/equips/weapon/六不像.png b/public/img/equips/weapon/六不像.png
new file mode 100644
index 0000000..727a22e
Binary files /dev/null and b/public/img/equips/weapon/六不像.png differ
diff --git a/public/img/equips/weapon/冷龙之心.png b/public/img/equips/weapon/冷龙之心.png
new file mode 100644
index 0000000..97e5508
Binary files /dev/null and b/public/img/equips/weapon/冷龙之心.png differ
diff --git a/public/img/equips/weapon/初恋.png b/public/img/equips/weapon/初恋.png
new file mode 100644
index 0000000..0e39bdb
Binary files /dev/null and b/public/img/equips/weapon/初恋.png differ
diff --git a/public/img/equips/weapon/初拥.png b/public/img/equips/weapon/初拥.png
new file mode 100644
index 0000000..ae15e1f
Binary files /dev/null and b/public/img/equips/weapon/初拥.png differ
diff --git a/public/img/equips/weapon/剑姬.png b/public/img/equips/weapon/剑姬.png
new file mode 100644
index 0000000..f46631c
Binary files /dev/null and b/public/img/equips/weapon/剑姬.png differ
diff --git a/public/img/equips/weapon/噩梦.png b/public/img/equips/weapon/噩梦.png
new file mode 100644
index 0000000..62622a7
Binary files /dev/null and b/public/img/equips/weapon/噩梦.png differ
diff --git a/public/img/equips/weapon/大铁城.png b/public/img/equips/weapon/大铁城.png
new file mode 100644
index 0000000..40d1bb3
Binary files /dev/null and b/public/img/equips/weapon/大铁城.png differ
diff --git a/public/img/equips/weapon/天照.png b/public/img/equips/weapon/天照.png
new file mode 100644
index 0000000..4e802d1
Binary files /dev/null and b/public/img/equips/weapon/天照.png differ
diff --git a/public/img/equips/weapon/弑神.png b/public/img/equips/weapon/弑神.png
new file mode 100644
index 0000000..f38fe54
Binary files /dev/null and b/public/img/equips/weapon/弑神.png differ
diff --git a/public/img/equips/weapon/斩马.png b/public/img/equips/weapon/斩马.png
new file mode 100644
index 0000000..d923da5
Binary files /dev/null and b/public/img/equips/weapon/斩马.png differ
diff --git a/public/img/equips/weapon/无遮.png b/public/img/equips/weapon/无遮.png
new file mode 100644
index 0000000..d48c53c
Binary files /dev/null and b/public/img/equips/weapon/无遮.png differ
diff --git a/public/img/equips/weapon/暴雪.png b/public/img/equips/weapon/暴雪.png
new file mode 100644
index 0000000..dad6603
Binary files /dev/null and b/public/img/equips/weapon/暴雪.png differ
diff --git a/public/img/equips/weapon/杀意.png b/public/img/equips/weapon/杀意.png
new file mode 100644
index 0000000..38b54d3
Binary files /dev/null and b/public/img/equips/weapon/杀意.png differ
diff --git a/public/img/equips/weapon/武气.png b/public/img/equips/weapon/武气.png
new file mode 100644
index 0000000..f739ba4
Binary files /dev/null and b/public/img/equips/weapon/武气.png differ
diff --git a/public/img/equips/weapon/求爱.png b/public/img/equips/weapon/求爱.png
new file mode 100644
index 0000000..fcac251
Binary files /dev/null and b/public/img/equips/weapon/求爱.png differ
diff --git a/public/img/equips/weapon/流萤.png b/public/img/equips/weapon/流萤.png
new file mode 100644
index 0000000..0538b93
Binary files /dev/null and b/public/img/equips/weapon/流萤.png differ
diff --git a/public/img/equips/weapon/炎魔.png b/public/img/equips/weapon/炎魔.png
new file mode 100644
index 0000000..87d547c
Binary files /dev/null and b/public/img/equips/weapon/炎魔.png differ
diff --git a/public/img/equips/weapon/狸猫利刃.png b/public/img/equips/weapon/狸猫利刃.png
new file mode 100644
index 0000000..2312661
Binary files /dev/null and b/public/img/equips/weapon/狸猫利刃.png differ
diff --git a/public/img/equips/weapon/砍头.png b/public/img/equips/weapon/砍头.png
new file mode 100644
index 0000000..a26e6a3
Binary files /dev/null and b/public/img/equips/weapon/砍头.png differ
diff --git a/public/img/equips/weapon/私语.png b/public/img/equips/weapon/私语.png
new file mode 100644
index 0000000..48d1096
Binary files /dev/null and b/public/img/equips/weapon/私语.png differ
diff --git a/public/img/equips/weapon/称霸.png b/public/img/equips/weapon/称霸.png
new file mode 100644
index 0000000..41dba1d
Binary files /dev/null and b/public/img/equips/weapon/称霸.png differ
diff --git a/public/img/equips/weapon/银河裂.png b/public/img/equips/weapon/银河裂.png
new file mode 100644
index 0000000..3e960dd
Binary files /dev/null and b/public/img/equips/weapon/银河裂.png differ
diff --git a/public/img/equips/weapon/青光.png b/public/img/equips/weapon/青光.png
new file mode 100644
index 0000000..2cd080b
Binary files /dev/null and b/public/img/equips/weapon/青光.png differ
diff --git a/public/img/equips/weapon/鳌之毒.png b/public/img/equips/weapon/鳌之毒.png
new file mode 100644
index 0000000..00251c2
Binary files /dev/null and b/public/img/equips/weapon/鳌之毒.png differ
diff --git a/public/img/equips/weapon/鳍刺.png b/public/img/equips/weapon/鳍刺.png
new file mode 100644
index 0000000..0a0ae5c
Binary files /dev/null and b/public/img/equips/weapon/鳍刺.png differ
diff --git a/public/img/equips/weapon/鸣血.png b/public/img/equips/weapon/鸣血.png
new file mode 100644
index 0000000..2ff9ede
Binary files /dev/null and b/public/img/equips/weapon/鸣血.png differ
diff --git a/public/img/equips/weapon/黑风.png b/public/img/equips/weapon/黑风.png
new file mode 100644
index 0000000..9e85a36
Binary files /dev/null and b/public/img/equips/weapon/黑风.png differ
diff --git a/public/img/equips/weapon/黩武.png b/public/img/equips/weapon/黩武.png
new file mode 100644
index 0000000..0b580eb
Binary files /dev/null and b/public/img/equips/weapon/黩武.png differ
diff --git a/public/img/equips/weapon/龙衔.png b/public/img/equips/weapon/龙衔.png
new file mode 100644
index 0000000..245eb83
Binary files /dev/null and b/public/img/equips/weapon/龙衔.png differ
diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index f2f11ab..3fca3ef 100644
--- a/src/assets/css/base.scss
+++ b/src/assets/css/base.scss
@@ -138,8 +138,42 @@ button {
   border-radius: 4px;
 }
 
+// .unique {
+//   background: linear-gradient(125deg, #c90e0d36, #5656d647, 40%, #867d1033, #2c846f4d) !important;
+// }
+
+.shabby {
+  color: #a1a1a1;
+}
+.ordinary {
+  color: #fff;
+}
+.artifact {
+  color: #ff00ff;
+}
+.epic {
+  color: #f78918;
+}
 .unique {
-  background: linear-gradient(125deg, #c90e0d36, #5656d647, 40%, #867d1033, #2c846f4d) !important;
+  color: #ff0000;
+}
+.colorful {
+  background-image: -webkit-linear-gradient(
+    left,
+    #eb24e1,
+    #fc2121 10%,
+    #ff7f00 20%,
+    #ffff00 30%,
+    #00ff00 40%,
+    #4cfdfd 50%,
+    #fc2121 60%,
+    #ff7f00 70%,
+    #ffff00 80%,
+    #00ff00 90%,
+    #4cfdfd 100%
+  );
+  -webkit-background-clip: text;
+  color: transparent;
 }
 
 .fade-enter-active,
diff --git a/src/components/equip-icon.vue b/src/components/equip-icon.vue
index 7f46c49..8a0caee 100644
--- a/src/components/equip-icon.vue
+++ b/src/components/equip-icon.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class='icon' :style="{ 'box-shadow': 'inset 0 0 7px 2px ' + ((equip && equip.quality.color) || '#a1a1a1') }">
-        <img v-if="equip && isUnique(equip)" class="red-flash" :src="red_icon">
-        <span v-if="equip">
-            <img :src="equips_icon_path + equip.base.icon">
+    <div :class="['icon', equip?.quality.quality]">
+        <img v-if="src" class="red-flash" :src="src">
+        <span class="equip" v-if="equip">
+            <img class="img" :src="equips_icon_path + equip.base.icon">
             <div class="lv" v-if="equip.lv">lv{{ equip.lv }}</div>
         </span>
     </div>
@@ -12,11 +12,25 @@
 import { useStore } from "vuex";
 import { reactive, onMounted, ref, computed } from "vue";
 import { useI18n } from "vue3-i18n";
-import { qualitys, equips_icon_path, red_icon } from "@/config";
+import { qualitys, equips_icon_path, red_gif, colorful_gif } from "@/config";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 
+const src = computed(() => {
+    if (!prop.equip) {
+        return false;
+    }
+    const quality = prop.equip.quality.quality;
+    if (quality == qualitys[4]) {
+        return red_gif;
+    }
+    if (quality == qualitys[5]) {
+        return colorful_gif;
+    }
+    return null;
+})
+
 const prop = defineProps({
     equip: {
         type: Object,
@@ -29,7 +43,7 @@ const isUnique = (equip) => {
         return false;
     }
     const quality = equip.quality.quality;
-    return quality && quality == qualitys[4];
+    return quality && (quality == qualitys[4] || quality == qualitys[5]);
 }
 
 const iconClass = computed(() => {
@@ -42,6 +56,22 @@ const iconClass = computed(() => {
 onMounted(() => { });
 </script>
 <style lang="scss" scoped>
+.shabby {
+    box-shadow: inset 0 0 7px 2px #a1a1a1b8 !important;
+}
+
+.ordinary {
+    box-shadow: inset 0 0 7px 2px #ffffffb8 !important;
+}
+
+.artifact {
+    box-shadow: inset 0 0 7px 2px #ff00ffb8 !important;
+}
+
+.epic {
+    box-shadow: inset 0 0 7px 2px #f78918b8 !important;
+}
+
 .icon {
     width: 3.5rem;
     height: 3.5rem;
@@ -51,6 +81,22 @@ onMounted(() => { });
     justify-content: center;
     border-radius: 0.3rem;
     position: relative;
+    box-shadow: inset 0 0 7px 2px #a1a1a1b8;
+
+    .red-flash {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+    }
+
+    .img {
+        left: 15%;
+        top: 15%;
+        position: absolute;
+        background: #000;
+        width: 70%;
+        height: 70%;
+    }
 
     .lv {
         position: absolute;
@@ -61,11 +107,7 @@ onMounted(() => { });
     }
 }
 
-.red-flash {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-}
+
 
 @media only screen and (max-width: 768px) {
     .icon {
diff --git a/src/components/equip.vue b/src/components/equip.vue
index 737ebe6..1bab234 100644
--- a/src/components/equip.vue
+++ b/src/components/equip.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="equipPanel" :style="{ 'box-shadow': ' 0 0 5px 5px ' + equip.quality.color + 'b8' }" v-if="equip">
+    <div :class="['equipPanel', 'shadow-' + equip.quality.quality]" v-if="equip">
         <div class="title">
             <EquipIcon :equip="equip" />
-            <div class='name' :style="{ color: equip.quality.color }">
+            <div class='name' :class="equip.quality.quality">
                 {{ t(equip.type + '.' + equip.base.name + '.0') }}
                 {{ equip.strengthenLv ? '(+' + equip.strengthenLv + ')' : '' }}
             </div>
         </div>
         <div class='type'>
-            <div :style="{ color: equip.quality.color }">{{ t('quality.' + equip.quality.quality) }}</div>
+            <div :class="equip.quality.quality">{{ t('quality.' + equip.quality.quality) }}</div>
             <div>{{ t(equip.type + '.type') }}</div>
         </div>
         <div class='lv'>
@@ -19,10 +19,18 @@
                 <span>
                     {{ t(v.type + '.0') }} : {{ v.showVal }}
                 </span>
+                <span v-if="equip.sample">
+                    [{{ v.min }} - {{ v.max }}]
+                </span>
                 <span style="color:#68d5ed" v-if="equip.strengthenLv">
                     (+{{ strengthenValue(v.value, equip.strengthenLv) - v.value }})
                 </span>
             </div>
+            <div v-for="skill in skills" class="skill">
+                <span :class="skill.type">【{{ t('skill.' + skill.type) }}】</span>
+                <span>【{{ t('skill.' + skill.name + '.0') }}】</span>
+                <span>：{{ skill.desc() }}</span>
+            </div>
         </div>
         <div class="extraEntry">
             <div v-for="v in equip.extraEntry" :key="v.id">
@@ -39,14 +47,18 @@
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { reactive, onMounted, ref } from "vue";
+import { reactive, onMounted, ref, computed } from "vue";
 import { useI18n } from "vue3-i18n";
 import EquipIcon from "./equip-icon.vue";
-import { strengthenValue } from "@/tool"
+import { strengthenValue, createEquipSkill } from "@/tool"
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 
+const skills = computed(() => {
+    return createEquipSkill(prop.equip);
+})
+
 const prop = defineProps({
     equip: {
         type: Object,
@@ -61,7 +73,32 @@ onMounted(() => { });
     box-sizing: border-box;
 }
 
+.shadow-shabby {
+    box-shadow: 0 0 5px 5px #a1a1a1b8;
+}
+
+.shadow-ordinary {
+    box-shadow: 0 0 5px 5px #ffffffb8;
+}
+
+.shadow-artifact {
+    box-shadow: 0 0 5px 5px #ff00ffb8;
+}
+
+.shadow-epic {
+    box-shadow: 0 0 5px 5px #f78918b8;
+}
+
+.shadow-unique {
+    box-shadow: 0 0 5px 5px #ff0000b8;
+}
+
+.shadow-colorful {
+    box-shadow: 0 0 1px 1px #fc2121, 0 0 2px 1px #ff7f00, 0 0 3px 1px #ffff00, 0 0 4px 1px #00ff00, 0 0 5px 1px #4cfdfd, 0 0 6px 1px #3f61f7, 0 0 7px 1px #ff00ff;
+}
+
 .equipPanel {
+
     color: #f1f1f1;
     width: 20rem;
     height: auto;
@@ -108,6 +145,19 @@ onMounted(() => { });
         div {
             text-align: left;
         }
+
+        .skill {
+            padding-top: 5px;
+            color: #2a862f;
+
+            .action {
+                color: #ba100f;
+            }
+
+            .passive {
+                color: #ebdc64;
+            }
+        }
     }
 
     .extraEntry {
diff --git a/src/config/assets.ts b/src/config/assets.ts
index bac19cb..03bfe8b 100644
--- a/src/config/assets.ts
+++ b/src/config/assets.ts
@@ -42,7 +42,8 @@ export const close_icon = root + '/img/close.png';
 export const refresh_icon = root + '/img/re.png';
 export const playerImg = root + '/img/player.png';
 export const playerImg2 = root + '/img/player2.png';
-export const red_icon = root + '/img/red.gif';
+export const red_gif = root + '/img/red.gif';
+export const colorful_gif = root + '/img/colorful.gif';
 
 export const warning_icon = root + '/img/tip/warning.png';
 
diff --git a/src/config/base.ts b/src/config/base.ts
index d7b5e0f..4d2d341 100644
--- a/src/config/base.ts
+++ b/src/config/base.ts
@@ -8,9 +8,9 @@ export const reborn_point_coefficients = {
   def: 2,
   bloc: 2,
   recoverSpeed: 4,
-  moveSpeed: 4,
+  moveSpeed: 3,
   battleSpeed: 4,
 };
 export const player_move_time = 3000;
-export const player_battle_time = 4000;
+export const player_battle_time = 1000;
 export const archive_name = 'transmigration_game_archive';
diff --git a/src/config/beings.ts b/src/config/beings.ts
new file mode 100644
index 0000000..b6c0283
--- /dev/null
+++ b/src/config/beings.ts
@@ -0,0 +1,131 @@
+import { initialWeapon, initialArmor, initialNeck, initialRing, initialJewelry, initialpants, initialshoes, initialbracers, Equip } from '@/config';
+const monster_attr_factor = [0.9, 1, 1.15, 1.4];
+export const type_monster = 'monster';
+export const type_boss = 'boss';
+
+export class Attribute {
+  lv: number = 1;
+  coins: number = 0;
+  curHp: number = 200;
+  hp: number = 200;
+  hpPercent: number = 0;
+  baseAtk: number = 0;
+  atk: number = 0;
+  atkPercent: number = 0;
+  def: number = 0;
+  defPercent: number = 0;
+  reducPercent: number = 0;
+  bloc: number = 0;
+  blocPercent: number = 0;
+  eva: number = 0;
+  crit: number = 0; //暴击率
+  critDmg: number = 150; // 初始暴击伤害150%
+  dmgPercent: number = 0; //伤害加成
+  dmgReduc: number = 0; //伤害减免
+  critAvoid: number = 0; //暴击避免
+  critDmgReduc: number = 0; //暴击伤害减免
+  moveSpeed: number = 0; //移动速度
+  dps: number = 0;
+  skill: string = 'Attack';
+
+  constructor(ra?: RebornAttribute) {
+    if (ra) {
+      this.hp += ra.hp;
+      this.atk += ra.atk;
+      this.def += ra.def;
+      this.bloc += ra.bloc;
+      this.crit += ra.crit;
+      this.critDmg += ra.critDmg;
+      this.moveSpeed += ra.moveSpeed;
+    }
+  }
+}
+
+export class Player {
+  lv: number = 1;
+  coins: number = 0;
+  weapon: Equip = initialWeapon();
+  armor: Equip = initialArmor();
+  neck: Equip = initialNeck();
+  ring: Equip = initialRing();
+  jewelry: Equip = initialJewelry();
+  pants: Equip = initialpants();
+  shoes: Equip = initialshoes();
+  bracers: Equip = initialbracers();
+  attribute: Attribute = new Attribute();
+}
+
+export class RebornAttribute {
+  hp: number = 0;
+  atk: number = 0;
+  crit: number = 0;
+  critDmg: number = 0;
+  def: number = 0;
+  bloc: number = 0;
+  recoverSpeed: number = 0;
+  moveSpeed: number = 0;
+  battleSpeed: number = 0;
+}
+
+export class RebornPoints extends RebornAttribute {
+  count: number = 0;
+  points: number = 0;
+}
+
+export class Monster extends Attribute {
+  difficulty: number;
+  type: string = type_monster;
+  equipRates: number[];
+  extraRate: number;
+
+  constructor(lv, difficulty) {
+    super();
+    this.lv = lv;
+    this.difficulty = difficulty;
+    const df = monster_attr_factor[this.difficulty];
+    this.baseAtk = Math.ceil(lv * lv ** 1.1 * (Math.random() * 1 + 2) * df);
+    this.atk = this.baseAtk;
+    this.hp = Math.ceil(lv * lv ** 1.1 * (Math.random() * 5 + 16) * df);
+    this.coins = Math.ceil(lv ** 1.16 * (Math.random() * 5 + 11) * df);
+    this.equipRates = [0.2 * df, 0.08 * df, 0.03 * df];
+    this.extraRate = 0;
+  }
+}
+
+export class BossMonster extends Monster {
+  type: string = type_boss;
+  constructor(lv, difficulty) {
+    super(lv, difficulty);
+    const df = monster_attr_factor[this.difficulty];
+    this.baseAtk = Math.ceil(lv * lv ** 1.1 * (Math.random() * 1 + 3) * df);
+    this.atk = this.baseAtk;
+    this.hp = Math.ceil(lv * lv ** 1.1 * (Math.random() * 5 + 30) * df);
+    this.coins = Math.ceil(lv ** 1.16 * (Math.random() * 10 + 28) * df);
+    this.equipRates = [0.25 - 0.05 * df, 0.55 - 0.15 * df, 0.15 + 0.15 * df, 0.05 + 0.05 * df];
+    this.extraRate = 0.02 * ((this.difficulty - 1) * 5 + 1);
+  }
+}
+
+export class Dungeon {
+  lv: number;
+  difficulty?: number;
+  monsters?: Monster[] = new Array();
+  needDps?: number;
+
+  constructor(lv, difficulty) {
+    this.lv = lv;
+    this.setDifficulty(difficulty);
+  }
+  setDifficulty(difficulty) {
+    const lv = this.lv;
+    this.difficulty = difficulty;
+    this.monsters = new Array();
+    for (let i = 0; i < 4; i++) {
+      this.monsters.push(new Monster(lv, difficulty));
+    }
+    this.monsters.push(new BossMonster(lv, difficulty));
+    this.needDps = lv * lv ** 1.3 * 2 * difficulty;
+  }
+}
+
+export const createdDungeons = () => {};
diff --git a/src/config/dungeon.ts b/src/config/dungeon.ts
deleted file mode 100644
index f64f338..0000000
--- a/src/config/dungeon.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-const monster_attr_factor = [0.9, 1, 1.15, 1.4];
-export class Monster {
-  lv: number;
-  difficulty: number;
-  type: string = 'monster';
-  atk?: number;
-  hp?: number;
-  coins?: number;
-  equipRates?: number[];
-  extraRate?: number;
-
-  constructor(lv, difficulty) {
-    this.lv = lv;
-    this.difficulty = difficulty;
-    this.init();
-  }
-
-  init() {
-    const lv = this.lv;
-    const df = monster_attr_factor[this.difficulty];
-    this.atk = Math.ceil(lv * lv ** 1.1 * (Math.random() * 1 + 2) * df);
-    this.hp = Math.ceil(lv * lv ** 1.1 * (Math.random() * 5 + 16) * df);
-    this.coins = Math.ceil(lv ** 1.16 * (Math.random() * 5 + 11) * df);
-    this.equipRates = [0.2 * df, 0.08 * df, 0.03 * df];
-    this.extraRate = 0;
-  }
-}
-
-export class BossMonster extends Monster {
-  type: string = 'boss';
-  init() {
-    const lv = this.lv;
-    const df = monster_attr_factor[this.difficulty];
-    this.atk = Math.ceil(lv * lv ** 1.1 * (Math.random() * 1 + 3) * df);
-    this.hp = Math.ceil(lv * lv ** 1.1 * (Math.random() * 5 + 30) * df);
-    this.coins = Math.ceil(lv ** 1.16 * (Math.random() * 10 + 28) * df);
-    this.equipRates = [0.25 - 0.05 * df, 0.55 - 0.15 * df, 0.15 + 0.15 * df, 0.05 + 0.05 * df];
-    this.extraRate = 0.02 * ((this.difficulty - 1) * 2 + 1);
-  }
-}
-
-export class Dungeon {
-  lv: number;
-  difficulty?: number;
-  monsters?: Monster[] = new Array();
-  needDps?: number;
-
-  constructor(lv, difficulty) {
-    this.lv = lv;
-    this.setDifficulty(difficulty);
-  }
-  setDifficulty(difficulty) {
-    const lv = this.lv;
-    this.difficulty = difficulty;
-    this.monsters = new Array();
-    for (let i = 0; i < 4; i++) {
-      this.monsters.push(new Monster(lv, difficulty));
-    }
-    this.monsters.push(new BossMonster(lv, difficulty));
-    this.needDps = lv * lv ** 1.3 * 2 * difficulty;
-  }
-}
-
-export const createdDungeons = () => {};
diff --git a/src/config/equips/armor.ts b/src/config/equips/armor.ts
index 014f16d..428e43a 100644
--- a/src/config/equips/armor.ts
+++ b/src/config/equips/armor.ts
@@ -1,8 +1,10 @@
 import { Entry, Quality, EquipBase, Equip } from './bean';
 import { qualitys, entry_initor, extra_entry_num } from './constant';
 
-const extraEntrys = ['atk', 'hp', 'def', 'defPercent', 'hpPercent'];
-const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.5, epic: 2, unique: 2.2 };
+const extraEntrys = ['atk', 'hp', 'def', 'defPercent', 'hpPercent', 'dmgReduc', 'critAvoid', 'critDmgReduc'];
+const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.5, epic: 1.8, unique: 2, colorful: 2 };
+export const armorColorfulCategorys = [];
+
 export const armorUniqueCategorys = [
   {
     name: 'dispute',
@@ -115,15 +117,16 @@ export const armorCategorys = [
 export const initialArmor = () => {
   const type = 'armor';
   const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
-  const base = new EquipBase('initial', 'A_A3.png', [new Entry('def', 1, '+1', 100)]);
-  const extraEntry = [new Entry('hp', 10, '+10', 100)];
+  const base = new EquipBase('initial', 'A_A3.png', [new Entry('def', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('hp', 10, '+10', 10, 10)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
 export const createArmor = (quality, lv) => {
   const type = 'armor';
   const qualityBean = new Quality(quality, coefficient[quality]);
-  const base = createBase(quality, lv);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
@@ -140,9 +143,7 @@ export const armorExtraEntry = (quality, lv) => {
   return entry;
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? armorUniqueCategorys : armorCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
+const createBase = (quality, lv, category) => {
   const entry = new Array();
   category.entry.forEach((item) => {
     const initor = entry_initor[item.type];
@@ -151,3 +152,42 @@ const createBase = (quality, lv) => {
   });
   return new EquipBase(category.name, category.icon, entry);
 };
+
+const getCategory = (quality) => {
+  let categorys = armorCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = armorUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = armorColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const armorSample = (quality, category): Equip => {
+  const type = 'armor';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+const armorSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+armorColorfulCategorys.forEach((item) => {
+  armorSamples.colorful.push(armorSample('colorful', item));
+});
+armorUniqueCategorys.forEach((item) => {
+  armorSamples.unique.push(armorSample('unique', item));
+});
+armorCategorys.forEach((item) => {
+  armorSamples.epic.push(armorSample('epic', item));
+  armorSamples.artifact.push(armorSample('artifact', item));
+});
+export { armorSamples };
diff --git a/src/config/equips/bean.ts b/src/config/equips/bean.ts
index 3344ade..84bdbd7 100644
--- a/src/config/equips/bean.ts
+++ b/src/config/equips/bean.ts
@@ -5,24 +5,28 @@ export class Entry {
   value: number;
   showVal: string;
   percent: number;
+  max: number;
+  min: number;
 
-  constructor(type: string, value: number, showVal: string, percent: number) {
+  constructor(type: string, value: number, showVal: string, max: number, min: number) {
     this.type = type;
     this.value = value;
     this.showVal = showVal;
-    this.percent = percent;
+    this.max = max;
+    this.min = min;
+    this.percent = Math.round(((value - min) / (max - min)) * 100);
   }
 }
 
 export class Quality {
   quality: string;
   qualityCoefficient: number;
-  color: string;
+//   color: string;
   extraEntryNum: number;
   constructor(quality: string, coefficient: number) {
     this.quality = quality;
     this.qualityCoefficient = coefficient;
-    this.color = quality_collor[quality];
+    // this.color = quality_collor[quality];
     this.extraEntryNum = extra_entry_num[quality];
   }
 }
@@ -31,10 +35,12 @@ export class EquipBase {
   name: string;
   icon: string;
   entry: Entry[];
-  constructor(name: string, icon: string, entry: Entry[]) {
+  skill?: string;
+  constructor(name: string, icon: string, entry: Entry[], skill?: string) {
     this.name = name;
     this.icon = icon;
     this.entry = entry;
+    this.skill = skill;
   }
 }
 
diff --git a/src/config/equips/bracers.ts b/src/config/equips/bracers.ts
new file mode 100644
index 0000000..e08da0d
--- /dev/null
+++ b/src/config/equips/bracers.ts
@@ -0,0 +1,229 @@
+import { Entry, Quality, EquipBase, Equip } from './bean';
+import { qualitys, entry_initor, extra_entry_num } from './constant';
+
+const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'atkPercent', 'defPercent', 'hpPercent'];
+
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 1.8 };
+
+export const bracersColorfulCategorys = [
+  {
+    name: 'shuzhuang',
+    icon: 'bracers/梳妆镜.png',
+    entry: [
+      { type: 'atk', valCoefficient: 1 },
+      { type: 'hp', valCoefficient: 0.7 },
+      { type: 'def', valCoefficient: 0.4 },
+    ],
+    skill: 'JHSY',
+  },
+  {
+    name: 'liulipan',
+    icon: 'bracers/琉璃盘.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.6 },
+      { type: 'hp', valCoefficient: 1.5 },
+    ],
+    skill: 'Liulipan',
+  },
+  {
+    name: 'ghdp',
+    icon: 'bracers/勾魂夺魂.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'crit', valCoefficient: 0.4 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+    skill: 'CritFear',
+  },
+  {
+    name: 'youerhuan',
+    icon: 'bracers/白骨夫人的右耳环.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.5 },
+      { type: 'atk', valCoefficient: 0.8 },
+    ],
+    skill: 'Vampire1',
+  },
+  {
+    name: 'jingboyu',
+    icon: 'bracers/金钵盂.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.6 },
+    ],
+    skill: 'Prototype',
+  },
+  {
+    name: 'zijingboyu',
+    icon: 'bracers/紫金钵盂.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.6 },
+    ],
+    skill: 'Fate',
+  },
+];
+export const bracersUniqueCategorys = [
+  {
+    name: 'duoqing',
+    icon: 'bracers/多情腕.png',
+    entry: [
+      { type: 'atk', valCoefficient: 1 },
+      { type: 'hp', valCoefficient: 0.8 },
+      { type: 'def', valCoefficient: 0.9 },
+    ],
+  },
+  {
+    name: 'wano',
+    icon: 'bracers/玩藕.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.5 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.8 },
+    ],
+  },
+  {
+    name: 'rsggu',
+    icon: 'bracers/人参果裹布.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.2 },
+      { type: 'dmgPercent', valCoefficient: 1.0 },
+      { type: 'atk', valCoefficient: 0.7 },
+    ],
+  },
+  {
+    name: 'yingwu',
+    icon: 'bracers/鹦鹉杯.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.6 },
+      { type: 'atk', valCoefficient: 1.6 },
+    ],
+  },
+  {
+    name: 'meipusa',
+    icon: 'bracers/美菩萨.png',
+    entry: [
+      { type: 'dmgPercent', valCoefficient: 1.2 },
+      { type: 'def', valCoefficient: 0.9 },
+      { type: 'hp', valCoefficient: 1.2 },
+    ],
+  },
+];
+export const bracersCategorys = [
+  {
+    name: 'guoshi',
+    icon: 'bracers/裹尸布.png',
+    entry: [
+      { type: 'def', valCoefficient: 0.9 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+  },
+  {
+    name: 'xiuyugu',
+    icon: 'bracers/绣与骨.png',
+    entry: [
+      { type: 'crit', valCoefficient: 1.1 },
+      { type: 'hp', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.6 },
+    ],
+  },
+  {
+    name: 'huoshen',
+    icon: 'bracers/火神腕.png',
+    entry: [
+      { type: 'crit', valCoefficient: 1.1 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+  },
+  {
+    name: 'heishou',
+    icon: 'bracers/黑手.png',
+    entry: [
+      { type: 'crit', valCoefficient: 0.75 },
+      { type: 'critDmg', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 0.5 },
+    ],
+  },
+];
+
+export const initialbracers = () => {
+  const type = 'bracers';
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
+  const base = new EquipBase('shiwangsy', 'bracers/新手.png', [new Entry('hp', 20, '+20', 20, 20)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createbracers = (quality, lv): Equip => {
+  const type = 'bracers';
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(bracersExtraEntry(quality, lv));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const bracersExtraEntry = (quality, lv) => {
+  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
+  const initor = entry_initor[type];
+  const qualityCoefficient = coefficient[quality];
+  const entry = initor(lv, qualityCoefficient);
+  return entry;
+};
+
+const createBase = (quality, lv, category) => {
+  const entry = new Array();
+  category.entry.forEach((item) => {
+    const initor = entry_initor[item.type];
+    const qualityCoefficient = coefficient[quality];
+    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
+  });
+  return new EquipBase(category.name, category.icon, entry, category.skill);
+};
+const getCategory = (quality) => {
+  let categorys = bracersCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = bracersUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = bracersColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const bracersSample = (quality, category): Equip => {
+  const type = 'bracers';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+const bracersSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+bracersColorfulCategorys.forEach((item) => {
+  bracersSamples.colorful.push(bracersSample('colorful', item));
+});
+bracersUniqueCategorys.forEach((item) => {
+  bracersSamples.unique.push(bracersSample('unique', item));
+});
+bracersCategorys.forEach((item) => {
+  bracersSamples.epic.push(bracersSample('epic', item));
+  bracersSamples.artifact.push(bracersSample('artifact', item));
+});
+export { bracersSamples };
diff --git a/src/config/equips/constant.ts b/src/config/equips/constant.ts
index f7be804..e0c372a 100644
--- a/src/config/equips/constant.ts
+++ b/src/config/equips/constant.ts
@@ -1,39 +1,7 @@
 import { Entry } from './bean';
 
 //装备质量
-export const qualitys = ['shabby', 'ordinary', 'artifact', 'epic', 'unique'];
-
-//装备属性质量系数
-export const quality_coefficient = {
-  weapon: {
-    shabby: 0.7,
-    ordinary: 1,
-    artifact: 1.5,
-    epic: 2,
-    unique: 2.2,
-  },
-  armor: {
-    shabby: 0.7,
-    ordinary: 1,
-    artifact: 1.5,
-    epic: 2,
-    unique: 2.2,
-  },
-  neck: {
-    shabby: 0.6,
-    ordinary: 0.9,
-    artifact: 1.3,
-    epic: 1.6,
-    unique: 2,
-  },
-  ring: {
-    shabby: 0.6,
-    ordinary: 0.9,
-    artifact: 1.3,
-    epic: 1.6,
-    unique: 2,
-  },
-};
+export const qualitys = ['shabby', 'ordinary', 'artifact', 'epic', 'unique', 'colorful'];
 
 //装备颜色
 export const quality_collor = {
@@ -51,15 +19,10 @@ export const extra_entry_num = {
   artifact: 3,
   epic: 4,
   unique: 5,
+  colorful: 5,
 };
 
-//装备额外属性基础值
-export const attr_icon_unitys = {
-  crit: '%',
-  critDmg: '%',
-  moveSpeed: '%',
-  battleSpeed: '%',
-};
+//属性单位
 export const attr_unitys = {
   crit: '%',
   critDmg: '%',
@@ -70,6 +33,10 @@ export const attr_unitys = {
   recoverSpeed: '%',
   moveSpeed: '%',
   battleSpeed: '%',
+  dmgPercent: '%',
+  dmgReduc: '%',
+  critAvoid: '%',
+  critDmgReduc: '%',
 };
 
 export const strengthen_rates = [1, 1, 1, 1, 1, 1, 0.8, 0.65, 0.45, 0.3, 0.2];
@@ -80,65 +47,101 @@ export const entry_initor = {
     const value = Math.round((lv * valCoefficient + ((Math.random() * lv) / 2 + 1)) * qualityCoefficient) || 1;
     const max = Math.round((lv * valCoefficient + (lv / 2 + 1)) * qualityCoefficient) || 1;
     const min = Math.round((lv * valCoefficient + 1) * qualityCoefficient) || 1;
-    return new Entry('atk', value, '+' + value, Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('atk', value, '+' + value, max, min);
   },
   atkPercent: (lv: number, qualityCoefficient: number) => {
     const value = Math.round((lv * 0.11 + ((Math.random() * lv) / 10 + 4)) * qualityCoefficient) || 1;
     const max = Math.round((lv * 0.11 + (lv / 10 + 4)) * qualityCoefficient) || 1;
     const min = Math.round((lv * 0.11 + 4) * qualityCoefficient) || 1;
-    return new Entry('atkPercent', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('atkPercent', value, '+' + value + '%', max, min);
   },
   hp: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
     valCoefficient = valCoefficient || 0.3;
     const value = Math.round(lv * valCoefficient * 10 + ((Math.random() * lv) / 2 + 1) * qualityCoefficient) || 1;
     const max = Math.round(lv * valCoefficient * 10 + (lv / 2 + 1) * qualityCoefficient) || 1;
     const min = Math.round(lv * valCoefficient * 10 + qualityCoefficient) || 1;
-    return new Entry('hp', value, '+' + value, Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('hp', value, '+' + value, max, min);
   },
   hpPercent: (lv: number, qualityCoefficient: number) => {
     const value = Math.round((lv * 0.13 + ((Math.random() * lv) / 10 + 4)) * qualityCoefficient) || 1;
     const max = Math.round((lv * 0.13 + (lv / 10 + 4)) * qualityCoefficient) || 1;
     const min = Math.round((lv * 0.13 + 4) * qualityCoefficient) || 1;
-    return new Entry('hpPercent', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('hpPercent', value, '+' + value + '%', max, min);
   },
   def: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
     valCoefficient = valCoefficient || 0.2;
     const value = Math.round((lv * valCoefficient + ((Math.random() * lv) / 2 + 1)) * qualityCoefficient) || 1;
     const max = Math.round((lv * valCoefficient + (lv / 2 + 1)) * qualityCoefficient) || 1;
     const min = Math.round((lv * valCoefficient + 1) * qualityCoefficient) || 1;
-    return new Entry('def', value, '+' + value, Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('def', value, '+' + value, max, min);
   },
   defPercent: (lv: number, qualityCoefficient: number) => {
     const value = Math.round(lv * 0.1 + ((Math.random() * lv) / 10 + 4) * qualityCoefficient) || 1;
     const max = Math.round(lv * 0.1 + (lv / 10 + 4) * qualityCoefficient) || 1;
     const min = Math.round(lv * 0.1 + 4 * qualityCoefficient) || 1;
-    return new Entry('defPercent', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('defPercent', value, '+' + value + '%', max, min);
   },
   bloc: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
     valCoefficient = valCoefficient || 0.6;
-    const value = Math.round(lv * valCoefficient + ((Math.random() * lv) / 2 + 1) * qualityCoefficient) || 1;
-    const max = Math.round(lv * valCoefficient + (lv / 2 + 1) * qualityCoefficient) || 1;
-    const min = Math.round(lv * valCoefficient + 1 * qualityCoefficient) || 1;
-    return new Entry('bloc', value, '+' + value, Math.round(((value - min) / (max - min)) * 100));
+    const value = Math.round((lv * valCoefficient) / 2 + ((Math.random() * lv) / 3 + 1) * qualityCoefficient) || 1;
+    const max = Math.round((lv * valCoefficient) / 2 + (lv / 3 + 1) * qualityCoefficient) || 1;
+    const min = Math.round((lv * valCoefficient) / 2 + 1 * qualityCoefficient) || 1;
+    return new Entry('bloc', value, '+' + value, max, min);
   },
   blocPercent: (lv: number, qualityCoefficient: number) => {
     const value = Math.round((lv * 0.1 + ((Math.random() * lv) / 10 + 4)) * qualityCoefficient) || 1;
     const max = Math.round((lv * 0.1 + (lv / 10 + 4)) * qualityCoefficient) || 1;
     const min = Math.round((lv * 0.1 + 4) * qualityCoefficient) || 1;
-    return new Entry('blocPercent', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    return new Entry('blocPercent', value, '+' + value + '%', max, min);
   },
   crit: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
     valCoefficient = valCoefficient || 0;
-    const value = Math.round((Math.random() * 5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
-    const max = Math.round((5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
-    const min = Math.round((5 + 2 * valCoefficient) * qualityCoefficient) || 1;
-    return new Entry('crit', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    // const value = Math.round((Math.random() * 5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    // const max = Math.round((5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    // const min = Math.round((5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    const value = Math.round(((0.5 * lv) / 100 + 0.5) * (Math.random() * 5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    const max = Math.round(((0.5 * lv) / 100 + 0.5) * (5 + 5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    const min = Math.round(((0.5 * lv) / 100 + 0.5) * (5 + 2 * valCoefficient) * qualityCoefficient) || 1;
+    return new Entry('crit', value, '+' + value + '%', max, min);
   },
   critDmg: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
     valCoefficient = valCoefficient || 0;
-    const value = Math.round((Math.random() * (12 + 6 * valCoefficient) + 20) * qualityCoefficient) || 1;
-    const max = Math.round((12 + 6 * valCoefficient + 20) * qualityCoefficient) || 1;
-    const min = Math.round(20 * qualityCoefficient) || 1;
-    return new Entry('critDmg', value, '+' + value + '%', Math.round(((value - min) / (max - min)) * 100));
+    const value = Math.round(((0.5 * lv) / 100 + 0.5) * (Math.random() * (12 + 6 * valCoefficient) + 20) * qualityCoefficient) || 1;
+    const max = Math.round(((0.5 * lv) / 100 + 0.5) * (12 + 6 * valCoefficient + 20) * qualityCoefficient) || 1;
+    const min = Math.round(((0.5 * lv) / 100 + 0.5) * 20 * qualityCoefficient) || 1;
+    return new Entry('critDmg', value, '+' + value + '%', max, min);
+  },
+  dmgPercent: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
+    valCoefficient = valCoefficient || 0.5;
+    const value = Math.round(((Math.random() + 1) * lv * 0.08 + 3) * valCoefficient * qualityCoefficient) || 1;
+    const max = Math.round((lv * 0.16 + 3) * valCoefficient * qualityCoefficient) || 1;
+    const min = Math.round((lv * 0.08 + 3) * valCoefficient * qualityCoefficient) || 1;
+    return new Entry('dmgPercent', value, '+' + value + '%', max, min);
+  },
+  dmgReduc: (lv: number, qualityCoefficient: number) => {
+    const value = Math.round((Math.random() * lv * 0.05 + 5) * qualityCoefficient) || 1;
+    const max = Math.round((lv * 0.05 + 5) * qualityCoefficient) || 1;
+    const min = Math.round(5 * qualityCoefficient) || 1;
+    return new Entry('dmgReduc', value, '+' + value + '%', max, min);
+  },
+  critAvoid: (lv: number, qualityCoefficient: number) => {
+    const value = Math.round(((0.5 * lv) / 100 + 0.5) * (Math.random() * 5 + 5 + 2) * qualityCoefficient) || 1;
+    const max = Math.round(((0.5 * lv) / 100 + 0.5) * (5 + 5 + 2) * qualityCoefficient) || 1;
+    const min = Math.round(((0.5 * lv) / 100 + 0.5) * (5 + 2) * qualityCoefficient) || 1;
+    return new Entry('critAvoid', value, '+' + value + '%', max, min);
+  },
+  critDmgReduc: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
+    valCoefficient = valCoefficient || 0;
+    const value = Math.round(((0.5 * lv) / 100 + 0.5) * (Math.random() * (12 + 6 * valCoefficient) + 20) * qualityCoefficient) || 1;
+    const max = Math.round(((0.5 * lv) / 100 + 0.5) * (12 + 6 * valCoefficient + 20) * qualityCoefficient) || 1;
+    const min = Math.round(((0.5 * lv) / 100 + 0.5) * 20 * qualityCoefficient) || 1;
+    return new Entry('critDmgReduc', value, '+' + value + '%', max, min);
+  },
+  moveSpeed: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
+    valCoefficient = valCoefficient || 0;
+    const value = Math.round(((0.5 * lv) / 100 + 0.5) * (Math.random() * (5 + 6 * valCoefficient) + 20) * qualityCoefficient) || 1;
+    const max = Math.round(((0.5 * lv) / 100 + 0.5) * (5 + 6 * valCoefficient + 20) * qualityCoefficient) || 1;
+    const min = Math.round(((0.5 * lv) / 100 + 0.5) * 20 * qualityCoefficient) || 1;
+    return new Entry('moveSpeed', value, '+' + value + '%', max, min);
   },
 };
diff --git a/src/config/equips/index.ts b/src/config/equips/index.ts
index 3ec98e2..cefaec1 100644
--- a/src/config/equips/index.ts
+++ b/src/config/equips/index.ts
@@ -2,5 +2,10 @@ export * from './weapon';
 export * from './armor';
 export * from './neck';
 export * from './ring';
+export * from './jewelry';
+export * from './pants';
+export * from './shoes';
+export * from './bracers';
+
 export * from './bean';
 export * from './constant';
diff --git a/src/config/equips/jewelry.ts b/src/config/equips/jewelry.ts
new file mode 100644
index 0000000..b1ff6bd
--- /dev/null
+++ b/src/config/equips/jewelry.ts
@@ -0,0 +1,229 @@
+import { Entry, Quality, EquipBase, Equip } from './bean';
+import { qualitys, entry_initor, extra_entry_num } from './constant';
+
+const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'dmgPercent'];
+
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 1.8 };
+
+export const jewelryColorfulCategorys = [
+  {
+    name: 'shuzhuang',
+    icon: 'jewelry/梳妆镜.png',
+    entry: [
+      { type: 'atk', valCoefficient: 1 },
+      { type: 'hp', valCoefficient: 0.7 },
+      { type: 'def', valCoefficient: 0.4 },
+    ],
+    skill: 'JHSY',
+  },
+  {
+    name: 'liulipan',
+    icon: 'jewelry/琉璃盘.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.6 },
+      { type: 'hp', valCoefficient: 1.5 },
+    ],
+    skill: 'Liulipan',
+  },
+  {
+    name: 'ghdp',
+    icon: 'jewelry/勾魂夺魂.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'crit', valCoefficient: 0.4 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+    skill: 'CritFear',
+  },
+  {
+    name: 'youerhuan',
+    icon: 'jewelry/白骨夫人的右耳环.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.5 },
+      { type: 'atk', valCoefficient: 0.8 },
+    ],
+    skill: 'Vampire1',
+  },
+  {
+    name: 'jingboyu',
+    icon: 'jewelry/金钵盂.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.6 },
+    ],
+    skill: 'Prototype',
+  },
+  {
+    name: 'zijingboyu',
+    icon: 'jewelry/紫金钵盂.png',
+    entry: [
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.6 },
+    ],
+    skill: 'Fate',
+  },
+];
+export const jewelryUniqueCategorys = [
+  {
+    name: 'hanjing',
+    icon: 'jewelry/寒晶佩.png',
+    entry: [
+      { type: 'atk', valCoefficient: 1 },
+      { type: 'hp', valCoefficient: 0.8 },
+      { type: 'def', valCoefficient: 0.9 },
+    ],
+  },
+  {
+    name: 'ylhm',
+    icon: 'jewelry/月灵幻梦.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.5 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.8 },
+    ],
+  },
+  {
+    name: 'liangren',
+    icon: 'jewelry/良人.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.2 },
+      { type: 'dmgPercent', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.7 },
+    ],
+  },
+  {
+    name: 'duzhan',
+    icon: 'jewelry/督战.png',
+    entry: [
+      { type: 'critDmg', valCoefficient: 1.6 },
+      { type: 'atk', valCoefficient: 1.6 },
+    ],
+  },
+  {
+    name: 'cltx',
+    icon: 'jewelry/赤羚天禧.png',
+    entry: [
+      { type: 'dmgPercent', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.9 },
+      { type: 'hp', valCoefficient: 1.2 },
+    ],
+  },
+];
+export const jewelryCategorys = [
+  {
+    name: 'weihun',
+    icon: 'jewelry/未婚.png',
+    entry: [
+      { type: 'def', valCoefficient: 0.9 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+  },
+  {
+    name: 'huangyan',
+    icon: 'jewelry/谎言.png',
+    entry: [
+      { type: 'crit', valCoefficient: 1.1 },
+      { type: 'hp', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.6 },
+    ],
+  },
+  {
+    name: 'zhenjing',
+    icon: 'jewelry/真经.png',
+    entry: [
+      { type: 'crit', valCoefficient: 1.1 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+  },
+  {
+    name: 'maming',
+    icon: 'jewelry/马鸣玉佩.png',
+    entry: [
+      { type: 'crit', valCoefficient: 0.75 },
+      { type: 'critDmg', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 0.5 },
+    ],
+  },
+];
+
+export const initialJewelry = () => {
+  const type = 'jewelry';
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
+  const base = new EquipBase('shiwangsy', 'jewelry/狮王手印.png', [new Entry('hp', 20, '+20', 20, 20)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createJewelry = (quality, lv): Equip => {
+  const type = 'jewelry';
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(jewelryExtraEntry(quality, lv));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const jewelryExtraEntry = (quality, lv) => {
+  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
+  const initor = entry_initor[type];
+  const qualityCoefficient = coefficient[quality];
+  const entry = initor(lv, qualityCoefficient);
+  return entry;
+};
+
+const createBase = (quality, lv, category) => {
+  const entry = new Array();
+  category.entry.forEach((item) => {
+    const initor = entry_initor[item.type];
+    const qualityCoefficient = coefficient[quality];
+    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
+  });
+  return new EquipBase(category.name, category.icon, entry, category.skill);
+};
+const getCategory = (quality) => {
+  let categorys = jewelryCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = jewelryUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = jewelryColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const jewelrySample = (quality, category): Equip => {
+  const type = 'jewelry';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+const jewelrySamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+jewelryColorfulCategorys.forEach((item) => {
+  jewelrySamples.colorful.push(jewelrySample('colorful', item));
+});
+jewelryUniqueCategorys.forEach((item) => {
+  jewelrySamples.unique.push(jewelrySample('unique', item));
+});
+jewelryCategorys.forEach((item) => {
+  jewelrySamples.epic.push(jewelrySample('epic', item));
+  jewelrySamples.artifact.push(jewelrySample('artifact', item));
+});
+export { jewelrySamples };
diff --git a/src/config/equips/neck.ts b/src/config/equips/neck.ts
index 1fa737d..d509ecd 100644
--- a/src/config/equips/neck.ts
+++ b/src/config/equips/neck.ts
@@ -3,14 +3,16 @@ import { qualitys, entry_initor, extra_entry_num } from './constant';
 
 const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'bloc'];
 
-const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 2 };
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 1.8 };
+
+export const neckColorfulCategorys = [];
 
 export const neckUniqueCategorys = [
   {
     name: 'demonSlayer',
     icon: 'U_neck01.png',
     entry: [
-      { type: 'atk', valCoefficient: 0.7 },
+      { type: 'atk', valCoefficient: 1.0 },
       { type: 'hp', valCoefficient: 0.8 },
       { type: 'def', valCoefficient: 0.9 },
     ],
@@ -19,7 +21,7 @@ export const neckUniqueCategorys = [
     name: 'darkDragon',
     icon: 'U_neck02.png',
     entry: [
-      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'critDmg', valCoefficient: 1.5 },
       { type: 'crit', valCoefficient: 0.5 },
       { type: 'hp', valCoefficient: 0.8 },
     ],
@@ -28,7 +30,7 @@ export const neckUniqueCategorys = [
     name: 'single',
     icon: 'U_neck03.png',
     entry: [
-      { type: 'critDmg', valCoefficient: 1.8 },
+      { type: 'critDmg', valCoefficient: 1.5 },
       { type: 'bloc', valCoefficient: 0.7 },
       { type: 'hp', valCoefficient: 0.7 },
     ],
@@ -84,15 +86,16 @@ export const neckCategorys = [
 export const initialNeck = () => {
   const type = 'neck';
   const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
-  const base = new EquipBase('initial', 'Ac_3.png', [new Entry('hp', 20, '+20', 100)]);
-  const extraEntry = [new Entry('crit', 10, '+10%', 100)];
+  const base = new EquipBase('initial', 'Ac_3.png', [new Entry('hp', 20, '+20', 20, 20)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
 export const createNeck = (quality, lv) => {
   const type = 'neck';
   const qualityBean = new Quality(quality, coefficient[quality]);
-  const base = createBase(quality, lv);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
@@ -109,9 +112,7 @@ export const neckExtraEntry = (quality, lv) => {
   return entry;
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? neckUniqueCategorys : neckCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
+const createBase = (quality, lv, category) => {
   const entry = new Array();
   category.entry.forEach((item) => {
     const initor = entry_initor[item.type];
@@ -120,3 +121,42 @@ const createBase = (quality, lv) => {
   });
   return new EquipBase(category.name, category.icon, entry);
 };
+const getCategory = (quality) => {
+  let categorys = neckCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = neckUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = neckColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const neckSample = (quality, category): Equip => {
+  const type = 'neck';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+const neckSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+neckColorfulCategorys.forEach((item) => {
+  neckSamples.colorful.push(neckSample('colorful', item));
+});
+neckUniqueCategorys.forEach((item) => {
+  neckSamples.unique.push(neckSample('unique', item));
+});
+neckCategorys.forEach((item) => {
+  neckSamples.epic.push(neckSample('epic', item));
+  neckSamples.artifact.push(neckSample('artifact', item));
+});
+export { neckSamples };
diff --git a/src/config/equips/pants.ts b/src/config/equips/pants.ts
new file mode 100644
index 0000000..05c8828
--- /dev/null
+++ b/src/config/equips/pants.ts
@@ -0,0 +1,158 @@
+import { Entry, Quality, EquipBase, Equip } from './bean';
+import { qualitys, entry_initor, extra_entry_num } from './constant';
+
+const extraEntrys = ['atk', 'hp', 'def', 'defPercent', 'hpPercent', 'dmgReduc', 'critAvoid', 'critDmgReduc'];
+const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.5, epic: 1.8, unique: 2, colorful: 2 };
+export const pantsColorfulCategorys = [];
+
+export const pantsUniqueCategorys = [
+  {
+    name: 'mhlg',
+    icon: 'pants/梦回龙宫.png',
+    entry: [
+      { type: 'def', valCoefficient: 2 },
+      { type: 'hp', valCoefficient: 2.8 },
+    ],
+  },
+  {
+    name: 'longlin',
+    icon: 'pants/龙鳞胫甲.png',
+    entry: [
+      { type: 'def', valCoefficient: 0.9 },
+      { type: 'critDmg', valCoefficient: 1.7 },
+      { type: 'atk', valCoefficient: 1.7 },
+    ],
+  },
+  {
+    name: 'qiutu',
+    icon: 'pants/囚徒.png',
+    entry: [
+      { type: 'hp', valCoefficient: 2 },
+      { type: 'atk', valCoefficient: 2 },
+      { type: 'bloc', valCoefficient: 1.2 },
+    ],
+  },
+  {
+    name: 'wuwei',
+    icon: 'pants/五味.png',
+    entry: [
+      { type: 'def', valCoefficient: 1.2 },
+      { type: 'hp', valCoefficient: 1.7 },
+      { type: 'atk', valCoefficient: 1.0 },
+    ],
+  },
+  {
+    name: 'cangjing',
+    icon: 'pants/藏经甲.png',
+    entry: [
+      { type: 'def', valCoefficient: 1.5 },
+      { type: 'bloc', valCoefficient: 1.2 },
+      { type: 'hp', valCoefficient: 1.4 },
+    ],
+  },
+];
+export const pantsCategorys = [
+  {
+    name: 'qijia',
+    icon: 'pants/泣甲.png',
+    entry: [
+      { type: 'def', valCoefficient: 2 },
+      { type: 'hp', valCoefficient: 0.6 },
+    ],
+  },
+  {
+    name: 'guanjia',
+    icon: 'pants/管家服.png',
+    entry: [
+      { type: 'def', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 1.8 },
+    ],
+  },
+  {
+    name: 'egui',
+    icon: 'pants/饿鬼.png',
+    entry: [
+      { type: 'def', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.8 },
+      { type: 'atk', valCoefficient: 0.8 },
+    ],
+  },
+];
+
+export const initialpants = () => {
+  const type = 'pants';
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
+  const base = new EquipBase('initial', 'pants/新手.png', [new Entry('def', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('hp', 10, '+10', 10, 10)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createpants = (quality, lv) => {
+  const type = 'pants';
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(pantsExtraEntry(quality, lv));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const pantsExtraEntry = (quality, lv) => {
+  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
+  const initor = entry_initor[type];
+  const qualityCoefficient = coefficient[quality];
+  const entry = initor(lv, qualityCoefficient);
+  return entry;
+};
+
+const createBase = (quality, lv, category) => {
+  const entry = new Array();
+  category.entry.forEach((item) => {
+    const initor = entry_initor[item.type];
+    const qualityCoefficient = coefficient[quality];
+    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
+  });
+  return new EquipBase(category.name, category.icon, entry);
+};
+
+const getCategory = (quality) => {
+  let categorys = pantsCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = pantsUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = pantsColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const pantsSample = (quality, category): Equip => {
+  const type = 'pants';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+const pantsSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+pantsColorfulCategorys.forEach((item) => {
+  pantsSamples.colorful.push(pantsSample('colorful', item));
+});
+pantsUniqueCategorys.forEach((item) => {
+  pantsSamples.unique.push(pantsSample('unique', item));
+});
+pantsCategorys.forEach((item) => {
+  pantsSamples.epic.push(pantsSample('epic', item));
+  pantsSamples.artifact.push(pantsSample('artifact', item));
+});
+export { pantsSamples };
diff --git a/src/config/equips/ring.ts b/src/config/equips/ring.ts
index fd04db1..11dec57 100644
--- a/src/config/equips/ring.ts
+++ b/src/config/equips/ring.ts
@@ -3,7 +3,9 @@ import { qualitys, entry_initor, extra_entry_num } from './constant';
 
 const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def'];
 
-const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 2 };
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 2 };
+
+export const ringColorfulCategorys = [];
 
 export const ringUniqueCategorys = [
   {
@@ -78,15 +80,16 @@ export const ringCategorys = [
 export const initialRing = () => {
   const type = 'ring';
   const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
-  const base = new EquipBase('initial', 'Ac_10.png', [new Entry('hp', 20, '+20', 100)]);
-  const extraEntry = [new Entry('crit', 10, '+10%', 100)];
+  const base = new EquipBase('initial', 'Ac_10.png', [new Entry('hp', 20, '+20', 20, 20)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
 export const createRing = (quality, lv) => {
   const type = 'ring';
   const qualityBean = new Quality(quality, coefficient[quality]);
-  const base = createBase(quality, lv);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
@@ -103,9 +106,7 @@ export const ringExtraEntry = (quality, lv) => {
   return entry;
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? ringUniqueCategorys : ringCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
+const createBase = (quality, lv, category) => {
   const entry = new Array();
   category.entry.forEach((item) => {
     const initor = entry_initor[item.type];
@@ -114,3 +115,42 @@ const createBase = (quality, lv) => {
   });
   return new EquipBase(category.name, category.icon, entry);
 };
+
+const getCategory = (quality) => {
+  let categorys = ringCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = ringUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = ringColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const ringSample = (quality, category): Equip => {
+  const type = 'ring';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+const ringSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+ringColorfulCategorys.forEach((item) => {
+  ringSamples.colorful.push(ringSample('colorful', item));
+});
+ringUniqueCategorys.forEach((item) => {
+  ringSamples.unique.push(ringSample('unique', item));
+});
+ringCategorys.forEach((item) => {
+  ringSamples.epic.push(ringSample('epic', item));
+  ringSamples.artifact.push(ringSample('artifact', item));
+});
+export { ringSamples };
diff --git a/src/config/equips/shoes.ts b/src/config/equips/shoes.ts
new file mode 100644
index 0000000..c39613b
--- /dev/null
+++ b/src/config/equips/shoes.ts
@@ -0,0 +1,158 @@
+import { Entry, Quality, EquipBase, Equip } from './bean';
+import { qualitys, entry_initor, extra_entry_num } from './constant';
+
+const extraEntrys = ['atk', 'hp', 'def', 'moveSpeed', 'dmgReduc'];
+const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.3, epic: 1.5, unique: 1.8, colorful: 1.8 };
+export const shoesColorfulCategorys = [];
+
+export const shoesUniqueCategorys = [
+  {
+    name: 'qxzl',
+    icon: 'shoes/浅夏紫灵.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 1.5 },
+      { type: 'atk', valCoefficient: 1.2 },
+      { type: 'hp', valCoefficient: 1.4 },
+    ],
+  },
+  {
+    name: 'xuedun',
+    icon: 'shoes/血遁靴.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 2.8 },
+      { type: 'hp', valCoefficient: 1.2 },
+    ],
+  },
+  {
+    name: 'talang',
+    icon: 'shoes/踏浪.jpg',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 1.8 },
+      { type: 'hp', valCoefficient: 1 },
+      { type: 'atk', valCoefficient: 1.2 },
+    ],
+  },
+  {
+    name: 'jiuwanli',
+    icon: 'shoes/九万里.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 1.9 },
+      { type: 'def', valCoefficient: 1 },
+      { type: 'hp', valCoefficient: 1.2 },
+    ],
+  },
+  {
+    name: 'hongchen',
+    icon: 'shoes/红尘.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 1.2 },
+      { type: 'def', valCoefficient: 1.5 },
+      { type: 'hp', valCoefficient: 1.4 },
+    ],
+  },
+];
+export const shoesCategorys = [
+  {
+    name: 'lingguan',
+    icon: 'shoes/灵官靴.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 0.8 },
+      { type: 'def', valCoefficient: 1.8 },
+    ],
+  },
+  {
+    name: 'quanchi',
+    icon: 'shoes/犬齿鞋.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 1.8 },
+    ],
+  },
+  {
+    name: 'kunlun',
+    icon: 'shoes/昆仑履.png',
+    entry: [
+      { type: 'moveSpeed', valCoefficient: 0.8 },
+      { type: 'def', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.8 },
+    ],
+  },
+];
+
+export const initialshoes = () => {
+  const type = 'shoes';
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
+  const base = new EquipBase('initial', 'shoes/新手.png', [new Entry('moveSpeed', 10, '+10%', 10, 10)]);
+  const extraEntry = [new Entry('hp', 10, '+10', 10, 10)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createshoes = (quality, lv) => {
+  const type = 'shoes';
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(shoesExtraEntry(quality, lv));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const shoesExtraEntry = (quality, lv) => {
+  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
+  const initor = entry_initor[type];
+  const qualityCoefficient = coefficient[quality];
+  const entry = initor(lv, qualityCoefficient);
+  return entry;
+};
+
+const createBase = (quality, lv, category) => {
+  const entry = new Array();
+  category.entry.forEach((item) => {
+    const initor = entry_initor[item.type];
+    const qualityCoefficient = coefficient[quality];
+    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
+  });
+  return new EquipBase(category.name, category.icon, entry);
+};
+
+const getCategory = (quality) => {
+  let categorys = shoesCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = shoesUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = shoesColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const shoesSample = (quality, category): Equip => {
+  const type = 'shoes';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+const shoesSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
+};
+shoesColorfulCategorys.forEach((item) => {
+  shoesSamples.colorful.push(shoesSample('colorful', item));
+});
+shoesUniqueCategorys.forEach((item) => {
+  shoesSamples.unique.push(shoesSample('unique', item));
+});
+shoesCategorys.forEach((item) => {
+  shoesSamples.epic.push(shoesSample('epic', item));
+  shoesSamples.artifact.push(shoesSample('artifact', item));
+});
+export { shoesSamples };
diff --git a/src/config/equips/weapon.ts b/src/config/equips/weapon.ts
index 89734ce..659c208 100644
--- a/src/config/equips/weapon.ts
+++ b/src/config/equips/weapon.ts
@@ -1,8 +1,21 @@
 import { Entry, Quality, EquipBase, Equip } from './bean';
 import { qualitys, entry_initor, extra_entry_num } from './constant';
 
-const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'atkPercent', 'defPercent', 'hpPercent'];
-const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.5, epic: 2, unique: 2.2 };
+const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'atkPercent', 'defPercent', 'hpPercent', 'dmgPercent'];
+const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.5, epic: 1.8, unique: 2, colorful: 2 };
+
+export const weaponColorfulCategorys = [
+  {
+    name: 'qiuai',
+    icon: 'weapon/求爱.png',
+    entry: [
+      { type: 'atk', valCoefficient: 1.8 },
+      { type: 'crit', valCoefficient: 1.5 },
+      { type: 'critDmg', valCoefficient: 1.3 },
+    ],
+    skill: 'IceBlade,SeeRed',
+  },
+];
 
 export const weaponUniqueCategorys = [
   {
@@ -144,15 +157,16 @@ export const weaponCategorys = [
 export const initialWeapon = () => {
   const type = 'weapon';
   const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]]);
-  const base = new EquipBase('initial', 'W_Sword001.png', [new Entry('atk', 1, '+1', 100)]);
-  const extraEntry = [new Entry('atk', 1, '+1', 100)];
+  const base = new EquipBase('zhanma', 'weapon/初拥.png', [new Entry('atk', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('atk', 1, '+1', 1, 1)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
 export const createWeapon = (quality, lv) => {
   const type = 'weapon';
   const qualityBean = new Quality(quality, coefficient[quality]);
-  const base = createBase(quality, lv);
+  const category = getCategory(quality);
+  const base = createBase(quality, lv, category);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
@@ -169,14 +183,50 @@ export const weaponExtraEntry = (quality, lv) => {
   return entry;
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? weaponUniqueCategorys : weaponCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
+const createBase = (quality, lv, category) => {
   const entry = new Array();
   category.entry.forEach((item) => {
     const initor = entry_initor[item.type];
     const qualityCoefficient = coefficient[quality];
     entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
   });
-  return new EquipBase(category.name, category.icon, entry);
+  return new EquipBase(category.name, category.icon, entry, category.skill);
+};
+const getCategory = (quality) => {
+  let categorys = weaponCategorys;
+  switch (quality) {
+    case qualitys[4]:
+      categorys = weaponUniqueCategorys;
+      break;
+    case qualitys[5]:
+      categorys = weaponColorfulCategorys;
+      break;
+  }
+  return categorys[Math.floor(Math.random() * categorys.length)];
+};
+
+const weaponSample = (quality, category): Equip => {
+  const type = 'weapon';
+  const lv = 100;
+  const qualityBean = new Quality(quality, coefficient[quality]);
+  const base = createBase(quality, lv, category);
+  const extraEntry = new Array();
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+const weaponSamples = {
+  colorful: new Array(),
+  unique: new Array(),
+  epic: new Array(),
+  artifact: new Array(),
 };
+weaponColorfulCategorys.forEach((item) => {
+  weaponSamples.colorful.push(weaponSample('colorful', item));
+});
+weaponUniqueCategorys.forEach((item) => {
+  weaponSamples.unique.push(weaponSample('unique', item));
+});
+weaponCategorys.forEach((item) => {
+  weaponSamples.epic.push(weaponSample('epic', item));
+  weaponSamples.artifact.push(weaponSample('artifact', item));
+});
+export { weaponSamples };
diff --git a/src/config/i18n/zh/euips.ts b/src/config/i18n/zh/euips.ts
new file mode 100644
index 0000000..e66f95c
--- /dev/null
+++ b/src/config/i18n/zh/euips.ts
@@ -0,0 +1,168 @@
+export const weapon = {
+  type: '武器',
+  aozhidu: ['鳌之毒', '相思有毒，曲终无怨。'],
+  baoxue: ['暴雪', '铁匠将交付时间推延了二十四次。'],
+  chengba: ['称霸', '霸者不藏其锋，以天地为鞘。'],
+  chulian: ['初恋', '我的初恋在月亮之上。    ----八戒'],
+  datiecheng: ['大铁城', '其重如一整座冥铁打造的郢都城。'],
+  duwu: ['黩武', '若未用够最后一丝力气，如何能甘心。'],
+  emeng: ['噩梦', '我最近的噩梦，都和一只猴子有关......    ----增长天王'],
+  heifeng: ['黑风', '这把斧子一直不肯相信它的主人已经死去。'],
+  shishen: ['弑神', '从斩妖台流落到地府的禁忌之物，慎用。'],
+  jianji: ['剑姬', '美人蒙尘，以诗有缘。'],
+  jlys: ['九灵·元圣', '当坐骑总比没命了强。'],
+  kantou: ['砍头', '你知道比砍头更痛苦的是什么吗？'],
+  shangxin: ['伤心刺', '比砍头更痛苦的，是伤心。'],
+  llzx: ['冷龙之心', '长九尺三寸，苍青之气盘绕九十三匝。'],
+  lmlr: ['狸猫利刃', '比时光还要无情。'],
+  liuying: ['流萤', '若不困顿於林野，必凄惶於道路。'],
+  liubuxiang: ['六不像', '汝若身披业火，当一念不起，六欲尽灭。'],
+  longxian: ['龙衔', '天之西北有幽冥无日之国，有龙衔烛而照之也。'],
+  mingxue: ['鸣血', '别想让他停下来，它已经饥渴难耐了。'],
+  qingguang: ['青光', '你活着看到的最后东西是一道青光。'],
+  qici: ['鳍刺', '这美丽簪成了夺命的刺。多少年后，你还记得是谁曾以此为你绾起青丝。'],
+  qiuai: ['求爱', '我不是在求你爱我，而是，不接受我的爱，你就要死。    ----琵琶精'],
+  shayi: ['杀意', '仇敌，莫让吾听闻汝名。'],
+  siyu: ['私语', '你爱的不是我，而是灵山项上那个在绚烂中毁灭的金蝉子。    ----唐僧'],
+  tianzhao: ['天照', '神的叹息'],
+  wuzhe: ['无遮', '知识自境之心。'],
+  wuqi: ['武气', '武曲星君有武器十八般，皆太乙出品。'],
+  yanmo: ['炎魔', '传说炎魔是火焰山城最后的引路人。'],
+  yinhelie: ['银河裂', '天河裂而混元出。'],
+  zhangsan: ['丈三', '杀一是罪，屠万为雄。'],
+  creation: ['创世亡命剑', '只有被选中的勇士才能唤醒它真正的力量。'],
+  nameless: ['无名剑', '没有人知道它的来历。'],
+  zhanma: ['斩马', '马明王特意请太乙制造以镇惧诸天马。'],
+  chuyong: ['初拥', '最伟大的感情必要以华丽的死亡报偿。'],
+  scarlet: ['阿加雷斯血色巨剑', '诚既勇兮又以武，终刚强兮不可凌。身既死兮神以灵，子魂魄兮为鬼雄。'],
+  death: ['死亡之刃', '万物生自守恒，源力破则失。'],
+  frostDragon: ['霜龙利刃', '傲雪冷心绝，万念化冰华。'],
+  dragon: ['神龙纳格林之刃', '神龙纳格林的爪子锻造的利刃'],
+  adventurer: ['大师大冒险家之剑', '大师大冒险家之剑'],
+  seraphim: ['六翼天使武刃', '见主坐在高高的宝座上。他的衣裳垂下，遮满圣殿。其上有撒拉弗侍立。各有六个翅膀。用两个翅膀遮脸，两个翅膀遮脚，两个翅膀飞翔。'],
+  shuzhuwan: ['数珠丸恒次', '具体情况不明，传说为日莲上人所有'],
+  leibse: ['埃苏莱布斯军刀', '埃苏莱布斯军刀'],
+  hellrock: ['狱岩石太刀', '用狱岩石制作的太刀，据说拥有让使用者潜力爆发的神秘力量'],
+  warrior: ['战士长剑', '六级战士使用的长剑'],
+  redWillow: ['赤柳血刃', '似乎会给使用者提供生命气息'],
+  sword: ['普通长剑', '朴实无华普通长剑，有的只有强力的攻击力'],
+  waveBlade: ['紫炎波刃剑', '传说中的狂战士最喜爱的剑。'],
+  furryPaw: ['毛毛的爪子', '这？这也是武器？'],
+  iceCrystals: ['冰晶之刃', '剑锋覆盖着冰晶，碰到的敌人都会被冻住。'],
+  initial: ['新手短剑', '新手菜鸡使用的短剑'],
+};
+export const armor = {
+  type: '防具',
+  dispute: ['争执连身衣', '争执连身衣'],
+  jianHao: ['剑豪盔甲', '剑豪盔甲'],
+  samurai: ['隐武士铠甲', '隐武士铠甲'],
+  trackers: ['芬撒里尔追踪者', '芬撒里尔追踪者'],
+  rongYi: ['肃清者戎衣', '相传看到这一袭黑衣的人都死了。'],
+  nightwear: ['红月的夜行衣', '红月的夜行衣'],
+  wildDragon: ['先代狂龙战士盔甲', '先代狂龙战士盔甲'],
+  guard: ['紫金守护胸甲', '够肉才能输出'],
+  redWillow: ['赤柳血铠', '似乎会给使用者提供生命气息'],
+  warrior: ['战士重铠', '六级战士使用的重型铠甲'],
+  lightArmor: ['天权轻甲', '舍弃了防御性能的轻甲，因为更加轻便，攻击性能更加突出'],
+  furryArmor: ['哈皮毛毛连身衣', '哈皮毛毛'],
+  initial: ['新手布衣', '新手菜鸡穿的破旧衣物'],
+};
+export const neck = {
+  type: '项链',
+  demonSlayer: ['十字旅团降魔项链', '十字旅团降魔项链'],
+  darkDragon: ['进阶黑暗龙王项链', '进阶黑暗龙王项链'],
+  single: ['单身贵族项链', '真棒，真帅。有了这条帅气的项链，一辈子单身都不会孤独'],
+  demons: ['魔族之翼展', '你能看到什么呢'],
+  ipaya: ['伊帕娅之项链', '伊帕娅之项链'],
+  crusade: ['十字军项链', '十字军佩戴的项链'],
+  gintamaEyes: ['银魂之眼', '银魂之眼'],
+  iceDragon: ['冰龙凝雪', '冰龙凝雪'],
+  initial: ['新手项坠', '一个破旧的的项链'],
+};
+export const ring = {
+  type: '戒指',
+  death: ['死神名片戒指', '死神名片戒指'],
+  realFurryRing: ['真·毛毛指环', '死神名片戒指'],
+  pioneer: ['先驱者戒指', '先驱者戒指'],
+  susan: ['素盏呜尊的意志', '素盏呜尊的意志'],
+  moonlight: ['月夜见尊的意志', '月夜见尊的意志'],
+  life: ['生命指环', '据说拥有增强佩戴者体质的神秘功效'],
+  imperialSoul: ['御魂之戒', '出来吧，卡赞！吸纳所有彷徨的灵魂！   ——鬼剑士约翰'],
+  furryRing: ['毛毛指环', '喵喵戒指，上面有没有摸到毛毛jio的怨念'],
+  initial: ['新手指环', '一个破旧的的指环'],
+};
+export const jewelry = {
+  type: '饰品',
+  shadan: ['杀旦头饰', '好一个三生醉的大青衣，转眼是冷如冰的刺杀旦!'],
+  simianta: ['太乙神器·四面塔', '李天王有一次差点拿错了。'],
+  shuzhuang: ['梳妆镜', '都上来，一个个仔细看打!    ----琵琶精'],
+  liulipan: ['琉璃盘', '盘底书:凌虚子制。'],
+  ghdp: ['勾魂夺魂', '神鬼游舍，摄魂夺魄。'],
+  youerhuan: ['白骨夫人的右耳环', '你一定以为还有左耳环，这个真没有。    ----白骨夫人'],
+  jingboyu: ['金钵盂', '大众休言，妖精未走，见在我这钵盂之下。    ----如来'],
+  zijingboyu: ['紫金钵盂', '金饭碗'],
+  hanjing: ['寒晶佩', '蜡烛红的珊瑚枝，其色芬然如火。'],
+  ylhm: ['月灵幻梦', '天际间散落的银砂，汇聚月之灵华发出冰洁的光芒，它将随着少年的脚步，指引他们找到家的方向。'],
+  liangren: ['良人', '空香唤蝶，良人未来。莱葭渐冷，相思已破。'],
+  duzhan: ['督战', '死战不退。'],
+  weihun: ['未婚', '本应是香艳的一晚，却不见你的欢惀之色    ----琵琶精的婚房'],
+  cltx: ['赤羚天禧', '白羊一阵如仙醉，蝶戏花儿牧女追。'],
+  huangyan: ['谎言', '神说他们爱世人，所以给他们苦难。'],
+  zhenjing: ['真经', '我不相信。    ----玄奘'],
+  maming: ['马鸣玉佩', '有天下之马初喃之音，慷慨非常。'],
+  shiwangsy: ['狮王手印', '最强三人组的唯一标识，仿冒必究。'],
+};
+export const quality = {
+  shabby: '破旧',
+  ordinary: '普通',
+  artifact: '神器',
+  epic: '史诗',
+  unique: '独特',
+  colorful: '多彩',
+};
+export const pants = {
+  type: '裤子',
+  baizhequn: ['荃英的百褶裙', '每一个褶子里，都是荃英的心血。'],
+  yulan: ['鱼篮', '观世音菩萨在紫竹林以六十二亿根竹篾编织而成。'],
+  mhlg: ['梦回龙宫', '沧海离歌一阕悲，梦里龙宫几度回。'],
+  longlin: ['龙鳞胫甲', '每一片鳞片都来之不同的龙，包括四海龙王'],
+  qiutu: ['囚徒', '躯体，是思想的最大囚笼。'],
+  wuwei: ['五味', '酸多伤脾，苦多伤肺，辛多伤肝，甘多伤肾，咸多伤心。'],
+  cangjing: ['藏经甲', '内刻小乘佛法精意。'],
+  qijia: ['泣甲', '这山一般高大的白骨里禁锢着一个弱小不堪的魂魄。'],
+  guanjia: ['管家服', '有些异味，最好先洗一洗。'],
+  egui: ['饿鬼', '饿鬼诞下的孩子，任是饿鬼。'],
+  initial: ['新手裤子', '新手菜鸡使用的破旧裤子。'],
+};
+export const shoes = {
+  type: '鞋子',
+  lingyun: ['灵韵聚能器', '闪开，俺老孙还有一个很重要的约会。'],
+  siben: ['私奔', '这些年，除了爱，我一无所有，但你不爱我的一无所有。    ----荃木狼'],
+  wajiang: ['蛙将足', '大小刚刚合适。'],
+  qxzl: ['浅夏紫灵', '夏日么么哒！'],
+  xuedun: ['血遁靴', '客观，赶着投胎么？我想你需要他。    ----郢都城门鬼差'],
+  talang: ['踏浪', '东海水晶宫出品。'],
+  jiuwanli: ['九万里', '逐风而来。'],
+  hongchen: ['红尘', '滚滚红尘里有隐约的耳语，跟随我俩的传说。'],
+  lingguan: ['灵官靴', '天上之物，不染凡尘。'],
+  quanchi: ['犬齿鞋', '犬齿交错。'],
+  kunlun: ['昆仑履', '即使名字也已经忘却，始终不曾忘却自己的使命。'],
+  initial: ['新手鞋子', '新手菜鸡使用的破旧鞋子'],
+};
+export const bracers = {
+  xuedun: ['毒蛇', '即使血是冷的，但你又怎知它不向往温暖。'],
+  xianglong: ['降龙', '见龙在田，利见大人。'],
+  huojing: ['火晶环', '闻上去有股老君八卦炉中单屑的味道。'],
+  limao: ['狸猫足印', '无声，快速，锐利，不可思议。'],
+  meipusa: ['美菩萨', '是因为美丽？还是因为菩萨？'],
+  rsggu: ['人参果裹步', '不吃也要拿个碗盖好嘛，你看现在爬得满桌都是血......    ----清风'],
+  duoqing: ['多情腕', '多情自古空余恨，此恨绵绵无绝期。'],
+  sibuxiang: ['四不像', '不要理会别人说你像谁或者不像，做你自己。'],
+  wano: ['玩偶', '削去强大的骨肉，用脆弱的藕节连上傀儡的丝线。'],
+  yingwu: ['鹦鹉杯', '罢吹箫，休劝酒。'],
+  zhangmu: ['障目', '一叶障目，不见灵山。'],
+  guoshi: ['裹尸布', '柔软的血肉已过早消亡，令剩下的白骨感到孤单。'],
+  xiuyugu: ['绣与骨', '名刀已有锈迹，新骨仍未生和。'],
+  huoshen: ['火神腕', '泼猴捅破了三十三天引来天外之火，至今未熄。'],
+  heishou: ['黑手', '需要勤洗。'],
+};
diff --git a/src/config/i18n/zh.ts b/src/config/i18n/zh/index.ts
similarity index 54%
rename from src/config/i18n/zh.ts
rename to src/config/i18n/zh/index.ts
index 8b416b2..bfc5d14 100644
--- a/src/config/i18n/zh.ts
+++ b/src/config/i18n/zh/index.ts
@@ -1,3 +1,6 @@
+import { weapon, armor, neck, ring, jewelry, pants, shoes, bracers, quality } from './euips';
+import * as skills from './skills';
+
 export default class Zh {
   title = '挂机放置游戏';
 
@@ -14,92 +17,37 @@ export default class Zh {
   noRefreshTimes = '刷新次数不够了，等等吧。';
 
   unEquip = '未装备';
-  weapon = {
-    type: '武器',
-    creation: ['创世亡命剑', '只有被选中的勇士才能唤醒它真正的力量。'],
-    nameless: ['无名剑', '没有人知道它的来历。'],
-    scarlet: ['阿加雷斯血色巨剑', '诚既勇兮又以武，终刚强兮不可凌。身既死兮神以灵，子魂魄兮为鬼雄。'],
-    death: ['死亡之刃', '万物生自守恒，源力破则失。'],
-    frostDragon: ['霜龙利刃', '傲雪冷心绝，万念化冰华。'],
-    dragon: ['神龙纳格林之刃', '神龙纳格林的爪子锻造的利刃'],
-    adventurer: ['大师大冒险家之剑', '大师大冒险家之剑'],
-    seraphim: ['六翼天使武刃', '见主坐在高高的宝座上。他的衣裳垂下，遮满圣殿。其上有撒拉弗侍立。各有六个翅膀。用两个翅膀遮脸，两个翅膀遮脚，两个翅膀飞翔。'],
-    shuzhuwan: ['数珠丸恒次', '具体情况不明，传说为日莲上人所有'],
-    leibse: ['埃苏莱布斯军刀', '埃苏莱布斯军刀'],
-    hellrock: ['狱岩石太刀', '用狱岩石制作的太刀，据说拥有让使用者潜力爆发的神秘力量'],
-    warrior: ['战士长剑', '六级战士使用的长剑'],
-    redWillow: ['赤柳血刃', '似乎会给使用者提供生命气息'],
-    sword: ['普通长剑', '朴实无华普通长剑，有的只有强力的攻击力'],
-    waveBlade: ['紫炎波刃剑', '传说中的狂战士最喜爱的剑。'],
-    furryPaw: ['毛毛的爪子', '这？这也是武器？'],
-    iceCrystals: ['冰晶之刃', '剑锋覆盖着冰晶，碰到的敌人都会被冻住。'],
-    initial: ['新手短剑', '新手菜鸡使用的短剑'],
-  };
-  armor = {
-    type: '防具',
-    dispute: ['争执连身衣', '争执连身衣'],
-    jianHao: ['剑豪盔甲', '剑豪盔甲'],
-    samurai: ['隐武士铠甲', '隐武士铠甲'],
-    trackers: ['芬撒里尔追踪者', '芬撒里尔追踪者'],
-    rongYi: ['肃清者戎衣', '相传看到这一袭黑衣的人都死了。'],
-    nightwear: ['红月的夜行衣', '红月的夜行衣'],
-    wildDragon: ['先代狂龙战士盔甲', '先代狂龙战士盔甲'],
-    guard: ['紫金守护胸甲', '够肉才能输出'],
-    redWillow: ['赤柳血铠', '似乎会给使用者提供生命气息'],
-    warrior: ['战士重铠', '六级战士使用的重型铠甲'],
-    lightArmor: ['天权轻甲', '舍弃了防御性能的轻甲，因为更加轻便，攻击性能更加突出'],
-    furryArmor: ['哈皮毛毛连身衣', '哈皮毛毛'],
-    initial: ['新手布衣', '新手菜鸡穿的破旧衣物'],
-  };
-  neck = {
-    type: '项链',
-    demonSlayer: ['十字旅团降魔项链', '十字旅团降魔项链'],
-    darkDragon: ['进阶黑暗龙王项链', '进阶黑暗龙王项链'],
-    single: ['单身贵族项链', '真棒，真帅。有了这条帅气的项链，一辈子单身都不会孤独'],
-    demons: ['魔族之翼展', '你能看到什么呢'],
-    ipaya: ['伊帕娅之项链', '伊帕娅之项链'],
-    crusade: ['十字军项链', '十字军佩戴的项链'],
-    gintamaEyes: ['银魂之眼', '银魂之眼'],
-    iceDragon: ['冰龙凝雪', '冰龙凝雪'],
-    initial: ['新手项坠', '一个破旧的的项链'],
-  };
-  ring = {
-    type: '戒指',
-    death: ['死神名片戒指', '死神名片戒指'],
-    realFurryRing: ['真·毛毛指环', '死神名片戒指'],
-    pioneer: ['先驱者戒指', '先驱者戒指'],
-    susan: ['素盏呜尊的意志', '素盏呜尊的意志'],
-    moonlight: ['月夜见尊的意志', '月夜见尊的意志'],
-    life: ['生命指环', '据说拥有增强佩戴者体质的神秘功效'],
-    imperialSoul: ['御魂之戒', '出来吧，卡赞！吸纳所有彷徨的灵魂！   ——鬼剑士约翰'],
-    furryRing: ['毛毛指环', '喵喵戒指，上面有没有摸到毛毛jio的怨念'],
-    initial: ['新手指环', '一个破旧的的指环'],
-  };
-
-  quality = {
-    shabby: '破旧',
-    ordinary: '普通',
-    artifact: '神器',
-    epic: '史诗',
-    unique: '独特',
-  };
+  weapon = weapon;
+  armor = armor;
+  neck = neck;
+  ring = ring;
+  jewelry = jewelry;
+  pants = pants;
+  shoes = shoes;
+  bracers = bracers;
+  quality = quality;
+  skill = skills;
 
   lv = '等级';
   reborn = ['转生次数', '玩家当前等级与转生次数', '成功挑战首领时会提升等级', '超过30级时可以转生获取更强力的初始属性'];
   hp = ['生命值', '当前生命值/最大生命值', '每秒会回复2%的最大生命值'];
-  hpPercent = ['生命值', '角色生命值百分比'];
+  hpPercent = ['生命加成', '角色生命值百分比'];
   atk = ['攻击力', '角色攻击力'];
-  atkPercent = ['攻击力', '角色攻击力百分比'];
+  atkPercent = ['攻击加成', '角色攻击力百分比'];
   crit = ['暴击率', '角色暴击率'];
   critDmg = ['暴击伤害', '角色暴击伤害初始为150%'];
   def = ['防御力', '角色防御力以及计算后的减伤比例', '减伤比例采用非线性计算，护甲越高收益越低', '显示为近似值，实际上永远不会到达100%减伤'];
-  defPercent = ['防御力', '角色防御力百分比'];
+  defPercent = ['防御加成', '角色防御力百分比'];
   eva = ['闪避值', '角色闪避几率', '闪避几率采用非线性计算', '多个闪避来源自身乘法叠加'];
   bloc = ['格挡', '角色格挡伤害', '计算护甲后再计算格挡伤害就是最终受到的伤害'];
-  blocPercent = ['格挡', '角色格挡百分比'];
+  blocPercent = ['格挡加成', '角色格挡百分比'];
   recoverSpeed = ['生命回复速度'];
-  moveSpeed = ['副本行进速度'];
-  battleSpeed = ['副本战斗速度'];
+  moveSpeed = ['移动速度'];
+  battleSpeed = ['战斗速度'];
+  dmgPercent = ['伤害加成'];
+  dmgReduc = ['伤害减免'];
+  critAvoid = ['暴击避免'];
+  critDmgReduc = ['爆伤减免'];
   dps = ['秒伤', 'DPS:角色每秒伤害', '这个只是伤害数据，并没有统计防御属性，所以只是作为战斗力评估的一个依据'];
   coins = ['金币', '你拥有的金币数量', '在这里，钱就是万能的'];
 
@@ -152,14 +100,17 @@ export default class Zh {
   difficulty = ['简单', '普通', '困难', '极难'];
   dungeonTips = ['当前副本难度', '双击或右键开始挑战副本'];
 
-  monster = '副本普通怪物';
-  boss = '副本首领';
+  player = '你';
+  monster = '小怪';
+  boss = '首领';
   eliteMonster = '无尽模式精英怪';
   startDungeon = '你已进入';
-  battle = '你遭遇了(lv${lv}${name}),正在战斗中...';
-  bouts = ['点击查看战斗过程', '回合', '触发了暴击', '你造成了${dmg}点伤害', '受到${dmg}点伤害', '战斗结束', '你获胜', '你战败'];
-  killMonster = '你击杀了(lv${lv}${name})，共受到了${dmg}点伤害';
-  beKilled = '你被(lv${lv}${name})击败，共受到了${dmg}点伤害';
+  battle = '你遭遇了(lv${0}${1}),正在战斗中...';
+  bouts = '点击查看战斗过程';
+  //   bout = ['回合', '你使用了【${0}】', '触发了暴击', '造成了${0}点伤害', '受到${0}点伤害', '战斗结束', '你获胜', '你战败', '偷取${0}点生命', '反弹${0}点伤害'];
+  bout = ['战斗结束,你获胜', '战斗结束,你战败'];
+  killMonster = '你击杀了(lv${0}${1})，累计（减去偷取）受到了${2}点伤害';
+  beKilled = '你被(lv${0}${1})击败，累计（减去偷取）受到了${2}点伤害';
   getCoins = '获得金币:';
   uniqueBooty = '稀有掉落';
   dungeonSuccess = '副本探索成功';
diff --git a/src/config/i18n/zh/skills.ts b/src/config/i18n/zh/skills.ts
new file mode 100644
index 0000000..a1efdbf
--- /dev/null
+++ b/src/config/i18n/zh/skills.ts
@@ -0,0 +1,17 @@
+export const action = '主动';
+export const passive = '被动';
+
+export const control = ['${0}使用了${1},', '${0}被控制${1}回合', '控制失败', '${0}被控制,无法释放技能,剩余${1}回合'];
+export const crit = ['触发了暴击'];
+
+export const iceBlade = ['冰刃', '暴击时有${0}几率释放冰线冲击,附加${1}%攻击力的伤害和${2}回合冰冻效果。', '触发了冰刃,附加${0}点伤害,冰冻${1}${2}回合'];
+export const seeRed = ['见红', '造成${0}%攻击力的基础伤害，冷却${1}回合。'];
+export const qici = ['鳍刺', '攻击时有${0}%概率对目标造成流血，持续${1}回合。'];
+
+export const fate = ['化缘', '副本掉落金币奖励提高${0}%。'];
+export const vampire = ['汲血', '生命偷取${0}%。', '触发汲血,偷取${0}点生命'];
+export const prototype = ['现原形', '将目标变为猴子，持续${0}回合，冷却${1}回合，对boss只有${2}%成功率。'];
+export const attack = ['普通攻击', '造成100%攻击力的基础伤害', '${0}使用了${1}${4},对${2}造成了${3}点伤害'];
+export const critFear = ['暴击恐惧', '暴击时附加${0}%攻击力的额外伤害。', '触发暴击恐惧,附加${0}点伤害'];
+export const liulipan = ['琉璃盘', '使用后产生黑红内丹,临时提高${0}点基础攻击力进行攻击,冷却${1}回合。'];
+export const JHSY = ['镜花水月', '受到伤害时有${0}%概率反弹${1}%所受伤害。', '${0}触发了镜花水月,反弹${1}点伤害'];
diff --git a/src/config/index.ts b/src/config/index.ts
index 881436e..8d8f8d6 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -5,4 +5,6 @@ export { router, i18n };
 export * from './equips';
 export * from './assets';
 export * from './base';
-export * from './dungeon';
+export * from './beings';
+
+export * as Skills from './skill';
diff --git a/src/config/skill/base.ts b/src/config/skill/base.ts
new file mode 100644
index 0000000..a64b266
--- /dev/null
+++ b/src/config/skill/base.ts
@@ -0,0 +1,187 @@
+import { BattleRole, replace } from '@/tool';
+import { type_boss } from '@/config';
+import i18n from '../i18n';
+const { t } = i18n;
+export interface Skill {
+  order: number;
+  lv?: number;
+  type: string;
+  name: string;
+  cd: number;
+  rmdCd: number;
+  desc(): string;
+
+  beforeBattle(owner: BattleRole, target: BattleRole): void;
+  beforeAtk(owner: BattleRole, target: BattleRole): void;
+  afterAtk(owner: BattleRole, target: BattleRole): void;
+  afterBattle(owner: BattleRole, target: BattleRole): void;
+  onAtked(owner: BattleRole, target: BattleRole): void;
+}
+
+export const skill_type_action = 'action';
+export const skill_type_passive = 'passive';
+
+//主动技能
+export abstract class ActionSkill implements Skill {
+  type: string = skill_type_action;
+  order: number = 10;
+  abstract name: string;
+  abstract cd: number;
+  rmdCd: number = 0;
+  abstract desc(): string;
+  beforeBattle(owner: BattleRole, target: BattleRole): void {}
+  beforeAtk(owner: BattleRole, target: BattleRole): void {
+    if (this.rmdCd > 0) {
+      this.rmdCd--;
+    } else if (owner.action) {
+      return;
+    } else {
+      this.rmdCd = this.cd - 1;
+      owner.action = this;
+      //   this.use(owner, target);
+    }
+  }
+  abstract use(owner: BattleRole, target: BattleRole): void;
+  afterAtk(owner: BattleRole, target: BattleRole): void {}
+  afterBattle(owner: BattleRole, target: BattleRole): void {}
+  onAtked(owner: BattleRole, target: BattleRole): void {}
+}
+//被动技能
+export abstract class PassiveSkill implements Skill {
+  type: string = skill_type_passive;
+  abstract name: string;
+  order: number = 1;
+  cd: number = 0;
+  last: number = 1;
+  rmdCd: number = 0;
+  rmdLast: number = -1;
+  abstract desc(): string;
+  beforeBattle(owner: BattleRole, target: BattleRole): void {}
+  beforeAtk(owner: BattleRole, target: BattleRole): void {}
+  check(owner: BattleRole, target: BattleRole): void {
+    if (this.rmdCd > 0) {
+      this.rmdCd--;
+    } else if (this.trigger(owner, target)) {
+      this.rmdCd = this.cd - 1;
+      this.rmdLast = this.last;
+    }
+    if (this.rmdLast > 0) {
+      this.rmdLast--;
+      this.takeEffect(owner, target);
+    }
+  }
+  abstract trigger(owner: BattleRole, target: BattleRole): boolean;
+  abstract takeEffect(owner: BattleRole, target: BattleRole): void;
+  afterAtk(owner: BattleRole, target: BattleRole): void {}
+  afterBattle(owner: BattleRole, target: BattleRole): void {}
+  onAtked(owner: BattleRole, target: BattleRole): void {}
+}
+//攻击前触发的被动
+export abstract class PrePassiveSkill extends PassiveSkill {
+  beforeAtk(owner: BattleRole, target: BattleRole): void {
+    this.check(owner, target);
+  }
+}
+//攻击后触发的被动
+export abstract class SufPassiveSkill extends PassiveSkill {
+  afterAtk(owner: BattleRole, target: BattleRole): void {
+    this.check(owner, target);
+  }
+}
+//被攻击后触发的被动
+export abstract class CounterSkill extends PassiveSkill {
+  onAtked(owner: BattleRole, target: BattleRole): void {
+    this.check(owner, target);
+  }
+}
+
+//收益技能
+export abstract class GainsSkill implements Skill {
+  order: number = 1;
+  type: string = skill_type_passive;
+  abstract name: string;
+  cd: number = 0;
+  rmdCd: number = 0;
+  abstract desc(): string;
+  beforeBattle(owner: BattleRole, target: BattleRole): void {}
+  beforeAtk(owner: BattleRole, target: BattleRole): void {}
+  afterAtk(owner: BattleRole, target: BattleRole): void {}
+  abstract afterBattle(owner: BattleRole, target: BattleRole): void;
+  onAtked(owner: BattleRole, target: BattleRole): void {}
+}
+//吸血技能
+export abstract class Vampire extends SufPassiveSkill {
+  abstract percent: number;
+  name: string = 'vampire';
+  rate: number = 100;
+  desc(): string {
+    return replace(t('skill.vampire.1'), [this.percent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return true;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    if (owner.dmg <= 0) {
+      return;
+    }
+    let sneak = Math.ceil((owner.dmg * this.percent) / 100);
+    const tmp = owner.attr.hp - owner.attr.curHp;
+    sneak = sneak > tmp ? tmp : sneak;
+    owner.addHp(sneak);
+    if (sneak > 0) {
+      const log = replace(t('skill.vampire.2'), [sneak]);
+      owner.battleLog(log);
+    }
+  }
+}
+//控制技能
+export abstract class Control extends ActionSkill {
+  abstract last: number;
+  abstract rate: number;
+  abstract bossRate: number;
+  use(owner: BattleRole, target: BattleRole) {
+    owner.dmg = 0;
+    const rate = target.type == type_boss ? this.bossRate : this.rate;
+    let log = t('skill.control.2');
+    if (Math.random() < rate / 100) {
+      target.control = target.control > this.last ? target.control : this.last;
+      log = replace(t('skill.control.1'), [t(target.type), this.last]);
+    }
+    log = log = replace(t('skill.control.0'), [t(owner.type), t('skill.' + this.name + '.0')]) + log;
+    owner.battleLog(log);
+  }
+}
+//普通攻击
+export class Attack extends ActionSkill {
+  order: number = 999;
+  name: string = 'attack';
+  cd: number = 1;
+  extraAtk = 0;
+  precent: number = 100;
+  desc(): string {
+    return t('skill.attack.1');
+  }
+  use(owner: BattleRole, target: BattleRole) {
+    if (owner.control > 0) {
+      const log = replace(t('skill.control.3'), [t(owner.type), owner.control]);
+      owner.battleLog(log);
+      owner.control--;
+      return;
+    }
+    const attr = owner.attr;
+    const baseAtk = attr.baseAtk + this.extraAtk;
+    let dmg = ((baseAtk * (1 + attr.atkPercent / 100) * this.precent) / 100) * (1 + attr.dmgPercent / 100);
+    dmg = dmg * (1 - target.attr.reducPercent) * (1 - target.attr.dmgReduc / 100) - target.attr.bloc;
+    owner.crit = Math.random() < owner.attr.crit / 100;
+    let critLog = '';
+    if (owner.crit) {
+      dmg *= owner.attr.critDmg / 100;
+      critLog = t('skill.crit.0');
+    }
+    dmg = dmg < 1 ? 1 : dmg;
+    owner.dmg = Math.ceil(dmg);
+    target.addHp(-1 * owner.dmg);
+    const log = replace(t('skill.attack.2'), [t(owner.type), t('skill.' + this.name + '.0'), t(target.type), owner.dmg, critLog]);
+    owner.battleLog(log);
+  }
+}
diff --git a/src/config/skill/index.ts b/src/config/skill/index.ts
new file mode 100644
index 0000000..4cf5db5
--- /dev/null
+++ b/src/config/skill/index.ts
@@ -0,0 +1,3 @@
+export * from './base';
+export * from './weapon';
+export * from './jewelry';
diff --git a/src/config/skill/jewelry.ts b/src/config/skill/jewelry.ts
new file mode 100644
index 0000000..13b9ae3
--- /dev/null
+++ b/src/config/skill/jewelry.ts
@@ -0,0 +1,82 @@
+import { CounterSkill, Attack, Control, GainsSkill, SufPassiveSkill, Vampire } from './base';
+import i18n from '../i18n';
+import { BattleRole, replace } from '@/tool';
+const { t } = i18n;
+
+//化缘
+export class Fate extends GainsSkill {
+  percent = 20;
+  name: string = 'fate';
+  desc(): string {
+    return replace(t('skill.fate.1'), [this.percent]);
+  }
+  afterBattle(owner: BattleRole, target: BattleRole): void {
+    target.attr.coins = Math.round(target.attr.coins * (1 + this.percent / 100));
+  }
+}
+//1%生命偷取
+export class Vampire1 extends Vampire {
+  percent: number = 1;
+}
+//现原形
+export class Prototype extends Control {
+  cd: number = 10;
+  last: number = 2;
+  rate: number = 100;
+  bossRate: number = 10;
+  name: string = 'prototype';
+  desc(): string {
+    return replace(t('skill.prototype.1'), [this.last, this.cd, this.bossRate]);
+  }
+}
+//暴击恐惧
+export class CritFear extends SufPassiveSkill {
+  name: string = 'critFear';
+  percent: number = 200;
+  desc(): string {
+    return replace(t('skill.critFear.1'), [this.percent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.crit;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const additional = Math.ceil((owner.attr.atk * this.percent) / 100);
+    owner.dmg += additional;
+    target.addHp(-1 * additional);
+    const log = replace(t('skill.critFear.2'), [additional]);
+    owner.battleLog(log);
+  }
+}
+//琉璃盘
+export class Liulipan extends Attack {
+  order: number = 10;
+  lv?: number;
+  name: string = 'liulipan';
+  atk: number = 20;
+  cd: number = 5;
+  desc(): string {
+    return replace(t('skill.liulipan.1'), [(this.lv || 1) * this.atk, this.cd]);
+  }
+  beforeAtk(owner: BattleRole, target: BattleRole): void {
+    this.extraAtk = (this.lv || 1) * this.atk;
+    super.beforeAtk(owner, target);
+  }
+}
+//镜花水月
+export class JHSY extends CounterSkill {
+  name: string = 'JHSY';
+  rate: number = 100;
+  percent: number = 100;
+  desc(): string {
+    return replace(t('skill.JHSY.1'), [this.rate, this.percent, this.cd]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const reflected = Math.ceil((target.dmg * this.percent) / 100);
+    target.addHp(-1 * reflected);
+    const log = replace(t('skill.JHSY.2'), [t(owner.type), reflected]);
+    owner.battleLog(log);
+  }
+}
diff --git a/src/config/skill/weapon.ts b/src/config/skill/weapon.ts
new file mode 100644
index 0000000..b72f14c
--- /dev/null
+++ b/src/config/skill/weapon.ts
@@ -0,0 +1,35 @@
+import { Attack, SufPassiveSkill } from './base';
+import i18n from '../i18n';
+import { replace, BattleRole } from '@/tool';
+const { t } = i18n;
+
+export class IceBlade extends SufPassiveSkill {
+  name: string = 'iceBlade';
+  rate: number = 10;
+  percent: number = 1000;
+  last: number = 1;
+  desc(): string {
+    return replace(t('skill.iceBlade.1'), [this.rate, this.percent, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.crit && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const additional = Math.ceil((owner.attr.atk * this.percent) / 100);
+    owner.dmg += additional;
+    target.addHp(-1 * additional);
+    target.control = target.control > this.last ? target.control : this.last;
+    const log = replace(t('skill.iceBlade.2'), [additional, t(target.type), this.last]);
+    owner.battleLog(log);
+  }
+}
+
+export class SeeRed extends Attack {
+  order: number = 100;
+  name: string = 'seeRed';
+  cd: number = 4;
+  precent: number = 200;
+  desc(): string {
+    return replace(t('skill.seeRed.1'), [this.precent, this.cd]);
+  }
+}
diff --git a/src/store/action.ts b/src/store/action.ts
index ab24d57..6e32b6a 100644
--- a/src/store/action.ts
+++ b/src/store/action.ts
@@ -46,7 +46,6 @@ export const reset_player_equi = ({ commit }) => {
 
 export const sell_equip = ({ state, commit }, index) => {
   const item = state.grid[index];
-  console.log(item);
   if (item.locked) {
     commit('set_sys_info', { msg: t('sellLocked'), type: 'warning' });
     return;
@@ -69,11 +68,11 @@ export const useEquip = ({ state, commit }, index) => {
 };
 
 export const saveGame = ({ state, commit }) => {
+  const player = state.playerAttribute;
   const data = {
-    equips: [state.playerAttribute.weapon, state.playerAttribute.armor, state.playerAttribute.ring, state.playerAttribute.neck],
-    endlessLv: state.endlessLv,
-    lv: state.playerAttribute.lv,
-    coins: state.playerAttribute.coins,
+    equips: [player.weapon, player.armor, player.ring, player.neck, player.jewelry, player.pants, player.shoes, player.bracers],
+    lv: player.lv,
+    coins: player.coins,
     backpack: state.grid,
     autoSell: state.autoSell,
     shop: state.shop,
@@ -98,7 +97,6 @@ export const loadGame = ({ commit }, data?) => {
   } else {
     commit('set_player_equips', data.equips);
     commit('set_player_lv', data.lv || 1);
-    commit('set_endless_lv', data.endlessLv || 1);
     commit('set_player_coins', data.coins || 0);
     commit('set_backpack', data.backpack);
     commit('set_auto_sell', data.autoSell);
diff --git a/src/store/mutation.ts b/src/store/mutation.ts
index 4e61ce5..5532ed8 100644
--- a/src/store/mutation.ts
+++ b/src/store/mutation.ts
@@ -3,8 +3,7 @@ import { reborn_point_coefficients, reborn_arrts, i18n } from '@/config';
 const { t } = i18n;
 
 export const call_player_attribute = (state) => {
-  const attribute = callPlayerAttribute(state.playerAttribute, state.rebornAttribute);
-  state.playerAttribute.attribute = attribute;
+  callPlayerAttribute(state.playerAttribute, state.rebornAttribute);
 };
 export const set_player_equips = (state, equips) => {
   if (equips && equips.length > 0) {
@@ -30,7 +29,7 @@ export const set_sys_info = (state, data) => {
   var time = +new Date();
   var date = new Date(time + 8 * 3600 * 1000); // 增加8小时
   state.sysInfo[state.sysInfo.length - 1].time = date.toJSON().substr(11, 8).replace('T', ' ');
-  if (state.sysInfo.length > 50) {
+  if (state.sysInfo.length > 300) {
     state.sysInfo.shift();
   }
 };
@@ -80,9 +79,6 @@ export const add_bootys = (state, bootys) => {
 export const set_shop = (state, shop) => {
   state.shop = shop;
 };
-export const set_endless_lv = (state, data) => {
-  state.playerAttribute.endlessLv = parseInt(data) < 1 ? 1 : parseInt(data);
-};
 export const set_player_lv = (state, data) => {
   data = data < 1 ? 1 : data;
   state.playerAttribute.lv = parseInt(data || 1);
diff --git a/src/store/state.ts b/src/store/state.ts
index 4c325ee..ee7aa67 100644
--- a/src/store/state.ts
+++ b/src/store/state.ts
@@ -1,12 +1,7 @@
-import { initialWeapon, initialArmor, initialNeck, initialRing, i18n } from '@/config';
+import { i18n, RebornAttribute, RebornPoints, Player } from '@/config';
 
 const { t } = i18n;
 
-const weapon = initialWeapon();
-const armor = initialArmor();
-const neck = initialNeck();
-const ring = initialRing();
-
 export default {
   sysInfo: [
     { type: 'win', msg: t('welcome.0') },
@@ -21,53 +16,11 @@ export default {
     tipsStyle: {},
     tipsStyle2: {},
   },
-  rebornAttribute: {
-    hp: 0,
-    atk: 0,
-    crit: 0,
-    critDmg: 0,
-    def: 0,
-    bloc: 0,
-    recoverSpeed: 0,
-    moveSpeed: 0,
-    battleSpeed: 0,
-  },
-  rebornPoints: {
-    count: 0,
-    points: 0,
-    hp: 0,
-    atk: 0,
-    crit: 0,
-    critDmg: 0,
-    def: 0,
-    bloc: 0,
-    recoverSpeed: 0,
-    moveSpeed: 0,
-    battleSpeed: 0,
-  },
+  rebornAttribute: new RebornAttribute(),
+  rebornPoints: new RebornPoints(),
   grid: new Array(32),
   autoSell: [],
-  playerAttribute: {
-    lv: 1,
-    coins: 0,
-    healthRecoverySpeed: 1,
-    endlessLv: 1,
-    attribute: {
-      curHp: 200,
-      hp: 200,
-      atk: 0,
-      def: 0,
-      reducPercent: 0,
-      bloc: 0,
-      eva: 0,
-      crit: 0,
-      critDmg: 150, // 初始暴击伤害150%
-    },
-    weapon: weapon,
-    armor: armor,
-    neck: neck,
-    ring: ring,
-  },
+  playerAttribute: new Player(),
   shop: {
     item: [],
     waitTime: 60,
diff --git a/src/tool/caller.ts b/src/tool/caller.ts
deleted file mode 100644
index fc7aa61..0000000
--- a/src/tool/caller.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { strengthen_rates } from '@/config';
-
-export const strengthenValue = (value, strengthenLv) => {
-  if (strengthenLv <= 0) {
-    return value;
-  }
-  const factor = 1.055 ** (strengthenLv ** 1.1);
-  return Math.round(factor * value);
-};
-
-/**
- * 计算角色最终属性
- * @param playerAttribute 装备属性
- * @param rA 转生属性
- */
-export const callPlayerAttribute = (playerAttribute: any, rA: any) => {
-  const equips = [playerAttribute.weapon, playerAttribute.armor, playerAttribute.neck, playerAttribute.ring];
-  const curHp = playerAttribute.attribute.curHp,
-    hp = playerAttribute.attribute.hp;
-  const hpP = hp > 0 ? curHp / hp : 1;
-
-  const attribute = {
-    curHp: 0,
-    hp: 200 + rA.hp,
-    hpPercent: 0,
-    atk: rA.atk,
-    atkPercent: 0,
-    def: rA.def,
-    defPercent: 0,
-    reducPercent: 0,
-    bloc: rA.bloc,
-    blocPercent: 0,
-    eva: 0,
-    crit: rA.crit,
-    critDmg: 150 + rA.critDmg, // 初始暴击伤害150%
-    dps: 0,
-  };
-  const entry = new Array();
-  equips.forEach((equip) => {
-    equip && Array.prototype.push.apply(entry, equip.extraEntry);
-    equip && Array.prototype.push.apply(entry, strengthenEntry(equip));
-  });
-
-  entry.forEach((item) => {
-    const key = item.type;
-    attribute[key] += item.value;
-  });
-  // 暴击率最多100%
-  if (attribute.crit > 100) {
-    attribute.crit = 100;
-  }
-  //计算最终属性
-  attribute.hp = Math.ceil(attribute.hp * (1 + attribute.hpPercent / 100));
-  attribute.curHp = Math.ceil(attribute.hp * hpP);
-  attribute.atk = Math.ceil(attribute.atk * (1 + attribute.atkPercent / 100));
-  attribute.def = Math.ceil(attribute.def * (1 + attribute.defPercent / 100));
-  attribute.bloc = Math.ceil(attribute.bloc * (1 + attribute.blocPercent / 100));
-  const arr = ['hp', 'curHp', 'atk', 'def', 'bloc', 'eva'];
-  arr.forEach((key) => {
-    attribute[key] = Math.round(attribute[key]);
-  });
-  //计算秒伤
-  const atk = attribute.atk,
-    crit = attribute.crit / 100,
-    critdmg = attribute.critDmg / 100;
-  attribute.dps = Math.ceil((1 - crit + crit * critdmg) * atk);
-  //计算减伤比例
-  //   attribute.def = 500;
-  attribute.reducPercent = attribute.def / (200 + 1.1 * attribute.def) + (0.09 * attribute.def) / (attribute.def + 200);
-  //   attribute.reducPercent = (0.5 * attribute.def) / (200 + 0.502 * attribute.def);
-  return attribute;
-};
-
-const strengthenEntry = (equip) => {
-  const temp = deepCopy(equip.base.entry);
-  temp.forEach((item) => {
-    item.value = strengthenValue(item.value, equip.strengthenLv);
-  });
-  return temp;
-};
-
-export const deepCopy = (src) => {
-  if (!src) {
-    return null;
-  }
-  return JSON.parse(JSON.stringify(src));
-};
-
-/**
- * 计算装备购买价格
- * @param equip 装备
- * @returns
- */
-export const conisOfBuy = (equip) => {
-  if (!equip) {
-    return 0;
-  }
-  return Math.round(equip.lv * equip.quality.qualityCoefficient * (250 + 20 * equip.lv));
-};
-
-/**
- * 计算装备出售价格
- * @param equip 装备
- * @returns
- */
-export const conisOfsell = (equip) => {
-  if (!equip) {
-    return 0;
-  }
-  return Math.round(equip.lv * equip.quality.qualityCoefficient * 30);
-};
-
-export const getPointsOfReborn = (playerAttribute) => {
-  const lv = playerAttribute.lv;
-  let points = lv >= 20 ? Math.floor((lv - 20) ** 1.1 / 2.1) : 0;
-
-  const euqips = [playerAttribute.weapon, playerAttribute.armor, playerAttribute.neck, playerAttribute.ring];
-  euqips.forEach((equip) => {
-    if (!equip) {
-      return;
-    }
-    const wlv = equip.lv;
-    const elv = equip.enchantlvl || 0;
-    const q = equip.quality.qualityCoefficient;
-    if (wlv >= 20) {
-      points += Math.floor((((wlv - 20) / 10) ** 1.1 * (0.1 * elv ** 1.5 + 1) * q) / 3.5);
-    }
-  });
-
-  return Math.round(points * 1.2);
-};
-
-export const callBattleResult = (player, monster) => {
-  const tmp = player.curHp,
-    crit = player.crit / 100,
-    critdmg = player.critDmg / 100,
-    atk = player.atk;
-  let monsterDmg = Math.ceil(monster.atk * (1 - player.reducPercent) - player.bloc);
-  monsterDmg < 1 && (monsterDmg = 1);
-  let curHp = player.curHp,
-    mHp = monster.hp;
-  const bouts: any = [];
-  while (true) {
-    const bout: any = {};
-    bouts.push(bout);
-    if (Math.random() < crit) {
-      bout.crit = true;
-      bout.dmg = Math.ceil(atk * critdmg);
-    } else {
-      bout.dmg = atk;
-    }
-    mHp -= bout.dmg;
-    if (mHp < 0) break;
-    bout.takeDmg = monsterDmg;
-    curHp -= monsterDmg;
-    if (curHp < 0) break;
-  }
-  return { win: curHp > 0, bouts: bouts, takeDmg: tmp - curHp };
-};
-
-export const callEuqipTipsLocation = (e, mobile) => {
-  const x = e.pageX,
-    y = e.pageY,
-    maxH = window.innerHeight,
-    maxW = window.innerWidth,
-    tipsStyle: any = {},
-    tipsStyle2: any = {};
-  if (mobile) {
-    tipsStyle.left = '0.3rem';
-    tipsStyle2.left = '13.9rem';
-    const num = 10;
-    if (y < maxH / 2) {
-      tipsStyle.top = y + num + 'px';
-      tipsStyle2.top = y + num + 'px';
-    } else {
-      tipsStyle.bottom = maxH - y - num + 'px';
-      tipsStyle2.bottom = maxH - y - num + 'px';
-    }
-  } else {
-    if (x < maxW / 2) {
-      tipsStyle.left = x + 'px';
-      tipsStyle2.left = 'calc(' + x + 'px + 21rem)';
-    } else {
-      tipsStyle.right = maxW - x + 'px';
-      tipsStyle.right2 = 'calc(' + tipsStyle.righ + ' - 21rem)';
-    }
-    if (y < maxH / 2) {
-      tipsStyle.top = y + 'px';
-      tipsStyle2.top = y + 'px';
-    } else {
-      tipsStyle.bottom = maxH - y + 'px';
-      tipsStyle2.bottom = maxH - y + 'px';
-    }
-  }
-  return [tipsStyle, tipsStyle2];
-};
-
-export const strengthenCoins = (lv, strengthenLv) => {
-  return Math.round((lv + 1) * 1.1 ** (strengthenLv ** 1.1) * (10 + lv / 5) + 100);
-};
-
-export const strengthenAvgCoins = (lv, strengthenLv) => {
-  let sum = 0;
-  const len = strengthen_rates.length;
-  for (let i = 0; i < strengthenLv; i++) {
-    const rate = i < len ? strengthen_rates[i] : strengthen_rates[len - 1];
-    sum += strengthenCoins(lv, i) / rate + (sum * (1 - rate)) / rate;
-  }
-  return Math.round(sum);
-};
diff --git a/src/tool/caller/attribute.ts b/src/tool/caller/attribute.ts
new file mode 100644
index 0000000..89a3e00
--- /dev/null
+++ b/src/tool/caller/attribute.ts
@@ -0,0 +1,110 @@
+import { Player, Attribute } from '@/config';
+import { deepCopy } from '.';
+
+/**
+ * 计算角色最终属性于技能
+ * @param player 角色
+ * @param rA 转生属性
+ */
+export const callPlayerAttribute = (player: Player, rA: any) => {
+  const equips = [player.weapon, player.armor, player.neck, player.ring, player.jewelry, player.pants, player.shoes, player.bracers];
+  const curHp = player.attribute.curHp,
+    hp = player.attribute.hp;
+  const hpP = hp > 0 ? curHp / hp : 1;
+
+  const attribute: Attribute = new Attribute(rA);
+  const entry = new Array();
+  equips.forEach((equip) => {
+    equip && Array.prototype.push.apply(entry, equip.extraEntry);
+    equip && Array.prototype.push.apply(entry, strengthenEntry(equip));
+  });
+
+  entry.forEach((item) => {
+    const key = item.type;
+    if (key == 'dmgPercent') {
+      attribute[key] = Math.round((attribute[key] + 100) * (item.value / 100 + 1) - 100);
+    } else if (key == 'dmgReduc') {
+      attribute[key] = Math.round(100 - (1 - attribute[key] / 100) * (1 - item.value / 100) * 100);
+    } else {
+      attribute[key] += item.value;
+    }
+  });
+  // 暴击率最多100%
+  //   if (attribute.crit > 100) {
+  //     attribute.crit = 100;
+  //   }
+  //计算最终属性
+  attribute.hp = Math.ceil(attribute.hp * (1 + attribute.hpPercent / 100));
+  attribute.curHp = Math.ceil(attribute.hp * hpP);
+  attribute.baseAtk = attribute.atk;
+  attribute.atk = Math.ceil(attribute.baseAtk * (1 + attribute.atkPercent / 100));
+  attribute.def = Math.ceil(attribute.def * (1 + attribute.defPercent / 100));
+  attribute.bloc = Math.ceil(attribute.bloc * (1 + attribute.blocPercent / 100));
+  const arr = ['hp', 'curHp', 'atk', 'def', 'bloc', 'eva'];
+  arr.forEach((key) => {
+    attribute[key] = Math.round(attribute[key]);
+  });
+  //计算秒伤
+  const atk = attribute.atk,
+    crit = attribute.crit / 100,
+    critdmg = attribute.critDmg / 100,
+    dmgPercent = attribute.dmgPercent / 100;
+  attribute.dps = Math.ceil((1 - crit + crit * critdmg) * atk * (1 + dmgPercent));
+  //计算减伤比例
+  attribute.reducPercent = attribute.def / (200 + 1.1111 * attribute.def);
+  //   attribute.reducPercent = attribute.def / (200 + 1.1 * attribute.def) + (0.09 * attribute.def) / (attribute.def + 200);
+  //   attribute.reducPercent = (0.5 * attribute.def) / (200 + 0.502 * attribute.def);
+  player.attribute = attribute;
+};
+
+/**
+ * 计算装备强化后的基础属性
+ * @param equip 装备
+ * @returns
+ */
+const strengthenEntry = (equip) => {
+  const temp = deepCopy(equip.base.entry);
+  temp.forEach((item) => {
+    item.value = strengthenValue(item.value, equip.strengthenLv);
+  });
+  return temp;
+};
+
+/**
+ * 计算基础属性强化后的值
+ * @param value 基础值
+ * @param strengthenLv 强化等级
+ * @returns
+ */
+export const strengthenValue = (value, strengthenLv) => {
+  if (strengthenLv <= 0) {
+    return value;
+  }
+  const factor = 1.055 ** (strengthenLv ** 1.1);
+  return Math.round(factor * value);
+};
+
+/**
+ * 计算角色转生可获得的转生点数
+ * @param playerAttribute 角色属性
+ * @returns
+ */
+export const getPointsOfReborn = (playerAttribute) => {
+  const lv = playerAttribute.lv;
+  let points = lv >= 20 ? Math.floor((lv - 20) ** 1.1 / 2.1) : 0;
+
+  const euqips = [playerAttribute.weapon, playerAttribute.armor, playerAttribute.neck, playerAttribute.ring];
+  euqips.forEach((equip) => {
+    if (!equip) {
+      return;
+    }
+    const wlv = equip.lv;
+    const elv = equip.enchantlvl || 0;
+    const q = equip.quality.qualityCoefficient;
+    if (wlv >= 20) {
+      points += Math.floor((((wlv - 20) / 10) ** 1.1 * (0.1 * elv ** 1.5 + 1) * q) / 3.5);
+    }
+  });
+
+  return Math.round(points * 1.2);
+};
diff --git a/src/tool/caller/battle.ts b/src/tool/caller/battle.ts
new file mode 100644
index 0000000..85c2298
--- /dev/null
+++ b/src/tool/caller/battle.ts
@@ -0,0 +1,151 @@
+import { Equip, Skills, Monster, Attribute, Player } from '@/config';
+import { randonBootyEquip, deepCopy } from '@/tool';
+import i18n from '@/config/i18n';
+const { t } = i18n;
+
+export class BattleRole {
+  attr: Attribute;
+  actions: Skills.Skill[] = new Array();
+  passives: Skills.Skill[] = new Array();
+  commit;
+  type: string;
+  control: number = 0;
+  //临时状态
+  action: Skills.ActionSkill | null = null;
+  dmg: number = 0;
+  crit: boolean = false;
+
+  constructor(attr: Attribute, commit, type: string) {
+    this.attr = attr;
+    this.commit = commit;
+    this.type = type;
+    this.addSkill(attr.skill); //添加默认主动技能普通攻击
+  }
+
+  addSkill = (skillName, lv?) => {
+    lv = lv || 1;
+    const skills = createSkill(skillName, lv);
+    skills.forEach((skill) => {
+      const type = skill.type;
+      if (type == Skills.skill_type_action) {
+        this.actions.push(skill); //主动技能
+      } else if (type == Skills.skill_type_passive) {
+        this.passives.push(skill); //被动技能
+      }
+    });
+  };
+
+  onStartBattle = (target: BattleRole) => {
+    //技能排序
+    this.actions.sort((a, b) => {
+      return (a.order = b.order);
+    });
+    //战斗开始前触发的技能
+    this.passives.forEach((skill) => {
+      skill.beforeBattle(this, target);
+    });
+  };
+
+  attack = (target: BattleRole) => {
+    //选择使用的主动技能
+    this.actions.forEach((skill) => {
+      skill.beforeAtk(this, target);
+    });
+    //攻击前触发的被动技能
+    this.passives.forEach((skill) => {
+      skill.beforeAtk(this, target);
+    });
+    this.action?.use(this, target);
+    //攻击后触发的被动技能
+    this.passives.forEach((skill) => {
+      skill.afterAtk(this, target);
+    });
+    //触发攻击目标的反制技能
+    target.onAttacked(this);
+    //初始化临时状态
+    this.action = null;
+    this.dmg = 0;
+    this.crit = false;
+  };
+
+  onAttacked = (target: BattleRole) => {
+    //触发反制技能
+    this.passives.forEach((skill) => {
+      skill.onAtked(this, target);
+    });
+  };
+
+  battleLog = (log: string) => {
+    this.commit('set_sys_info', { type: 'battle', msg: log });
+  };
+
+  addHp = (hp: number) => {
+    if (this.type == 'player') {
+      this.commit('add_player_curhp', hp);
+    } else {
+      this.attr.curHp += hp;
+    }
+  };
+
+  getBootys = (target: BattleRole) => {
+    //战斗结束后触发的技能
+    this.passives.forEach((skill) => {
+      skill.afterBattle(this, target);
+    });
+    const equips = randonBootyEquip(target.attr);
+    const coins = target.attr.coins;
+    return { equips: equips, coins: coins };
+  };
+
+  isDeath = () => {
+    return this.attr.curHp <= 0;
+  };
+}
+
+export const createBattleRole = (player: Player, monster: Monster, commit) => {
+  const playerRole = new BattleRole(player.attribute, commit, 'player');
+  const palyerEquips = [player.weapon, player.armor, player.neck, player.ring, player.jewelry];
+  palyerEquips.forEach((equip) => {
+    playerRole.addSkill(equip.base.skill);
+  });
+
+  monster = deepCopy(monster);
+  monster.curHp = monster.hp;
+  const monsterRole = new BattleRole(monster, commit, monster.type);
+
+  return { player: playerRole, monster: monsterRole };
+};
+
+/**
+ * 初始化装备技能
+ * @param equip 装备
+ * @returns
+ */
+export const createEquipSkill = (equip): Skills.Skill[] => {
+  if (!equip) {
+    return [];
+  }
+  return createSkill(equip.base.skill, equip.lv);
+};
+
+/**
+ * 初始化技能
+ * @param skillName 技能名称
+ * @returns
+ */
+export const createSkill = (skillName, lv): Skills.Skill[] => {
+  const skills: Skills.Skill[] = new Array();
+  if (!skillName) {
+    return skills;
+  }
+  const names: string[] = skillName.split(',');
+  names.forEach((name) => {
+    const clazz = Skills[name];
+    if (clazz) {
+      const skill: Skills.Skill = new clazz();
+      skill.lv = lv;
+      skills.push(skill);
+    }
+  });
+  return skills;
+};
diff --git a/src/tool/caller/equip.ts b/src/tool/caller/equip.ts
new file mode 100644
index 0000000..df746c1
--- /dev/null
+++ b/src/tool/caller/equip.ts
@@ -0,0 +1,94 @@
+import { strengthen_rates } from '@/config';
+
+/**
+ * 计算装备购买价格
+ * @param equip 装备
+ * @returns
+ */
+export const conisOfBuy = (equip) => {
+  if (!equip) {
+    return 0;
+  }
+  return Math.round(equip.lv * equip.quality.qualityCoefficient * (250 + 20 * equip.lv));
+};
+
+/**
+ * 计算装备出售价格
+ * @param equip 装备
+ * @returns
+ */
+export const conisOfsell = (equip) => {
+  if (!equip) {
+    return 0;
+  }
+  return Math.round(equip.lv * equip.quality.qualityCoefficient * 30);
+};
+
+/**
+ * 单次强化费用计算公式
+ * @param lv 装备等级
+ * @param strengthenLv 装备当前强化等级
+ * @returns
+ */
+export const strengthenCoins = (lv, strengthenLv) => {
+  return Math.round((lv + 1) * 1.1 ** (strengthenLv ** 1.1) * (10 + lv / 5) + 100);
+};
+
+/**
+ * 装备从0强化到目标等级所需费用期望值
+ * @param lv 装备等级
+ * @param strengthenLv 装备目标强化等级
+ * @returns
+ */
+export const strengthenAvgCoins = (lv, strengthenLv) => {
+  let sum = 0;
+  const len = strengthen_rates.length;
+  for (let i = 0; i < strengthenLv; i++) {
+    const rate = i < len ? strengthen_rates[i] : strengthen_rates[len - 1];
+    sum += strengthenCoins(lv, i) / rate + (sum * (1 - rate)) / rate;
+  }
+  return Math.round(sum);
+};
+
+/**
+ * 计算装备属性展示tips坐标
+ * @param e 触发展示的浏览器事件
+ * @param mobile 是否为移动端
+ * @returns
+ */
+export const callEuqipTipsLocation = (e, mobile) => {
+  const x = e.pageX,
+    y = e.pageY,
+    maxH = window.innerHeight,
+    maxW = window.innerWidth,
+    tipsStyle: any = {},
+    tipsStyle2: any = {};
+  if (mobile) {
+    tipsStyle.left = '0.3rem';
+    tipsStyle2.left = '13.9rem';
+    const num = 10;
+    if (y < maxH / 2) {
+      tipsStyle.top = y + num + 'px';
+      tipsStyle2.top = y + num + 'px';
+    } else {
+      tipsStyle.bottom = maxH - y - num + 'px';
+      tipsStyle2.bottom = maxH - y - num + 'px';
+    }
+  } else {
+    if (x < maxW / 2) {
+      tipsStyle.left = x + 'px';
+      tipsStyle2.left = 'calc(' + x + 'px + 21rem)';
+    } else {
+      tipsStyle.right = maxW - x + 'px';
+      tipsStyle.right2 = 'calc(' + tipsStyle.righ + ' - 21rem)';
+    }
+    if (y < maxH / 2) {
+      tipsStyle.top = y + 'px';
+      tipsStyle2.top = y + 'px';
+    } else {
+      tipsStyle.bottom = maxH - y + 'px';
+      tipsStyle2.bottom = maxH - y + 'px';
+    }
+  }
+  return [tipsStyle, tipsStyle2];
+};
diff --git a/src/tool/caller/index.ts b/src/tool/caller/index.ts
new file mode 100644
index 0000000..447e258
--- /dev/null
+++ b/src/tool/caller/index.ts
@@ -0,0 +1,12 @@
+import { Skills } from '@/config';
+
+export * from './attribute';
+export * from './equip';
+export * from './battle';
+
+export const deepCopy = (src) => {
+  if (!src) {
+    return null;
+  }
+  return JSON.parse(JSON.stringify(src));
+};
diff --git a/src/tool/formatter.ts b/src/tool/formatter.ts
index 744ca02..72dbf0a 100644
--- a/src/tool/formatter.ts
+++ b/src/tool/formatter.ts
@@ -4,3 +4,11 @@ export const formartNum = (num) => {
   }
   return num;
 };
+
+export const replace = (formatter: string, datas: Array<any>): string => {
+  for (let i = 0; i < datas.length; i++) {
+    const data = datas[i];
+    formatter = formatter.replace('${' + i + '}', data + '');
+  }
+  return formatter;
+};
diff --git a/src/tool/random.ts b/src/tool/random.ts
index c9a7abc..37584f5 100644
--- a/src/tool/random.ts
+++ b/src/tool/random.ts
@@ -1,10 +1,14 @@
-import { qualitys, createWeapon, createArmor, createNeck, createRing } from '@/config/equips';
+import { qualitys, createWeapon, createArmor, createNeck, createRing, createJewelry, createpants, createshoes, createbracers } from '@/config/equips';
 
 const creators = new Array();
 creators.push(createWeapon);
 creators.push(createArmor);
 creators.push(createNeck);
 creators.push(createRing);
+creators.push(createJewelry);
+creators.push(createpants);
+creators.push(createshoes);
+creators.push(createbracers);
 
 export const randonBootyEquip = (monster) => {
   const equips = new Array();
@@ -27,6 +31,7 @@ export const randomEquip = (rates, lv) => {
       break;
     }
   }
+//   quality = qualitys[4];
   if (quality) {
     if (quality == qualitys[4]) {
       lv += Math.floor(Math.random() * 6);
@@ -59,14 +64,14 @@ export const randomDungeonDifficulty = () => {
 };
 
 export const uuid = () => {
-    var s: any = [];
-    var hexDigits = "0123456789abcdef";
-    for (var i = 0; i < 36; i++) {
-        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-    }
-    s[14] = "4"; // 代表UUID版本
-    s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // 时钟序列
-    s[8] = s[13] = s[18] = s[23] = "-";
-    var uuid = s.join("");
-    return uuid;
-}
\ No newline at end of file
+  var s: any = [];
+  var hexDigits = '0123456789abcdef';
+  for (var i = 0; i < 36; i++) {
+    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+  }
+  s[14] = '4'; // 代表UUID版本
+  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // 时钟序列
+  s[8] = s[13] = s[18] = s[23] = '-';
+  var uuid = s.join('');
+  return uuid;
+};
diff --git a/src/views/backpack/inherited.vue b/src/views/backpack/inherited.vue
index fb147c5..04fb4c7 100644
--- a/src/views/backpack/inherited.vue
+++ b/src/views/backpack/inherited.vue
@@ -16,7 +16,7 @@
         </div>
         <div class="equip">
             <EquipIcon :equip="target" />
-            <div class='name' :style="{ color: target.quality.color }">
+            <div class='name' :class="target.quality.quality">
                 {{ t(target.type + '.' + target.base.name + '.0') }}
                 {{ '(+' + target.strengthenLv + ')' }}
                 <span>➡</span>
@@ -42,7 +42,7 @@
         </div>
         <div class="equip">
             <EquipIcon :equip="source" />
-            <div class='name' :style="{ color: source.quality.color }">
+            <div class='name' :class="source.quality.quality">
                 {{ t(source.type + '.' + source.base.name + '.0') }}
                 {{ '(+' + source.strengthenLv + ')' }}
                 <span>➡</span>
diff --git a/src/views/backpack/player.vue b/src/views/backpack/player.vue
index 3b66480..070411c 100644
--- a/src/views/backpack/player.vue
+++ b/src/views/backpack/player.vue
@@ -4,16 +4,16 @@
             <div class="label">
                 <div>{{ t('reborn.0') }}:</div>
                 <div> {{ t('lv') }}: </div>
+                <div> {{ t('coins.0') }}: </div>
                 <div v-for="attr in attrs" :key="attr">
                     {{ t(attr + '.0') }}:
                 </div>
-                <div> {{ t('coins.0') }}: </div>
             </div>
             <div class="value">
                 <div>{{ state.rebornPoints.count }}</div>
                 <div> {{ state.playerAttribute.lv }} </div>
-                <div v-for="attr in attrs" :key="attr">{{ attribute[attr] }}{{ attr_unitys[attr] }} </div>
                 <div> {{ coins }} </div>
+                <div v-for="attr in attrs" :key="attr">{{ attribute[attr] }}{{ attr_unitys[attr] }} </div>
             </div>
         </div>
         <div class="equips">
@@ -38,12 +38,12 @@ const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 const equips = computed(() => {
     return [
-        null,
-        null,
+        state.playerAttribute.shoes,
+        state.playerAttribute.pants,
+        state.playerAttribute.bracers,
         state.playerAttribute.armor,
-        null,
         state.playerAttribute.weapon,
-        null,
+        state.playerAttribute.jewelry,
         state.playerAttribute.ring,
         state.playerAttribute.neck,
     ]
@@ -52,7 +52,7 @@ const attribute = computed(() => {
     return state.playerAttribute.attribute;
 });
 
-const attrs = ['dps', 'atk', 'crit', 'critDmg', 'hp', 'def', 'bloc'];
+const attrs = ['dps', 'atk', 'crit', 'critDmg', 'dmgPercent', 'hp', 'def', 'bloc', 'dmgReduc', 'critAvoid', 'critDmgReduc', 'moveSpeed'];
 const coins = computed(() => {
     const coins = state.playerAttribute.coins;
     if (coins > 100000000) {
@@ -80,6 +80,7 @@ onMounted(() => { });
     height: 100%;
     float: left;
     font-size: 1.1rem;
+    overflow: auto;
 
     .label {
         float: left;
diff --git a/src/views/backpack/strengthen.vue b/src/views/backpack/strengthen.vue
index 3949c89..6e0822e 100644
--- a/src/views/backpack/strengthen.vue
+++ b/src/views/backpack/strengthen.vue
@@ -8,7 +8,7 @@
         </Tooltip>
         <div class="equip">
             <EquipIcon :equip="equip" />
-            <div class='name' :style="{ color: equip.quality.color }">
+            <div class='name' :class="equip.quality.quality">
                 {{ t(equip.type + '.' + equip.base.name + '.0') }}
                 {{ equip.strengthenLv ? '(+' + equip.strengthenLv + ')' : '' }}
             </div>
@@ -33,7 +33,7 @@
         <div class="btn-group" v-if='!auto'>
             <p>{{ t('stren.0') }}：<span :class="{ 'red': useCoins < needCoins }">{{ needCoins }}</span></p>
             <button class="button" @click="strengthen(false)">{{ t('stren.1') }}+{{ parseInt(equip.strengthenLv) + 1
-            }}</button>
+                }}</button>
         </div>
         <div class="btn-group" v-if='!auto'>
             <p>{{ t('stren.0') }}：<span :class="{ 'red': useCoins < needCoins }">{{ needCoins }}</span></p>
@@ -76,7 +76,7 @@ import { reactive, onMounted, ref, computed, watch } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip, EquipIcon } from "@/components"
 import { strengthenValue, strengthenCoins } from "@/tool"
-import { extra_entry_num, weaponExtraEntry, armorExtraEntry, neckExtraEntry, ringExtraEntry, strengthen_rates } from "@/config";
+import { extra_entry_num, weaponExtraEntry, armorExtraEntry, neckExtraEntry, ringExtraEntry, strengthen_rates, jewelryExtraEntry, pantsExtraEntry, shoesExtraEntry } from "@/config";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
@@ -155,6 +155,9 @@ const reforger = {
     armor: armorExtraEntry,
     neck: neckExtraEntry,
     ring: ringExtraEntry,
+    jewelry: jewelryExtraEntry,
+    pants: pantsExtraEntry,
+    shoes: shoesExtraEntry,
 }
 
 const reforge = () => {
@@ -303,7 +306,7 @@ onMounted(() => { });
         font-size: 1rem;
     }
 
-    .entry{
+    .entry {
         font-size: 1rem;
     }
 }
diff --git a/src/views/dungeon/battle.vue b/src/views/dungeon/battle.vue
index 7609502..c63ddc5 100644
--- a/src/views/dungeon/battle.vue
+++ b/src/views/dungeon/battle.vue
@@ -17,7 +17,7 @@ import { useStore } from "vuex";
 import { computed, nextTick, onMounted, ref } from "vue";
 import { useI18n } from "vue3-i18n";
 import { dungeon_icon, player_move_time, player_battle_time } from "@/config";
-import { randonBootyEquip, callBattleResult } from "@/tool";
+import { randonBootyEquip, createBattleRole, BattleRole, replace } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
@@ -94,7 +94,7 @@ const playerMove = (monsterIdx?, playerIdx?) => {
         exploreDungeon(monsterIdx);
     } else {
         idx2++;
-        const moveTime = Math.round(player_move_time * 100 / (100 + state.rebornAttribute.moveSpeed) / max);
+        const moveTime = Math.round(player_move_time * 100 / (100 + state.playerAttribute.attribute.moveSpeed) / max);
         battle.value.timeOut = setTimeout(() => {
             playerMove(monsterIdx, idx2);
         }, moveTime);
@@ -103,32 +103,71 @@ const playerMove = (monsterIdx?, playerIdx?) => {
 
 const battleWithMonster = (monster) => {
     return new Promise((resolve, reject) => {
-        const player = state.playerAttribute.attribute;
         const battleTime = Math.ceil(player_battle_time * 100 / (100 + state.rebornAttribute.battleSpeed))
-        const getMsg = (i18nName, takeDmg) => {
-            return t(i18nName).replace('${lv}', monster.lv).replace('${name}', t('difficulty.' + props.dungeon?.difficulty) + t(monster.type)).replace('${dmg}', takeDmg + '');
+        const getMsg = (i18nName, takeDmg, sneak) => {
+            return replace(t(i18nName), [monster.lv, t('difficulty.' + props.dungeon?.difficulty) + t(monster.type), takeDmg, sneak]);
         };
-        commit("set_sys_info", { msg: getMsg('battle', 0), type: 'battle' });
-        battle.value.timeOut = setTimeout(() => {
-            const result = callBattleResult(player, monster);
-            nextTick(() => {
-                commit('add_player_curhp', -1 * result.takeDmg);
-            })
-            if (result.win) {
-                commit("set_sys_info", { msg: getMsg('killMonster', result.takeDmg), type: 'battle', bouts: result.bouts });
-                //随机获取装备战利品
-                const equips = randonBootyEquip(monster);
-                commit('add_bootys', { equips: equips, coins: monster.coins });
-                resolve(true);
-            } else {
-                commit("set_sys_info", { msg: getMsg('beKilled', result.takeDmg), type: 'warning', bouts: result.bouts });
+        commit("set_sys_info", { msg: getMsg('battle', 0, 0), type: 'battle' });
+        const roles = createBattleRole(state.playerAttribute, monster, commit);
+        const player: BattleRole = roles.player;
+        const monster1: BattleRole = roles.monster;
+        player.onStartBattle(monster1);
+        monster1.onStartBattle(player);
+        oneBout(player, monster1, battleTime).then(rsp => {
+            if (player.isDeath()) {
+                commit("set_sys_info", { msg: t('bout.1'), type: 'warning' });
                 battle.value.battleShow = false;
                 dispatch('play_music', 'backgound');
+            } else {
+                commit("set_sys_info", { msg: t('bout.0'), type: 'win' });
+                //获取战利品
+                player.commit('add_bootys', player.getBootys(monster1));
+                resolve(true);
             }
-        }, battleTime);
+        })
+
+
+        // battle.value.timeOut = setTimeout(() => {
+        //     const result: BattleResult = callBattleResult(player, monster, commit);
+        //     nextTick(() => {
+        //         commit('add_player_curhp', -1 * result.takeDmg);
+        //     })
+        //     if (result.win) {
+        //         commit("set_sys_info", { msg: getMsg('killMonster', result.takeDmg, result.sneak), type: 'battle', bouts: result.bouts });
+        //         //获取战利品
+        //         commit('add_bootys', { equips: result.equips, coins: result.coins });
+        //         resolve(true);
+        //     } else {
+        //         commit("set_sys_info", { msg: getMsg('beKilled', result.takeDmg, result.sneak), type: 'warning', bouts: result.bouts });
+        //         battle.value.battleShow = false;
+        //         dispatch('play_music', 'backgound');
+        //     }
+        // }, battleTime);
     });
 }
 
+const oneBout = (player: BattleRole, monster: BattleRole, battleTime: number) => {
+    return new Promise((resolve, reject) => {
+        battle.value.timeOut = setTimeout(() => {
+            player.attack(monster);
+            if (player.isDeath() || monster.isDeath()) {
+                resolve(true);
+                return;
+            }
+            monster.attack(player);
+            if (player.isDeath() || monster.isDeath()) {
+                resolve(true);
+                return;
+            }
+            battle.value.timeOut = setTimeout(() => {
+                oneBout(player, monster, battleTime).then(rsp => {
+                    resolve(rsp)
+                })
+            }, battleTime);
+        }, battleTime);
+    })
+};
+
 onMounted(() => { });
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/illustrated/equips.vue b/src/views/illustrated/equips.vue
index 8db8cdd..1ea00b4 100644
--- a/src/views/illustrated/equips.vue
+++ b/src/views/illustrated/equips.vue
@@ -1,11 +1,11 @@
 <template>
-    <div class="title">{{ t('quality.' + quality) }}{{ t(type + '.type') }}
+    <div v-if="samples.length > 0" :class="['title', quality]">{{ t('quality.' + quality) }}{{ t(type + '.type') }}
     </div>
     <div class="equips">
-        <div class="equip" v-for="item in categorys" :key="item.name">
-            <EquipIcon :equip="getShowEquip(item)" />
-            <div class="name">{{ t(type + '.' + item.name + '.0') }}</div>
-            <div class="entry" v-for="e in item.entry">{{ t(e.type + '.0') }}</div>
+        <div class="equip" v-for="item in samples" :key="item.name">
+            <EquipIcon :equip="item" @mouseover="commit('show_equip_tip', { equip: item, compare: false, e: $event })"
+                @mouseleave="commit('close_equip_tip')" />
+            <div :class="['name', quality]">{{ t(item.type + '.' + item.base.name + '.0') }}</div>
         </div>
     </div>
 </template>
@@ -15,11 +15,9 @@ import { useStore } from "vuex";
 import { reactive, onMounted, ref } from "vue";
 import { useI18n } from "vue3-i18n";
 import { EquipIcon } from "@/components";
-import { quality_collor } from "@/config";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
-const color = ref('#FFF');
 
 const props = defineProps({
     type: {
@@ -30,29 +28,23 @@ const props = defineProps({
         type: String,
         default: ''
     },
-    categorys: {
+    samples: {
         type: Array as () => any[],
         default: [],
     },
 });
 
-const getShowEquip = (category) => {
-    const quality = props.quality;
-    const equip: any = new Object();
-    equip.quality = { quality: quality, color: quality_collor[quality] };
-    equip.base = { icon: category.icon };
-    return equip;
-}
 
 onMounted(() => {
-    color.value = quality_collor[props.quality];
+    props.samples.forEach(item => {
+        item.sample = true;
+    })
 });
 </script>
 <style lang="scss" scoped>
 .title {
     height: 2.5rem;
     font-size: 1.5rem;
-    color: v-bind('color');
 }
 
 .equips {
@@ -69,7 +61,6 @@ onMounted(() => {
 
         .name {
             padding-bottom: 0.5rem;
-            color: v-bind('color');
         }
     }
 }
diff --git a/src/views/illustrated/illustrated.vue b/src/views/illustrated/illustrated.vue
index f99f19d..e732b16 100644
--- a/src/views/illustrated/illustrated.vue
+++ b/src/views/illustrated/illustrated.vue
@@ -6,8 +6,9 @@
     <Drawer :title="t('illustrated.0')" v-model="showIllustrated">
         <Tabs :tabs="tabs">
             <tab v-for="item in tabs" :name="item.name">
-                <Equips :type="item.name" quality="unique" :categorys="uniques[item.name]" />
-                <Equips :type="item.name" quality="epic" :categorys="epics[item.name]" />
+                <Equips :type="item.name" quality="colorful" :samples="colorful[item.name]" />
+                <Equips :type="item.name" quality="unique" :samples="uniques[item.name]" />
+                <Equips :type="item.name" quality="epic" :samples="epics[item.name]" />
             </tab>
         </Tabs>
     </Drawer>
@@ -19,8 +20,7 @@ import { useStore } from "vuex";
 import { computed, onMounted, ref, onBeforeUnmount } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip, Drawer, Tabs, Tab } from "@/components";
-import { menu_icons, weaponCategorys, weaponUniqueCategorys, armorUniqueCategorys, armorCategorys } from "@/config";
-import { neckUniqueCategorys, neckCategorys, ringUniqueCategorys, ringCategorys } from "@/config";
+import { menu_icons, weaponSamples, armorSamples, jewelrySamples, neckSamples, ringSamples, pantsSamples, shoesSamples } from "@/config";
 import Equips from "./equips.vue";
 
 const { t } = useI18n();
@@ -28,24 +28,42 @@ const { state, commit, dispatch } = useStore();
 const showIllustrated = computed(() => {
     return state.curMenu == 'illustrated';
 });
+const colorful = {
+    weapon: weaponSamples.colorful,
+    armor: armorSamples.colorful,
+    neck: neckSamples.colorful,
+    ring: ringSamples.colorful,
+    jewelry: jewelrySamples.colorful,
+    pants: pantsSamples.colorful,
+    shoes: shoesSamples.colorful,
+}
 const uniques = {
-    weapon: weaponUniqueCategorys,
-    armor: armorUniqueCategorys,
-    neck: neckUniqueCategorys,
-    ring: ringUniqueCategorys
+    weapon: weaponSamples.unique,
+    armor: armorSamples.unique,
+    neck: neckSamples.unique,
+    ring: ringSamples.unique,
+    jewelry: jewelrySamples.unique,
+    pants: pantsSamples.unique,
+    shoes: shoesSamples.unique,
 }
 const epics = {
-    weapon: weaponCategorys,
-    armor: armorCategorys,
-    neck: neckCategorys,
-    ring: ringCategorys
+    weapon: weaponSamples.epic,
+    armor: armorSamples.epic,
+    neck: neckSamples.epic,
+    ring: ringSamples.epic,
+    jewelry: jewelrySamples.epic,
+    pants: pantsSamples.epic,
+    shoes: shoesSamples.epic,
 }
 
 const tabs = [
     { label: t('weapon.type'), name: 'weapon' },
     { label: t('armor.type'), name: 'armor' },
     { label: t('neck.type'), name: 'neck' },
-    { label: t('ring.type'), name: 'ring' }
+    { label: t('ring.type'), name: 'ring' },
+    { label: t('jewelry.type'), name: 'jewelry' },
+    { label: t('pants.type'), name: 'pants' },
+    { label: t('shoes.type'), name: 'shoes' },
 ]
 
 const showMenu = () => {
diff --git a/src/views/index.vue b/src/views/index.vue
index 604ba76..072c06e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -28,8 +28,7 @@ const playBackgound = () => {
     }
 }
 
-onMounted(() => {
-});
+onMounted(() => { });
 </script>
 <style lang="scss" scoped>
 * {
diff --git a/src/views/message/bouts.vue b/src/views/message/bouts.vue
index e2c5356..a302d62 100644
--- a/src/views/message/bouts.vue
+++ b/src/views/message/bouts.vue
@@ -1,12 +1,15 @@
 <template>
     <div class="bouts">
         <div v-for="bout, idx in bouts" class="bout">
-            <span class="seq">{{ t('bouts.1') + (idx + 1) }}:</span>
-            <span class="crit" v-if="bout.crit">{{ t('bouts.2') }},</span>
-            <span class="dmg">{{ t('bouts.3').replace('${dmg}', bout.dmg) }},</span>
-            <span class="take-dmg" v-if="bout.takeDmg">{{ t('bouts.4').replace('${dmg}', bout.takeDmg) }}</span>
+            <span class="seq">{{ t('bout.0') + (idx + 1) }}:</span>
+            <span class="dmg">{{ replace(t('bout.1'), [t('skill.' + bout.action + '.0')]) }},</span>
+            <span class="crit" v-if="bout.crit">{{ t('bout.2') }},</span>
+            <span class="dmg" v-if="bout.dmg > 0">{{ replace(t('bout.3'), [bout.dmg]) }},</span>
+            <span v-if="bout.sneak > 0" class="dmg">{{ replace(t('bout.8'), [bout.sneak]) }},</span>
+            <span class="take-dmg" v-if="bout.takeDmg">{{ replace(t('bout.4'), [bout.takeDmg]) }},</span>
+            <span class="dmg" v-if="bout.reflectedDmg">{{ replace(t('bout.9'), [bout.reflectedDmg]) }},</span>
             <span v-if="idx == bouts.length - 1">
-                {{ t('bouts.5') }}{{ bout.takeDmg ? t('bouts.7') : t('bouts.6') }}
+                {{ t('bout.5') }}{{ bout.takeDmg ? t('bout.7') : t('bout.6') }}.
             </span>
         </div>
     </div>
@@ -16,13 +19,14 @@
 import { useStore } from "vuex";
 import { reactive, onMounted, ref } from "vue";
 import { useI18n } from "vue3-i18n";
+import { Bout, replace } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 
 defineProps({
     bouts: {
-        type: Array as () => any[],
+        type: Array as () => Bout[],
         default: []
     }
 })
@@ -32,6 +36,7 @@ onMounted(() => { });
 <style lang="scss" scoped>
 .bout {
     text-align: left;
+
     .seq {
         font-size: 1.1rem;
     }
diff --git a/src/views/message/sys-info.vue b/src/views/message/sys-info.vue
index 77225dd..ee3ea23 100644
--- a/src/views/message/sys-info.vue
+++ b/src/views/message/sys-info.vue
@@ -4,9 +4,9 @@
             <span>{{ t('sys') }}</span>
             <i class="time" v-if="v.time">({{ v.time }})</i>：
             <span class="msg">{{ v.msg }}</span>
-            <a v-if="v.bouts" @click="bouts = v.bouts; showBouts = true;" class="bouts-link">{{ t('bouts.0') }}</a>
+            <a v-if="v.bouts" @click="bouts = v.bouts; showBouts = true;" class="bouts-link">{{ t('bouts') }}</a>
             <span v-if="v.equips" v-for="(o, p) in v.equips" :key="p">
-                <a :style="{ color: o.quality.color }" @mouseleave="commit('close_equip_tip')"
+                <a :class="o.quality.quality" @mouseleave="commit('close_equip_tip')"
                     @mouseover="commit('show_equip_tip', { equip: o, compare: true, e: $event })">
                     <span v-if="o.quality.quality == qualitys[4]">{{ t('uniqueBooty') }}：</span>
                     {{ t(o.type + '.' + o.base.name + '.0') }}
@@ -93,10 +93,11 @@ a {
 }
 
 @media only screen and (max-width: 768px) {
-    .sysInfo{
+    .sysInfo {
         font-size: 0.8rem;
     }
-    .time{
+
+    .time {
         font-size: 0.6rem;
     }
 
diff --git a/src/views/reborn/reborn.vue b/src/views/reborn/reborn.vue
index df670e7..3fbd435 100644
--- a/src/views/reborn/reborn.vue
+++ b/src/views/reborn/reborn.vue
@@ -26,7 +26,7 @@
                     <p>
                         <img :src="attr_icon_urls[attr]">
                         <span>
-                            {{ t(attr + '.0') }}：+{{ rebornAttribute[attr].toFixed(2) }}
+                            {{ t(attr + '.0') }}：+{{ rebornAttribute[attr] }}
                             {{ attr_unitys[attr] }}
                         </span>
                     </p>
@@ -227,7 +227,7 @@ onBeforeUnmount(() => {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 0.7rem;
+    padding: 0.3rem 0.7rem;
 
     p {
         display: flex;
@@ -289,7 +289,7 @@ onBeforeUnmount(() => {
     }
 
     .attribute {
-        padding: 0.5rem 0rem;
+        padding: 0.2rem 0rem;
 
         p {
 
diff --git a/src/views/shop/shop.vue b/src/views/shop/shop.vue
index 5dbc9ea..a1211dd 100644
--- a/src/views/shop/shop.vue
+++ b/src/views/shop/shop.vue
@@ -117,7 +117,7 @@ const refreshForFree = (e) => {
     if (confirmFlag.value) {
         if (e && checkConfirm()) {
             confirm.value.open(0, e);
-            confirmRefresh = refreshByCoins;
+            confirmRefresh = refreshForFree;
             return;
         }
     }
diff --git a/src/views/user-item/equips.vue b/src/views/user-item/equips.vue
index bc57d47..725ddd3 100644
--- a/src/views/user-item/equips.vue
+++ b/src/views/user-item/equips.vue
@@ -2,7 +2,7 @@
     <div class="title" v-for="equip, idx in equips" @mouseover="commit('show_equip_tip', { equip: equip, e: $event })"
         @mouseleave="commit('close_equip_tip')">
         <EquipIcon :equip="equip" @dblclick="equip && commit('takeOffEquip', equip.type)" />
-        <div class='name' :style="{ color: equip?.quality.color }">
+        <div class='name' :class="equip?.quality.quality">
             {{ euqipName(idx) }}
         </div>
     </div>