diff --git a/package.json b/package.json
index 13af129..fd17789 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "core-js": "^3.8.3",
+    "crypto-js": "^4.2.0",
     "js-base64": "^3.7.7",
     "vue": "^3.2.13",
     "vue-class-component": "^8.0.0-0",
diff --git a/public/img/attribute/critAvoid.png b/public/img/attribute/critAvoid.png
new file mode 100644
index 0000000..3f743eb
Binary files /dev/null and b/public/img/attribute/critAvoid.png differ
diff --git a/public/img/attribute/critDmgReduc.png b/public/img/attribute/critDmgReduc.png
new file mode 100644
index 0000000..319f1f6
Binary files /dev/null and b/public/img/attribute/critDmgReduc.png differ
diff --git a/public/img/attribute/dmgReduc.png b/public/img/attribute/dmgReduc.png
new file mode 100644
index 0000000..c8085a0
Binary files /dev/null and b/public/img/attribute/dmgReduc.png differ
diff --git a/public/img/attribute/破甲.png b/public/img/attribute/破甲.png
new file mode 100644
index 0000000..2db8c81
Binary files /dev/null and b/public/img/attribute/破甲.png differ
diff --git a/public/img/attribute/防御降低.png b/public/img/attribute/防御降低.png
new file mode 100644
index 0000000..b71ba19
Binary files /dev/null and b/public/img/attribute/防御降低.png differ
diff --git a/public/img/chuanqi.gif b/public/img/chuanqi.gif
new file mode 100644
index 0000000..5cb71ee
Binary files /dev/null and b/public/img/chuanqi.gif differ
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/armor/东方.png b/public/img/equips/armor/东方.png
new file mode 100644
index 0000000..dd34762
Binary files /dev/null and b/public/img/equips/armor/东方.png differ
diff --git a/public/img/equips/armor/五行压贴.png b/public/img/equips/armor/五行压贴.png
new file mode 100644
index 0000000..567eff2
Binary files /dev/null and b/public/img/equips/armor/五行压贴.png differ
diff --git a/public/img/equips/armor/吞鬼甲.png b/public/img/equips/armor/吞鬼甲.png
new file mode 100644
index 0000000..bd1ffca
Binary files /dev/null and b/public/img/equips/armor/吞鬼甲.png differ
diff --git a/public/img/equips/armor/天成.png b/public/img/equips/armor/天成.png
new file mode 100644
index 0000000..be4cd01
Binary files /dev/null and b/public/img/equips/armor/天成.png differ
diff --git a/public/img/equips/armor/斗融之甲.png b/public/img/equips/armor/斗融之甲.png
new file mode 100644
index 0000000..a38dcae
Binary files /dev/null and b/public/img/equips/armor/斗融之甲.png differ
diff --git a/public/img/equips/armor/炎狱.png b/public/img/equips/armor/炎狱.png
new file mode 100644
index 0000000..ff0e5b3
Binary files /dev/null and b/public/img/equips/armor/炎狱.png differ
diff --git a/public/img/equips/armor/狐不归.png b/public/img/equips/armor/狐不归.png
new file mode 100644
index 0000000..ece5d3c
Binary files /dev/null and b/public/img/equips/armor/狐不归.png differ
diff --git a/public/img/equips/armor/百花内甲.png b/public/img/equips/armor/百花内甲.png
new file mode 100644
index 0000000..a5b39fc
Binary files /dev/null and b/public/img/equips/armor/百花内甲.png differ
diff --git a/public/img/equips/armor/美人鼓.png b/public/img/equips/armor/美人鼓.png
new file mode 100644
index 0000000..6969aed
Binary files /dev/null and b/public/img/equips/armor/美人鼓.png differ
diff --git a/public/img/equips/armor/蝙蝠氅.png b/public/img/equips/armor/蝙蝠氅.png
new file mode 100644
index 0000000..169054f
Binary files /dev/null and b/public/img/equips/armor/蝙蝠氅.png differ
diff --git a/public/img/equips/armor/鬼蜮焚天.png b/public/img/equips/armor/鬼蜮焚天.png
new file mode 100644
index 0000000..40e6596
Binary files /dev/null and b/public/img/equips/armor/鬼蜮焚天.png differ
diff --git a/public/img/equips/armor/鬼门甲.png b/public/img/equips/armor/鬼门甲.png
new file mode 100644
index 0000000..f15430f
Binary files /dev/null and b/public/img/equips/armor/鬼门甲.png differ
diff --git a/public/img/equips/armor/鱼腹.png b/public/img/equips/armor/鱼腹.png
new file mode 100644
index 0000000..b6f51a4
Binary files /dev/null and b/public/img/equips/armor/鱼腹.png differ
diff --git a/public/img/equips/armor/黑犀.png b/public/img/equips/armor/黑犀.png
new file mode 100644
index 0000000..cd4ebd0
Binary files /dev/null and b/public/img/equips/armor/黑犀.png differ
diff --git a/public/img/equips/armor/龟纹铠.png b/public/img/equips/armor/龟纹铠.png
new file mode 100644
index 0000000..2657e29
Binary files /dev/null and b/public/img/equips/armor/龟纹铠.png 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..dcbe2fd
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..1ab7bf9
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/neck/众生醉.png b/public/img/equips/neck/众生醉.png
new file mode 100644
index 0000000..06fc2ce
Binary files /dev/null and b/public/img/equips/neck/众生醉.png differ
diff --git a/public/img/equips/neck/佛灯油.png b/public/img/equips/neck/佛灯油.png
new file mode 100644
index 0000000..15c4fd2
Binary files /dev/null and b/public/img/equips/neck/佛灯油.png differ
diff --git a/public/img/equips/neck/冷龙.png b/public/img/equips/neck/冷龙.png
new file mode 100644
index 0000000..c520b2f
Binary files /dev/null and b/public/img/equips/neck/冷龙.png differ
diff --git a/public/img/equips/neck/十八念佛珠.png b/public/img/equips/neck/十八念佛珠.png
new file mode 100644
index 0000000..2dfd89f
Binary files /dev/null and b/public/img/equips/neck/十八念佛珠.png differ
diff --git a/public/img/equips/neck/太乙神器 五行圭.png b/public/img/equips/neck/太乙神器 五行圭.png
new file mode 100644
index 0000000..0787824
Binary files /dev/null and b/public/img/equips/neck/太乙神器 五行圭.png differ
diff --git a/public/img/equips/neck/女王蜂链.png b/public/img/equips/neck/女王蜂链.png
new file mode 100644
index 0000000..6675061
Binary files /dev/null and b/public/img/equips/neck/女王蜂链.png differ
diff --git a/public/img/equips/neck/姜氏哀歌.png b/public/img/equips/neck/姜氏哀歌.png
new file mode 100644
index 0000000..508426e
Binary files /dev/null and b/public/img/equips/neck/姜氏哀歌.png differ
diff --git a/public/img/equips/neck/断·极.png b/public/img/equips/neck/断·极.png
new file mode 100644
index 0000000..5abe63d
Binary files /dev/null and b/public/img/equips/neck/断·极.png differ
diff --git a/public/img/equips/neck/最初的彼岸花.png b/public/img/equips/neck/最初的彼岸花.png
new file mode 100644
index 0000000..b85fee9
Binary files /dev/null and b/public/img/equips/neck/最初的彼岸花.png differ
diff --git a/public/img/equips/neck/狸猫内丹.png b/public/img/equips/neck/狸猫内丹.png
new file mode 100644
index 0000000..9c0247a
Binary files /dev/null and b/public/img/equips/neck/狸猫内丹.png differ
diff --git a/public/img/equips/neck/琉璃碎片.png b/public/img/equips/neck/琉璃碎片.png
new file mode 100644
index 0000000..2391b8a
Binary files /dev/null and b/public/img/equips/neck/琉璃碎片.png differ
diff --git a/public/img/equips/neck/百八烦恼珠.png b/public/img/equips/neck/百八烦恼珠.png
new file mode 100644
index 0000000..ccca332
Binary files /dev/null and b/public/img/equips/neck/百八烦恼珠.png differ
diff --git a/public/img/equips/neck/虎视.png b/public/img/equips/neck/虎视.png
new file mode 100644
index 0000000..5c2f084
Binary files /dev/null and b/public/img/equips/neck/虎视.png differ
diff --git a/public/img/equips/neck/血怒.png b/public/img/equips/neck/血怒.png
new file mode 100644
index 0000000..f636485
Binary files /dev/null and b/public/img/equips/neck/血怒.png differ
diff --git a/public/img/equips/neck/诛仙.png b/public/img/equips/neck/诛仙.png
new file mode 100644
index 0000000..22b7993
Binary files /dev/null and b/public/img/equips/neck/诛仙.png differ
diff --git a/public/img/equips/neck/赤瞳金玉坠.png b/public/img/equips/neck/赤瞳金玉坠.png
new file mode 100644
index 0000000..a06057d
Binary files /dev/null and b/public/img/equips/neck/赤瞳金玉坠.png differ
diff --git a/public/img/equips/neck/鬼眼.png b/public/img/equips/neck/鬼眼.png
new file mode 100644
index 0000000..f0f87fd
Binary files /dev/null and b/public/img/equips/neck/鬼眼.png differ
diff --git a/public/img/equips/neck/龙腾护心镜.png b/public/img/equips/neck/龙腾护心镜.png
new file mode 100644
index 0000000..be25379
Binary files /dev/null and b/public/img/equips/neck/龙腾护心镜.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..2212a83
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..36efc61
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..5490f88
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/ring/冰心.png b/public/img/equips/ring/冰心.png
new file mode 100644
index 0000000..3a9c855
Binary files /dev/null and b/public/img/equips/ring/冰心.png differ
diff --git a/public/img/equips/ring/冰粼暮光.png b/public/img/equips/ring/冰粼暮光.png
new file mode 100644
index 0000000..a9ccf99
Binary files /dev/null and b/public/img/equips/ring/冰粼暮光.png differ
diff --git a/public/img/equips/ring/刺客.png b/public/img/equips/ring/刺客.png
new file mode 100644
index 0000000..536c6eb
Binary files /dev/null and b/public/img/equips/ring/刺客.png differ
diff --git a/public/img/equips/ring/四眼.png b/public/img/equips/ring/四眼.png
new file mode 100644
index 0000000..d0f7d82
Binary files /dev/null and b/public/img/equips/ring/四眼.png differ
diff --git a/public/img/equips/ring/垂涎.png b/public/img/equips/ring/垂涎.png
new file mode 100644
index 0000000..2733a9e
Binary files /dev/null and b/public/img/equips/ring/垂涎.png differ
diff --git a/public/img/equips/ring/太阳真火戒.png b/public/img/equips/ring/太阳真火戒.png
new file mode 100644
index 0000000..7a57459
Binary files /dev/null and b/public/img/equips/ring/太阳真火戒.png differ
diff --git a/public/img/equips/ring/太阴紫电戒.png b/public/img/equips/ring/太阴紫电戒.png
new file mode 100644
index 0000000..918ab71
Binary files /dev/null and b/public/img/equips/ring/太阴紫电戒.png differ
diff --git a/public/img/equips/ring/妖族之力.png b/public/img/equips/ring/妖族之力.png
new file mode 100644
index 0000000..a193c35
Binary files /dev/null and b/public/img/equips/ring/妖族之力.png differ
diff --git a/public/img/equips/ring/愣伽指环.png b/public/img/equips/ring/愣伽指环.png
new file mode 100644
index 0000000..bccf618
Binary files /dev/null and b/public/img/equips/ring/愣伽指环.png differ
diff --git a/public/img/equips/ring/无名戒.png b/public/img/equips/ring/无名戒.png
new file mode 100644
index 0000000..574ea49
Binary files /dev/null and b/public/img/equips/ring/无名戒.png differ
diff --git a/public/img/equips/ring/旱魃.png b/public/img/equips/ring/旱魃.png
new file mode 100644
index 0000000..2118f18
Binary files /dev/null and b/public/img/equips/ring/旱魃.png differ
diff --git a/public/img/equips/ring/望月.png b/public/img/equips/ring/望月.png
new file mode 100644
index 0000000..9baf77a
Binary files /dev/null and b/public/img/equips/ring/望月.png differ
diff --git a/public/img/equips/ring/满堂红.png b/public/img/equips/ring/满堂红.png
new file mode 100644
index 0000000..dad9440
Binary files /dev/null and b/public/img/equips/ring/满堂红.png differ
diff --git a/public/img/equips/ring/破戒.png b/public/img/equips/ring/破戒.png
new file mode 100644
index 0000000..3c2219d
Binary files /dev/null and b/public/img/equips/ring/破戒.png differ
diff --git a/public/img/equips/ring/移山.png b/public/img/equips/ring/移山.png
new file mode 100644
index 0000000..0a5086d
Binary files /dev/null and b/public/img/equips/ring/移山.png differ
diff --git a/public/img/equips/ring/金刚琢.png b/public/img/equips/ring/金刚琢.png
new file mode 100644
index 0000000..bd20acd
Binary files /dev/null and b/public/img/equips/ring/金刚琢.png differ
diff --git a/public/img/equips/ring/金戒指.png b/public/img/equips/ring/金戒指.png
new file mode 100644
index 0000000..cdbcf36
Binary files /dev/null and b/public/img/equips/ring/金戒指.png differ
diff --git a/public/img/equips/ring/镇鬼.png b/public/img/equips/ring/镇鬼.png
new file mode 100644
index 0000000..4a7f8e3
Binary files /dev/null and b/public/img/equips/ring/镇鬼.png differ
diff --git a/public/img/equips/ring/陆吾之目.png b/public/img/equips/ring/陆吾之目.png
new file mode 100644
index 0000000..6d7d9b4
Binary files /dev/null and b/public/img/equips/ring/陆吾之目.png differ
diff --git a/public/img/equips/ring/鬼缠.png b/public/img/equips/ring/鬼缠.png
new file mode 100644
index 0000000..920ff85
Binary files /dev/null and b/public/img/equips/ring/鬼缠.png differ
diff --git a/public/img/equips/ring/鬼骨戒.png b/public/img/equips/ring/鬼骨戒.png
new file mode 100644
index 0000000..c76535a
Binary files /dev/null and b/public/img/equips/ring/鬼骨戒.png differ
diff --git a/public/img/equips/ring/黄泉之尘.png b/public/img/equips/ring/黄泉之尘.png
new file mode 100644
index 0000000..9e1ef1f
Binary files /dev/null and b/public/img/equips/ring/黄泉之尘.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/踏浪.png b/public/img/equips/shoes/踏浪.png
new file mode 100644
index 0000000..824cd16
Binary files /dev/null and b/public/img/equips/shoes/踏浪.png 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..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..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..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..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/public/img/map/boos_close.png b/public/img/map/boos_close.png
new file mode 100644
index 0000000..4960e0b
Binary files /dev/null and b/public/img/map/boos_close.png differ
diff --git a/public/img/map/boss_lava.png b/public/img/map/boss_lava.png
new file mode 100644
index 0000000..fb1e82f
Binary files /dev/null and b/public/img/map/boss_lava.png differ
diff --git a/public/img/map/boss_warrior.png b/public/img/map/boss_warrior.png
new file mode 100644
index 0000000..c55a02c
Binary files /dev/null and b/public/img/map/boss_warrior.png differ
diff --git a/public/img/map/dami.png b/public/img/map/dami.png
new file mode 100644
index 0000000..6c5e30c
Binary files /dev/null and b/public/img/map/dami.png differ
diff --git a/public/img/map/map.png b/public/img/map/map.png
new file mode 100644
index 0000000..6917b43
Binary files /dev/null and b/public/img/map/map.png differ
diff --git a/public/img/map/xiaomi.png b/public/img/map/xiaomi.png
new file mode 100644
index 0000000..04a93a5
Binary files /dev/null and b/public/img/map/xiaomi.png differ
diff --git a/public/img/taigu.gif b/public/img/taigu.gif
new file mode 100644
index 0000000..a06107c
Binary files /dev/null and b/public/img/taigu.gif differ
diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss
index f2f11ab..acf3631 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 !important;
+}
+.ordinary {
+  color: #fff !important;
+}
+.artifact {
+  color: #ff00ff !important;
+}
+.epic {
+  color: #f78918 !important;
+}
 .unique {
-  background: linear-gradient(125deg, #c90e0d36, #5656d647, 40%, #867d1033, #2c846f4d) !important;
+  color: #ff0000 !important;
+}
+.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%
+  ) !important;
+  -webkit-background-clip: text !important;
+  color: transparent !important;
 }
 
 .fade-enter-active,
diff --git a/src/assets/js/api.js b/src/assets/js/api.js
deleted file mode 100644
index 9a384d8..0000000
--- a/src/assets/js/api.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * axios封装
- * 请求拦截、响应拦截、错误统一处理
- */
-import axios from 'axios';
-import router from '../../router';
-import vue from '../../main'
-
-export async function getAxiosInstance() {
-  var baseURL, instance
-
-  baseURL = 'http://couy.xyz:3001/';
-
-  /** 
-   * 请求失败后的错误统一处理 
-   * @param {Number} status 请求失败的状态码
-   */
-  const errorHandle = (status, response) => {
-    // 状态码判断
-    switch (status) {
-      // 401: 未登录状态，跳转登录页
-      case 401:
-        vue.$store.commit("set_sys_info", {
-          msg: `
-          😭${response.data.msg|| '服务器有点问题，请稍后重试'}
-          `,
-          type: 'warning'
-        });
-        break;
-      case 403:
-        vue.$store.commit("set_sys_info", {
-          msg: `
-          😭${response.data.msg|| '服务器有点问题，请稍后重试'}
-          `,
-          type: 'warning'
-        });
-        break;
-      case 404:
-        vue.$store.commit("set_sys_info", {
-          msg: `
-          😭${response.data.msg|| '服务器有点问题，请稍后重试'}
-          `,
-          type: 'warning'
-        });
-        break;
-      default:
-        vue.$store.commit("set_sys_info", {
-          msg: `
-          😭${response.data.msg|| '服务器有点问题，请稍后重试'}
-          `,
-          type: 'warning'
-        });
-    }
-  }
-
-  // 创建axios实例 
-  instance = axios.create({
-    timeout: 1000 * 12 // 设置十二秒钟的请求超时限制
-    // transformRequest: data => qs.stringify(data)
-  });
-  if (process.env.NODE_ENV == 'development') {
-    //开发环境
-    instance.defaults.baseURL = baseURL;
-  } else if (process.env.NODE_ENV == 'debug') {
-    //debug
-    instance.defaults.baseURL = baseURL;
-  } else if (process.env.NODE_ENV == 'production') {
-    //生产环境
-    instance.defaults.baseURL = baseURL;
-  }
-  // 设置post请求头
-  instance.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8';
-
-  // 响应拦截器
-  instance.interceptors.response.use(
-    // 请求成功
-    res => res.status === 200 ? Promise.resolve(res) : Promise.reject(res),
-    // 请求失败
-    error => {
-      const {
-        response
-      } = error;
-      if (response) {
-        // 请求已发出，但是不在2xx的范围 
-        errorHandle(response.status, response);
-
-        return Promise.reject(response);
-      } else {
-        vue.$store.commit("set_sys_info", {
-          msg: `
-          😭${response.data.msg|| '服务器有点问题，请稍后重试'}
-          `,
-          type: 'warning'
-        });
-      }
-    });
-
-  return instance
-}
\ No newline at end of file
diff --git a/src/assets/js/assist.js b/src/assets/js/assist.js
deleted file mode 100644
index 3cef095..0000000
--- a/src/assets/js/assist.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * vue组件通信
- * @author couy
- * @param context 当前上下文环境（一般传this）
- * @param componentName  需要查找的组件的组件名（特别注意需要该组件定义了name属性）
- */
-
-export const assist = {
-  methods: {
-    // 由一个组件，向上找到最近的指定组件
-    findComponentUpward(context, componentName) {
-      let parent = context.$parent;
-      let name = parent.$options.name;
-
-      while (parent && (!name || [componentName].indexOf(name) < 0)) {
-        parent = parent.$parent;
-        if (parent) name = parent.$options.name;
-      }
-      return parent;
-    },
-    // 由一个组件，向上找到所有的指定组件
-    findComponentsUpward(context, componentName) {
-      let parents = [];
-      const parent = context.$parent;
-
-      if (parent) {
-        if (parent.$options.name === componentName) parents.push(parent);
-        return parents.concat(this.findComponentsUpward(parent, componentName));
-      } else {
-        return [];
-      }
-    },
-    // 由一个组件，向下找到最近的指定组件
-    findComponentDownward(context, componentName) {
-      const childrens = context.$children;
-      let children = null;
-
-      if (childrens.length) {
-        for (const child of childrens) {
-          const name = child.$options.name;
-
-          if (name === componentName) {
-            children = child;
-            break;
-          } else {
-            children = this.findComponentDownward(child, componentName);
-            if (children) break;
-          }
-        }
-      }
-      return children;
-    },
-    // 由一个组件，向下找到所有指定的组件
-    findComponentsDownward(context, componentName) {
-      return context.$children.reduce((components, child) => {
-        if (child.$options.name === componentName) components.push(child);
-        const foundChilds = this.findComponentsDownward(child, componentName);
-        return components.concat(foundChilds);
-      }, []);
-    },
-
-
-    // 由一个组件，找到指定组件的兄弟组件
-    findBrothersComponents(context, componentName, exceptMe = true) {
-      let res = context.$parent.$children.filter(item => {
-        return item.$options.name === componentName;
-      });
-      let index = res.findIndex(item => item._uid === context._uid);
-      if (exceptMe) res.splice(index, 1);
-      return res;
-    }
-  }
-};
\ No newline at end of file
diff --git a/src/components/equip-icon.vue b/src/components/equip-icon.vue
index 7f46c49..2f9bf38 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,29 @@
 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, taigu_gif } from "@/config";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 
+const src = computed(() => {
+    if (!prop.equip) {
+        return false;
+    }
+    const quality = prop.equip.quality;
+    if (quality.extraQuality) {
+        return taigu_gif;
+    }
+    switch (quality.quality) {
+        case qualitys[4]:
+            return red_gif;
+        case qualitys[5]:
+            return colorful_gif;
+        default:
+            return null;
+    }
+})
+
 const prop = defineProps({
     equip: {
         type: Object,
@@ -24,14 +42,6 @@ const prop = defineProps({
     }
 })
 
-const isUnique = (equip) => {
-    if (!equip) {
-        return false;
-    }
-    const quality = equip.quality.quality;
-    return quality && quality == qualitys[4];
-}
-
 const iconClass = computed(() => {
     if (prop.equip && prop.equip.isUnique()) {
         return
@@ -42,6 +52,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 +77,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 +103,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..7e01745 100644
--- a/src/components/equip.vue
+++ b/src/components/equip.vue
@@ -1,14 +1,17 @@
 <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('extraQuality.' + equip.quality.extraQuality) }}
+                {{ t('quality.' + equip.quality.quality) }}
+            </div>
             <div>{{ t(equip.type + '.type') }}</div>
         </div>
         <div class='lv'>
@@ -19,15 +22,27 @@
                 <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">
                 <div>{{ t(v.type + '.0') }} : {{ v.showVal }}</div>
             </div>
+            <div v-if="equip.reRoll != null">
+                <span>{{ t('reRoll.0') }}{{ equip.reRoll * 100 }}%</span>
+                <div class="des">{{ t('reRoll.1') }}</div>
+            </div>
         </div>
         <div class="des">
             <div>
@@ -39,14 +54,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 +80,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 +152,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..a88b327 100644
--- a/src/config/assets.ts
+++ b/src/config/assets.ts
@@ -30,6 +30,8 @@ export const attr_icon_urls = {
   def: root + '/img/attribute/icon_11.png',
   eva: root + '/img/attribute/S_EVA.png',
   bloc: root + '/img/attribute/S_BLOC.png',
+  critAvoid: root + '/img/attribute/critAvoid.png',
+  critDmgReduc: root + '/img/attribute/critDmgReduc.png',
   recoverSpeed: root + '/img/attribute/recover.png',
   moveSpeed: root + '/img/attribute/S_EVA.png',
   battleSpeed: root + '/img/attribute/S_EVA.png',
@@ -42,17 +44,21 @@ 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 taigu_gif = root + '/img/taigu.gif';
 
 export const warning_icon = root + '/img/tip/warning.png';
 
 export const dungeon_icon = {
-  map: root + '/img/map/map.jpg',
+  map: root + '/img/map/map.png',
   player: root + '/img/map/player-s.png',
   monster: root + '/img/map/monster.png',
   boss: root + '/img/map/boss.png',
-  0: root + '/img/map/d1.png',
-  1: root + '/img/map/d1.png',
-  2: root + '/img/map/d2.png',
-  3: root + '/img/map/d3.png',
+  normal: root + '/img/map/d1.png',
+  hard: root + '/img/map/d2.png',
+  pain: root + '/img/map/d3.png',
+  xiaomi: root + '/img/map/xiaomi.png',
+  dami: root + '/img/map/dami.png',
+  6: root + '/img/map/boss_warrior.png',
 };
diff --git a/src/config/base.ts b/src/config/base.ts
index d7b5e0f..8f88508 100644
--- a/src/config/base.ts
+++ b/src/config/base.ts
@@ -1,16 +1,16 @@
 export const backpack_num = 32;
-export const reborn_arrts = ['hp', 'atk', 'crit', 'critDmg', 'def', 'bloc', 'recoverSpeed', 'moveSpeed', 'battleSpeed'];
-export const reborn_point_coefficients = {
+export const piont_arrts = ['hp', 'atk', 'crit', 'critDmg', 'def', 'bloc', 'critAvoid', 'critDmgReduc', 'moveSpeed', 'battleSpeed'];
+export const point_coefficients = {
   hp: 10,
   atk: 3,
   crit: 0.1,
   critDmg: 1,
   def: 2,
   bloc: 2,
-  recoverSpeed: 4,
-  moveSpeed: 4,
+  critAvoid: 0.1,
+  critDmgReduc: 1,
+  moveSpeed: 3,
   battleSpeed: 4,
 };
 export const player_move_time = 3000;
-export const player_battle_time = 4000;
-export const archive_name = 'transmigration_game_archive';
+export const player_battle_time = 1000;
diff --git a/src/config/beings.ts b/src/config/beings.ts
new file mode 100644
index 0000000..08888e4
--- /dev/null
+++ b/src/config/beings.ts
@@ -0,0 +1,183 @@
+import {
+  initialWeapon,
+  initialArmor,
+  initialNeck,
+  initialRing,
+  initialJewelry,
+  initialpants,
+  initialshoes,
+  initialbracers,
+  Equip,
+  piont_arrts,
+} from '@/config';
+export const type_monster = 'monster';
+export const type_boss = 'boss';
+export const difficultys = ['normal', 'hard', 'pain', 'xiaomi', 'dami'];
+export const show_lv_df = ['normal', 'hard', 'pain'];
+const base_attr_factor = { normal: 1, hard: 1.15, pain: 1.4, xiaomi: 2, dami: 3 };
+const extra_factor = { normal: 0, hard: 0, pain: 0, xiaomi: 1, dami: 2 };
+const rate_factor = { normal: 1, hard: 2, pain: 3, xiaomi: 4, dami: 5 };
+
+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(base?: Attribute) {
+    if (base) {
+      piont_arrts.forEach((attr) => {
+        if (this[attr] != undefined) {
+          this[attr] += base[attr];
+        }
+      });
+    }
+  }
+}
+
+export class Player {
+  lv: number = 1;
+  layer: 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 BaseAttribute extends Attribute {
+  curHp: number = 0;
+  hp: number = 0;
+  critDmg: number = 0;
+  battleSpeed: number = 0;
+}
+
+export class Points extends BaseAttribute {
+  total: number = 0;
+  has: number = 0;
+}
+
+export class Monster extends Attribute {
+  difficulty: string;
+  type: string = type_monster;
+  equipRates: number[];
+  extraRate: number[];
+  df: number;
+  ef: number;
+  lf: number;
+
+  constructor(lv, difficulty: string, layer: number) {
+    super();
+    this.lv = lv;
+    this.difficulty = difficulty;
+    this.df = base_attr_factor[this.difficulty];
+    this.ef = extra_factor[difficulty];
+    this.lf = ((this.lv + layer - 1) / this.lv) ** 2;
+    this.callAtk(2.5);
+    this.callHp(17);
+    this.callCoins(11);
+    this.callCrit(0.5);
+    this.callDef();
+    this.equipRates = [0.2 * this.df, 0.08 * this.df, 0.03 * this.df];
+    this.extraRate = [0, 0];
+  }
+  callAtk = (variable) => {
+    this.baseAtk = Math.ceil(this.lv ** 2.1 * (Math.random() * 0.2 + variable) * this.df * this.lf);
+    this.atk = this.baseAtk;
+  };
+  callHp = (variable) => {
+    this.hp = Math.ceil(this.lv ** 2.1 * (Math.random() * 3 + variable) * this.df * this.lf);
+  };
+  callCoins = (variable) => {
+    this.coins = Math.ceil(this.lv ** 1.16 * (Math.random() * 5 + variable) * this.df * this.lf ** 0.5);
+  };
+  callDef = () => {
+    this.def = Math.ceil(100 + 100 * (this.ef - 1) * this.lf);
+  };
+  callCrit = (factor) => {
+    this.crit = Math.ceil((15 + 10 * (this.ef - 1) * this.lf) * factor);
+    this.critDmg = Math.ceil(150 + 50 * this.ef * this.lf);
+    this.critAvoid = Math.ceil((10 + 10 * (this.ef - 1) * this.lf) * factor);
+    this.critDmgReduc = Math.ceil(100 + 100 * (this.ef - 1) * this.lf);
+  };
+}
+
+export class BossMonster extends Monster {
+  type: string = type_boss;
+  constructor(lv, difficulty, layer: number) {
+    super(lv, difficulty, layer);
+    this.callAtk(3.5);
+    this.callHp(31);
+    this.callCoins(30.5);
+    this.callCrit(1);
+    const rf = rate_factor[difficulty];
+    this.equipRates = [0.25 - 0.05 * rf, 0.55 - 0.1 * rf, 0.15 + 0.1 * rf, 0.05 + 0.05 * rf];
+    let uniqueRate = 0.02 * ((rf - 1) * 5 + 1);
+    const colorfulRate = 0.02 * (rf - 3) * this.lf;
+    if (uniqueRate + colorfulRate > 1) {
+      uniqueRate = 1 - colorfulRate;
+    }
+    this.extraRate = [uniqueRate, colorfulRate];
+  }
+}
+
+export class Dungeon {
+  lv: number;
+  difficulty: string;
+  monsters?: Monster[] = new Array();
+  needDps?: number;
+  left: string = '';
+  right: string = '';
+  top: string = '';
+  layer: number;
+  points: number = 0;
+
+  constructor(lv: number, difficulty: string, layer?: number) {
+    this.lv = lv;
+    this.difficulty = difficulty;
+    this.layer = layer || 0;
+    this.setDifficulty(difficulty);
+  }
+  setDifficulty(difficulty: string) {
+    const lv = this.lv;
+    this.difficulty = difficulty;
+    this.monsters = new Array();
+    for (let i = 0; i < 4; i++) {
+      this.monsters.push(new Monster(lv, this.difficulty, this.layer));
+    }
+    const boss = new BossMonster(lv, difficulty, this.layer);
+    this.monsters.push(boss);
+    this.points = Math.floor(boss.ef * boss.lf);
+    this.needDps = Math.ceil(lv * lv ** 1.1 * 32.5 * base_attr_factor[this.difficulty]);
+  }
+  setLayer = (layer) => {
+    this.layer = layer;
+    this.setDifficulty(this.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 6f680a8..0a52494 100644
--- a/src/config/equips/armor.ts
+++ b/src/config/equips/armor.ts
@@ -1,153 +1,150 @@
-import { Entry, Quality, EquipBase, Equip } from './bean';
-import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './constant';
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, extra_entry_num } from './constant';
 
-const extraEntrys = ['atk', 'hp', 'def', 'defPercent', 'hpPercent'];
+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 armorUniqueCategorys = [
-  {
-    name: 'dispute',
-    icon: 'U_Armor01.png',
-    entry: [
+class ArmorCategory extends Categorys {
+  type: string = 'armor';
+}
+export const armorColorfulCategorys: Categorys[] = [
+  new ArmorCategory(
+    'baihua',
+    'armor/百花内甲.png',
+    [
       { type: 'def', valCoefficient: 1.0 },
       { type: 'hp', valCoefficient: 1.4 },
       { type: 'atk', valCoefficient: 1.4 },
     ],
-  },
-  {
-    name: 'jianHao',
-    icon: 'U_Armor02.png',
-    entry: [
-      { type: 'def', valCoefficient: 2.1 },
-      { type: 'hp', valCoefficient: 2.6 },
+    'BHXDJC',
+    0.9
+  ),
+  new ArmorCategory(
+    'heixi',
+    'armor/黑犀.png',
+    [
+      { type: 'def', valCoefficient: 1.8 },
+      { type: 'hp', valCoefficient: 1 },
+      { type: 'bloc', valCoefficient: 1 },
     ],
-  },
-  {
-    name: 'samurai',
-    icon: 'U_Armor03.png',
-    entry: [
-      { type: 'def', valCoefficient: 1.3 },
-      { type: 'hp', valCoefficient: 1.7 },
-      { type: 'atk', valCoefficient: 0.9 },
-    ],
-  },
-  {
-    name: 'trackers',
-    icon: 'U_Armor04.png',
-    entry: [
-      { type: 'def', valCoefficient: 0.9 },
-      { type: 'critDmg', valCoefficient: 1.7 },
-      { type: 'atk', valCoefficient: 1.7 },
-    ],
-  },
-  {
-    name: 'rongYi',
-    icon: 'U_Armor05.png',
-    entry: [
-      { type: 'hp', valCoefficient: 1.6 },
-      { type: 'atk', valCoefficient: 2.4 },
-      { type: 'bloc', valCoefficient: 1.2 },
-    ],
-  },
-  {
-    name: 'nightwear',
-    icon: 'U_Armor06.png',
-    entry: [
-      { type: 'def', valCoefficient: 1.2 },
-      { type: 'hp', valCoefficient: 1.5 },
-      { type: 'atk', valCoefficient: 1.2 },
-    ],
-  },
-  {
-    name: 'wildDragon',
-    icon: 'U_Armor07.png',
-    entry: [
-      { type: 'def', valCoefficient: 1.5 },
-      { type: 'bloc', valCoefficient: 1.2 },
+    'TieBi'
+  ),
+  new ArmorCategory(
+    'guiwen',
+    'armor/龟纹铠.png',
+    [
+      { type: 'def', valCoefficient: 1.0 },
       { type: 'hp', valCoefficient: 1.4 },
+      { type: 'bloc', valCoefficient: 1.4 },
     ],
-  },
-];
-export const armorCategorys = [
-  {
-    name: 'guard',
-    icon: 'A_A2.png',
-    entry: [
-      { type: 'def', valCoefficient: 2 },
-      { type: 'hp', valCoefficient: 0.6 },
-    ],
-  },
-  {
-    name: 'redWillow',
-    icon: 'A_A3.png',
-    entry: [
-      { type: 'def', valCoefficient: 0.9 },
-      { type: 'hp', valCoefficient: 1.2 },
-    ],
-  },
-  {
-    name: 'warrior',
-    icon: 'A_A5.png',
-    entry: [
-      { type: 'def', valCoefficient: 1.1 },
-      { type: 'hp', valCoefficient: 0.8 },
-    ],
-  },
-  {
-    name: 'lightArmor',
-    icon: 'A_A7.png',
-    entry: [
+    'DuJunQianNeng'
+  ),
+  new ArmorCategory(
+    'wuxing',
+    'armor/五行压贴.png',
+    [
       { type: 'def', valCoefficient: 0.7 },
-      { type: 'hp', valCoefficient: 0.5 },
-      { type: 'atk', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 1.5 },
+      { type: 'bloc', valCoefficient: 1.4 },
     ],
-  },
-  {
-    name: 'furryArmor',
-    icon: 'A_A9.png',
-    entry: [
-      { type: 'def', valCoefficient: 0.8 },
-      { type: 'hp', valCoefficient: 0.8 },
-      { type: 'atk', valCoefficient: 0.4 },
+    'JinGuangHuShen'
+  ),
+  new ArmorCategory(
+    'guimen',
+    'armor/鬼门甲.png',
+    [
+      { type: 'bloc', valCoefficient: 2.8 },
+      { type: 'def', valCoefficient: 1.0 },
     ],
-  },
+    'LaoBuKePo',
+    0.6
+  ),
+];
+
+export const armorUniqueCategorys: ArmorCategory[] = [
+  new ArmorCategory('dispute', 'U_Armor01.png', [
+    { type: 'def', valCoefficient: 1.0 },
+    { type: 'hp', valCoefficient: 1.4 },
+    { type: 'atk', valCoefficient: 1.4 },
+  ]),
+  new ArmorCategory('jianHao', 'U_Armor02.png', [
+    { type: 'def', valCoefficient: 2.1 },
+    { type: 'hp', valCoefficient: 2.6 },
+  ]),
+  new ArmorCategory('samurai', 'U_Armor03.png', [
+    { type: 'def', valCoefficient: 1.3 },
+    { type: 'hp', valCoefficient: 1.7 },
+    { type: 'atk', valCoefficient: 0.9 },
+  ]),
+  new ArmorCategory('trackers', 'U_Armor04.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'critDmg', valCoefficient: 1.7 },
+    { type: 'atk', valCoefficient: 1.7 },
+  ]),
+  new ArmorCategory('rongYi', 'U_Armor05.png', [
+    { type: 'hp', valCoefficient: 1.6 },
+    { type: 'atk', valCoefficient: 2.4 },
+    { type: 'bloc', valCoefficient: 1.2 },
+  ]),
+  new ArmorCategory('nightwear', 'U_Armor06.png', [
+    { type: 'def', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 1.5 },
+    { type: 'atk', valCoefficient: 1.2 },
+  ]),
+  new ArmorCategory('wildDragon', 'U_Armor07.png', [
+    { type: 'def', valCoefficient: 1.5 },
+    { type: 'bloc', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 1.4 },
+  ]),
+];
+export const armorCategorys: ArmorCategory[] = [
+  new ArmorCategory('guard', 'A_A2.png', [
+    { type: 'def', valCoefficient: 2 },
+    { type: 'hp', valCoefficient: 0.6 },
+  ]),
+  new ArmorCategory('redWillow', 'A_A3.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 1.2 },
+  ]),
+  new ArmorCategory('warrior', 'A_A5.png', [
+    { type: 'def', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.8 },
+  ]),
+  new ArmorCategory('lightArmor', 'A_A7.png', [
+    { type: 'def', valCoefficient: 0.7 },
+    { type: 'hp', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new ArmorCategory('furryArmor', 'A_A9.png', [
+    { type: 'def', valCoefficient: 0.8 },
+    { type: 'hp', valCoefficient: 0.8 },
+    { type: 'atk', valCoefficient: 0.4 },
+  ]),
 ];
 
 export const initialArmor = () => {
   const type = 'armor';
-  const qualityBean = new Quality(qualitys[0], type);
-  const base = new EquipBase('initial', 'A_A3.png', [new Entry('def', 1, '+1', 100)]);
-  const extraEntry = [new Entry('hp', 10, '+10', 100)];
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]], '');
+  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) => {
+export const createarmor = (quality, lv, category, extraQuality) => {
   const type = 'armor';
-  const qualityBean = new Quality(quality, type);
-  const base = createBase(quality, lv);
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
-    extraEntry.push(armorExtraEntry(quality, lv));
+    extraEntry.push(armorExtraEntry(quality, lv, extraQuality));
   }
   return new Equip(type, lv, qualityBean, base, extraEntry);
 };
 
-export const armorExtraEntry = (quality, lv) => {
-  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
-  const initor = entry_initor[type];
-  const qualityCoefficient = quality_coefficient.armor[quality];
-  const entry = initor(lv, qualityCoefficient);
-  return entry;
+export const armorExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? armorUniqueCategorys : armorCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
-  const entry = new Array();
-  category.entry.forEach((item) => {
-    const initor = entry_initor[item.type];
-    const qualityCoefficient = quality_coefficient.armor[quality];
-    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
-  });
-  return new EquipBase(category.name, category.icon, entry);
-};
+export const armorSamples = createSamples(armorCategorys, armorUniqueCategorys, armorColorfulCategorys, 'armor', coefficient);
diff --git a/src/config/equips/base.ts b/src/config/equips/base.ts
new file mode 100644
index 0000000..7442ca0
--- /dev/null
+++ b/src/config/equips/base.ts
@@ -0,0 +1,56 @@
+import { Categorys, Equip, EquipBase, Quality } from './bean';
+import { entry_initor, EntryInitor, extra_entry_num, extra_quality, extra_quality_lv, qualitys } from './constant';
+
+export const createBase = (quality, lv, category, coefficient, extraQuality) => {
+  const entry = new Array();
+  category.entry.forEach((item) => {
+    const initor: EntryInitor = entry_initor[item.type];
+    const qualityCoefficient = coefficient[quality];
+    entry.push(initor.init(lv, qualityCoefficient, item.valCoefficient, extraQuality));
+  });
+  return new EquipBase(category.name, category.icon, entry, category.skill);
+};
+
+export const createExtraEntry = (quality, lv, extraEntrys, coefficient, extraQuality) => {
+  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
+  const initor: EntryInitor = entry_initor[type];
+  const qualityCoefficient = coefficient[quality];
+  return initor.init(lv, qualityCoefficient, 1, extraQuality);
+};
+
+export const createSamples = (categorys: Categorys[], uniqueCategorys: Categorys[], colorfulCategorys: Categorys[], type, coefficient) => {
+  const samples = {
+    taigu: new Array(),
+    yuangu: new Array(),
+    colorful: new Array(),
+    unique: new Array(),
+    epic: new Array(),
+    artifact: new Array(),
+  };
+  colorfulCategorys.forEach((item) => {
+    samples.taigu.push(createSample('colorful', item, type, coefficient, extra_quality[1]));
+  });
+  colorfulCategorys.forEach((item) => {
+    samples.yuangu.push(createSample('colorful', item, type, coefficient, extra_quality[0]));
+  });
+  colorfulCategorys.forEach((item) => {
+    samples.colorful.push(createSample('colorful', item, type, coefficient, ''));
+  });
+  uniqueCategorys.forEach((item) => {
+    samples.unique.push(createSample('unique', item, type, coefficient, ''));
+  });
+  categorys.forEach((item) => {
+    samples.epic.push(createSample('epic', item, type, coefficient, ''));
+    samples.artifact.push(createSample('artifact', item, type, coefficient, ''));
+  });
+  return samples;
+};
+const createSample = (quality, category, type, coefficient, extraQuality): Equip => {
+  const lv = extraQuality ? 100 + extra_quality_lv : 100;
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
+  const extraEntry = new Array();
+  const sample = new Equip(type, lv, qualityBean, base, extraEntry);
+  sample.reRoll = category.reRoll;
+  return sample;
+};
diff --git a/src/config/equips/bean.ts b/src/config/equips/bean.ts
index 0d71444..4171310 100644
--- a/src/config/equips/bean.ts
+++ b/src/config/equips/bean.ts
@@ -1,29 +1,33 @@
-import { quality_coefficient, quality_collor, extra_entry_num } from './constant';
+import { extra_entry_num } from './constant';
 
 export class Entry {
   type: string;
   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 = value == max ? 100 : Math.round(((value - min) / (max - min)) * 100);
   }
 }
 
 export class Quality {
   quality: string;
   qualityCoefficient: number;
-  color: string;
   extraEntryNum: number;
-  constructor(quality: string, type: string) {
+  extraQuality: string;
+  constructor(quality: string, coefficient: number, extraQuality: string) {
     this.quality = quality;
-    this.qualityCoefficient = quality_coefficient[type][quality];
-    this.color = quality_collor[quality];
+    this.qualityCoefficient = coefficient;
     this.extraEntryNum = extra_entry_num[quality];
+    this.extraQuality = extraQuality;
   }
 }
 
@@ -31,14 +35,17 @@ 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;
   }
 }
 
 export class Equip {
+  id?: string;
   type: string;
   lv: number;
   locked: boolean = false;
@@ -46,6 +53,7 @@ export class Equip {
   quality: Quality;
   base: EquipBase;
   extraEntry: Entry[];
+  reRoll?: number;
   constructor(type: string, lv, quality: Quality, base: EquipBase, extraEntry: Entry[]) {
     this.type = type;
     this.lv = lv;
@@ -54,3 +62,20 @@ export class Equip {
     this.extraEntry = extraEntry;
   }
 }
+
+export abstract class Categorys {
+  abstract type: string;
+  name: string;
+  icon: string;
+  entry: any[];
+  skill?: string;
+  reRoll: number;
+
+  constructor(name: string, icon: string, entry: any[], skill?: string, reRoll?: number) {
+    this.name = name;
+    this.icon = icon;
+    this.entry = entry;
+    this.skill = skill;
+    this.reRoll = reRoll || 0;
+  }
+}
diff --git a/src/config/equips/bracers.ts b/src/config/equips/bracers.ts
new file mode 100644
index 0000000..627bd8f
--- /dev/null
+++ b/src/config/equips/bracers.ts
@@ -0,0 +1,137 @@
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, 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 };
+
+class BracersCategory extends Categorys {
+  type: string = 'bracers';
+}
+export const bracersColorfulCategorys: Categorys[] = [
+  new BracersCategory(
+    'limao',
+    'bracers/狸猫足印.png',
+    [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'atkPercent', valCoefficient: 1 },
+      { type: 'atk', valCoefficient: 1.2 },
+    ],
+    'LiZhao',
+    0.8
+  ),
+  new BracersCategory(
+    'dushe',
+    'bracers/毒蛇.png',
+    [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'atkPercent', valCoefficient: 0.8 },
+      { type: 'atk', valCoefficient: 1.1 },
+    ],
+    'JuDu',
+    0.5
+  ),
+  new BracersCategory(
+    'xianglong',
+    'bracers/降龙.png',
+    [
+      { type: 'critDmg', valCoefficient: 1.2 },
+      { type: 'atkPercent', valCoefficient: 1 },
+      { type: 'atk', valCoefficient: 1 },
+    ],
+    'Xianglong',
+    0.1
+  ),
+  new BracersCategory(
+    'huojing',
+    'bracers/火晶环.png',
+    [
+      { type: 'atkPercent', valCoefficient: 1 },
+      { type: 'atk', valCoefficient: 1.8 },
+    ],
+    'DaLiDan'
+  ),
+  new BracersCategory('xingjia', 'bracers/刑枷.png', [
+    { type: 'atkPercent', valCoefficient: 1 },
+    { type: 'critDmg', valCoefficient: 1.2 },
+    { type: 'crit', valCoefficient: 1.2 },
+    { type: 'atk', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 1.2 },
+    { type: 'def', valCoefficient: 1.2 },
+  ]),
+];
+export const bracersUniqueCategorys: BracersCategory[] = [
+  new BracersCategory('duoqing', 'bracers/多情腕.png', [
+    { type: 'atk', valCoefficient: 1 },
+    { type: 'hp', valCoefficient: 0.8 },
+    { type: 'def', valCoefficient: 0.9 },
+  ]),
+  new BracersCategory('wano', 'bracers/玩藕.png', [
+    { type: 'critDmg', valCoefficient: 1.5 },
+    { type: 'crit', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.8 },
+  ]),
+  new BracersCategory('rsggu', 'bracers/人参果裹布.png', [
+    { type: 'critDmg', valCoefficient: 1.2 },
+    { type: 'atkPercent', valCoefficient: 1 },
+    { type: 'atk', valCoefficient: 0.7 },
+  ]),
+  new BracersCategory('yingwu', 'bracers/鹦鹉杯.png', [
+    { type: 'critDmg', valCoefficient: 1.6 },
+    { type: 'atk', valCoefficient: 1.6 },
+  ]),
+  new BracersCategory('meipusa', 'bracers/美菩萨.png', [
+    { type: 'atkPercent', valCoefficient: 1 },
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 1.2 },
+  ]),
+];
+export const bracersCategorys: BracersCategory[] = [
+  new BracersCategory('guoshi', 'bracers/裹尸布.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 0.6 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new BracersCategory('xiuyugu', 'bracers/绣与骨.png', [
+    { type: 'crit', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.6 },
+  ]),
+  new BracersCategory('huoshen', 'bracers/火神腕.png', [
+    { type: 'crit', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.6 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new BracersCategory('heishou', 'bracers/黑手.png', [
+    { 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('atk', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('hp', 20, '+20', 20, 20)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createbracers = (quality, lv, category, extraQuality): Equip => {
+  const type = 'bracers';
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(bracersExtraEntry(quality, lv, extraQuality));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const bracersExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
+};
+
+export const bracersSamples = createSamples(bracersCategorys, bracersUniqueCategorys, bracersColorfulCategorys, 'bracers', coefficient);
diff --git a/src/config/equips/constant.ts b/src/config/equips/constant.ts
index f7be804..cd03978 100644
--- a/src/config/equips/constant.ts
+++ b/src/config/equips/constant.ts
@@ -1,39 +1,10 @@
 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 extra_quality = ['yuangu', 'taigu'];
+export const extra_quality_rate = [0.1, 0.01];
+export const extra_quality_lv = 50;
 
 //装备颜色
 export const quality_collor = {
@@ -51,15 +22,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,75 +36,87 @@ 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];
+export const strengthen_factor = { shabby: 1, ordinary: 1, artifact: 1, epic: 1, unique: 1.5, colorful: 2 };
+
+export interface EntryInitor {
+  init(lv: number, qualityCoefficient: number, valCoefficient?: number, extraQuality?: string): Entry;
+}
+class BaseInitor implements EntryInitor {
+  type: string;
+  factor1: number;
+  factor2: number;
+  constant: number;
+  constructor(type: string, factor1: number, factor2: number, constant: number) {
+    this.type = type;
+    this.factor1 = factor1;
+    this.factor2 = factor2;
+    this.constant = constant;
+  }
+  init(lv: number, qualityCoefficient: number, valCoefficient: number, extraQuality?: string): Entry {
+    const num1 = lv * valCoefficient * this.factor1;
+    const num2 = Math.random() * lv * this.factor2 + this.constant;
+    const manNum2 = lv * this.factor2 + this.constant;
+    const minNum2 = this.constant;
+    const value = Math.round((num1 + num2) * qualityCoefficient) || 1;
+    const max = Math.round((num1 + manNum2) * qualityCoefficient) || 1;
+    const min = Math.round((num1 + minNum2) * qualityCoefficient) || 1;
+    return this.createEntry(value, max, min, extraQuality);
+  }
+
+  createEntry(value, max, min, extraQuality): Entry {
+    const unity = attr_unitys[this.type] || '';
+    if (extraQuality == extra_quality[1]) {
+      return new Entry(this.type, max, '+' + max + unity, max, max);
+    }
+    return new Entry(this.type, value, '+' + value + unity, max, min);
+  }
+}
+class CritInitor extends BaseInitor {
+  constructor(type: string, factor1: number, factor2: number, constant: number) {
+    super(type, factor1, factor2, constant);
+  }
+  init(lv: number, qualityCoefficient: number, valCoefficient: number, extraQuality?: string): Entry {
+    const value = this.call(Math.random() * this.factor1, lv, valCoefficient, qualityCoefficient);
+    const max = this.call(this.factor1, lv, valCoefficient, qualityCoefficient);
+    const min = this.call(0, lv, valCoefficient, qualityCoefficient);
+    return this.createEntry(value, max, min, extraQuality);
+  }
+  call(num1, lv, valCoefficient, qualityCoefficient): number {
+    const lvFactor = (0.5 * lv) / 100 + 0.5;
+    const num2 = this.factor2 * valCoefficient + this.constant;
+    return Math.round(lvFactor * (num1 + num2) * qualityCoefficient) || 1;
+  }
+}
+class DmgInitor extends BaseInitor {
+  init(lv: number, qualityCoefficient: number, valCoefficient: number, extraQuality?: string): Entry {
+    const value = Math.round((lv * this.factor1 * (Math.random() + this.factor2) + this.constant) * qualityCoefficient * valCoefficient) || 1;
+    const max = Math.round((lv * this.factor1 * (1 + this.factor2) + this.constant) * qualityCoefficient * valCoefficient) || 1;
+    const min = Math.round((lv * this.factor1 * this.factor2 + this.constant) * qualityCoefficient * valCoefficient) || 1;
+    return this.createEntry(value, max, min, extraQuality);
+  }
+}
 
 export const entry_initor = {
-  atk: (lv: number, qualityCoefficient: number, valCoefficient?: number) => {
-    valCoefficient = valCoefficient || 1;
-    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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
-  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));
-  },
+  atk: new BaseInitor('atk', 1, 0.5, 1),
+  atkPercent: new BaseInitor('atkPercent', 0.11, 0.1, 4),
+  hp: new BaseInitor('hp', 5, 0.5, 1),
+  hpPercent: new BaseInitor('hpPercent', 0.1, 0.1, 4),
+  def: new BaseInitor('def', 1, 0.5, 1),
+  defPercent: new BaseInitor('defPercent', 0.13, 0.1, 4),
+  bloc: new BaseInitor('bloc', 0.25, 1 / 3, 1),
+  blocPercent: new BaseInitor('blocPercent', 0.1, 0.1, 4),
+  crit: new CritInitor('crit', 5, 2, 5),
+  critDmg: new CritInitor('critDmg', 15, 7, 16),
+  critAvoid: new CritInitor('critAvoid', 5, 0, 7),
+  critDmgReduc: new CritInitor('critDmgReduc', 15, 7, 16),
+  dmgPercent: new DmgInitor('dmgPercent', 0.05, 1, 3),
+  dmgReduc: new DmgInitor('dmgReduc', 0.05, 0, 6),
+  moveSpeed: new CritInitor('moveSpeed', 8, 6, 17),
 };
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..3d533c7
--- /dev/null
+++ b/src/config/equips/jewelry.ts
@@ -0,0 +1,150 @@
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, 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 };
+
+class JewelryCategory extends Categorys {
+  type: string = 'jewelry';
+}
+
+export const jewelryColorfulCategorys: Categorys[] = [
+  new JewelryCategory(
+    'youerhuan',
+    'jewelry/白骨夫人的右耳环.png',
+    [
+      { type: 'dmgPercent', valCoefficient: 0.5 },
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'atk', valCoefficient: 0.6 },
+    ],
+    'Vampire1',
+    0.99
+  ),
+  new JewelryCategory(
+    'shuzhuang',
+    'jewelry/梳妆镜.png',
+    [
+      { type: 'dmgPercent', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 1.2 },
+      { type: 'def', valCoefficient: 0.4 },
+    ],
+    'JHSY',
+    0.8
+  ),
+  new JewelryCategory(
+    'liulipan',
+    'jewelry/琉璃盘.png',
+    [
+      { type: 'dmgPercent', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.6 },
+      { type: 'hp', valCoefficient: 1 },
+    ],
+    'Liulipan'
+  ),
+  new JewelryCategory(
+    'ghdp',
+    'jewelry/勾魂夺魂.png',
+    [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'crit', valCoefficient: 0.4 },
+      { type: 'atk', valCoefficient: 0.5 },
+    ],
+    'CritFear'
+  ),
+  new JewelryCategory(
+    'jingboyu',
+    'jewelry/金钵盂.png',
+    [
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.6 },
+      { type: 'def', valCoefficient: 0.6 },
+    ],
+    'Prototype'
+  ),
+  new JewelryCategory(
+    'zijingboyu',
+    'jewelry/紫金钵盂.png',
+    [
+      { type: 'dmgPercent', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.8 },
+    ],
+    'Fate'
+  ),
+];
+export const jewelryUniqueCategorys: JewelryCategory[] = [
+  new JewelryCategory('hanjing', 'jewelry/寒晶佩.png', [
+    { type: 'atk', valCoefficient: 1 },
+    { type: 'hp', valCoefficient: 0.8 },
+    { type: 'def', valCoefficient: 0.9 },
+  ]),
+  new JewelryCategory('ylhm', 'jewelry/月灵幻梦.png', [
+    { type: 'critDmg', valCoefficient: 1.5 },
+    { type: 'crit', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.8 },
+  ]),
+  new JewelryCategory('liangren', 'jewelry/良人.png', [
+    { type: 'critDmg', valCoefficient: 1.2 },
+    { type: 'dmgPercent', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.7 },
+  ]),
+  new JewelryCategory('duzhan', 'jewelry/督战.png', [
+    { type: 'critDmg', valCoefficient: 1.6 },
+    { type: 'atk', valCoefficient: 1.6 },
+  ]),
+  new JewelryCategory('cltx', 'jewelry/赤羚天禧.png', [
+    { type: 'dmgPercent', valCoefficient: 0.6 },
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 1.2 },
+  ]),
+];
+export const jewelryCategorys: JewelryCategory[] = [
+  new JewelryCategory('weihun', 'jewelry/未婚.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 0.6 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new JewelryCategory('huangyan', 'jewelry/谎言.png', [
+    { type: 'crit', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.6 },
+  ]),
+  new JewelryCategory('zhenjing', 'jewelry/真经.png', [
+    { type: 'crit', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.6 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new JewelryCategory('maming', 'jewelry/马鸣玉佩.png', [
+    { 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('atk', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
+  return new Equip(type, 1, qualityBean, base, extraEntry);
+};
+
+export const createjewelry = (quality, lv, category, extraQuality): Equip => {
+  const type = 'jewelry';
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(jewelryExtraEntry(quality, lv, extraQuality));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const jewelryExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
+};
+
+export const jewelrySamples = createSamples(jewelryCategorys, jewelryUniqueCategorys, jewelryColorfulCategorys, 'jewelry', coefficient);
diff --git a/src/config/equips/neck.ts b/src/config/equips/neck.ts
index 66838f3..8a9b547 100644
--- a/src/config/equips/neck.ts
+++ b/src/config/equips/neck.ts
@@ -1,120 +1,134 @@
-import { Entry, Quality, EquipBase, Equip } from './bean';
-import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './constant';
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, extra_entry_num } from './constant';
 
 const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'bloc'];
 
-export const neckUniqueCategorys = [
-  {
-    name: 'demonSlayer',
-    icon: 'U_neck01.png',
-    entry: [
-      { type: 'atk', valCoefficient: 0.7 },
-      { type: 'hp', valCoefficient: 0.8 },
-      { type: 'def', valCoefficient: 0.9 },
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 1.8 };
+
+class NeckCategory extends Categorys {
+  type: string = 'neck';
+}
+
+export const neckColorfulCategorys: Categorys[] = [
+  new NeckCategory(
+    'chitong',
+    'neck/赤瞳金玉坠.png',
+    [
+      { type: 'critDmg', valCoefficient: 0.9 },
+      { type: 'atk', valCoefficient: 0.9 },
+      { type: 'hp', valCoefficient: 1.2 },
     ],
-  },
-  {
-    name: 'darkDragon',
-    icon: 'U_neck02.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1 },
-      { type: 'crit', valCoefficient: 0.5 },
-      { type: 'hp', valCoefficient: 0.8 },
+    'XingYunShuZi',
+    0.99
+  ),
+  new NeckCategory(
+    'duanji',
+    'neck/断·极.png',
+    [
+      { type: 'bloc', valCoefficient: 1.3 },
+      { type: 'def', valCoefficient: 0.8 },
+      { type: 'hp', valCoefficient: 0.9 },
     ],
-  },
-  {
-    name: 'single',
-    icon: 'U_neck03.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1.8 },
-      { type: 'bloc', valCoefficient: 0.7 },
-      { type: 'hp', valCoefficient: 0.7 },
+    'Duan'
+  ),
+  new NeckCategory(
+    'hushi',
+    'neck/虎视.png',
+    [
+      { type: 'atk', valCoefficient: 1.6 },
+      { type: 'hp', valCoefficient: 1.5 },
     ],
-  },
-  {
-    name: 'demons',
-    icon: 'U_neck04.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1.6 },
+    'NuMu'
+  ),
+  new NeckCategory(
+    'xuenu',
+    'neck/血怒.png',
+    [
+      { type: 'critDmg', valCoefficient: 1.5 },
       { type: 'atk', valCoefficient: 1.6 },
     ],
-  },
-  {
-    name: 'ipaya',
-    icon: 'U_neck05.png',
-    entry: [
-      { type: 'bloc', valCoefficient: 0.9 },
-      { type: 'def', valCoefficient: 0.9 },
-      { type: 'hp', valCoefficient: 1.3 },
+    'HongYan'
+  ),
+  new NeckCategory(
+    'guiyan',
+    'neck/鬼眼.png',
+    [
+      { type: 'critDmg', valCoefficient: 1.4 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 0.8 },
     ],
-  },
+    'ShaYi'
+  ),
+  new NeckCategory('longteng', 'neck/龙腾护心镜.png', [{ type: 'hp', valCoefficient: 3 }], 'LongTeng'),
 ];
-export const neckCategorys = [
-  {
-    name: 'crusade',
-    icon: 'Ac_1.png',
-    entry: [
-      { type: 'def', valCoefficient: 0.9 },
-      { type: 'hp', valCoefficient: 0.5 },
-      { type: 'bloc', valCoefficient: 0.6 },
-    ],
-  },
-  {
-    name: 'gintamaEyes',
-    icon: 'Ac_5.png',
-    entry: [
-      { type: 'crit', valCoefficient: 1.1 },
-      { type: 'hp', valCoefficient: 0.5 },
-      { type: 'atk', valCoefficient: 0.6 },
-    ],
-  },
-  {
-    name: 'iceDragon',
-    icon: 'Ac_7.png',
-    entry: [
-      { type: 'crit', valCoefficient: 0.75 },
-      { type: 'critDmg', valCoefficient: 0.5 },
-      { type: 'hp', valCoefficient: 0.5 },
-    ],
-  },
+
+export const neckUniqueCategorys: NeckCategory[] = [
+  new NeckCategory('demonSlayer', 'U_neck01.png', [
+    { type: 'atk', valCoefficient: 1.0 },
+    { type: 'hp', valCoefficient: 0.8 },
+    { type: 'def', valCoefficient: 0.9 },
+  ]),
+  new NeckCategory('darkDragon', 'U_neck02.png', [
+    { type: 'critDmg', valCoefficient: 1.5 },
+    { type: 'crit', valCoefficient: 0.5 },
+    { type: 'hp', valCoefficient: 0.8 },
+  ]),
+  new NeckCategory('single', 'U_neck03.png', [
+    { type: 'critDmg', valCoefficient: 1.5 },
+    { type: 'bloc', valCoefficient: 0.7 },
+    { type: 'hp', valCoefficient: 0.7 },
+  ]),
+  new NeckCategory('demons', 'U_neck04.png', [
+    { type: 'critDmg', valCoefficient: 1.6 },
+    { type: 'atk', valCoefficient: 1.6 },
+  ]),
+  new NeckCategory('ipaya', 'U_neck05.png', [
+    { type: 'bloc', valCoefficient: 0.9 },
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 1.3 },
+  ]),
+];
+export const neckCategorys: NeckCategory[] = [
+  new NeckCategory('crusade', 'Ac_1.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'hp', valCoefficient: 0.5 },
+    { type: 'bloc', valCoefficient: 0.6 },
+  ]),
+  new NeckCategory('gintamaEyes', 'Ac_5.png', [
+    { type: 'crit', valCoefficient: 1.1 },
+    { type: 'hp', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.6 },
+  ]),
+  new NeckCategory('iceDragon', 'Ac_7.png', [
+    { type: 'crit', valCoefficient: 0.75 },
+    { type: 'critDmg', valCoefficient: 0.5 },
+    { type: 'hp', valCoefficient: 0.5 },
+  ]),
 ];
 
 export const initialNeck = () => {
   const type = 'neck';
-  const qualityBean = new Quality(qualitys[0], type);
-  const base = new EquipBase('initial', 'Ac_3.png', [new Entry('hp', 20, '+20', 100)]);
-  const extraEntry = [new Entry('crit', 10, '+10%', 100)];
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]], '');
+  const base = new EquipBase('initial', 'Ac_3.png', [new Entry('atk', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
-export const createNeck = (quality, lv) => {
+export const createneck = (quality, lv, category, extraQuality) => {
   const type = 'neck';
-  const qualityBean = new Quality(quality, type);
-  const base = createBase(quality, lv);
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
-    extraEntry.push(neckExtraEntry(quality, lv));
+    extraEntry.push(neckExtraEntry(quality, lv, extraQuality));
   }
   return new Equip(type, lv, qualityBean, base, extraEntry);
 };
 
-export const neckExtraEntry = (quality, lv) => {
-  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
-  const initor = entry_initor[type];
-  const qualityCoefficient = quality_coefficient.neck[quality];
-  const entry = initor(lv, qualityCoefficient);
-  return entry;
+export const neckExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? neckUniqueCategorys : neckCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
-  const entry = new Array();
-  category.entry.forEach((item) => {
-    const initor = entry_initor[item.type];
-    const qualityCoefficient = quality_coefficient.neck[quality];
-    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
-  });
-  return new EquipBase(category.name, category.icon, entry);
-};
+export const neckSamples = createSamples(neckCategorys, neckUniqueCategorys, neckColorfulCategorys, 'neck', coefficient);
diff --git a/src/config/equips/pants.ts b/src/config/equips/pants.ts
new file mode 100644
index 0000000..b34f192
--- /dev/null
+++ b/src/config/equips/pants.ts
@@ -0,0 +1,130 @@
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, 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 };
+
+class PantsCategory extends Categorys {
+  type: string = 'pants';
+}
+export const pantsColorfulCategorys: Categorys[] = [
+  new PantsCategory(
+    'guijia',
+    'pants/鬼甲.png',
+    [
+      { type: 'def', valCoefficient: 1.5 },
+      { type: 'atk', valCoefficient: 1.2 },
+      { type: 'hp', valCoefficient: 1.4 },
+    ],
+    'KongBuLingYu',
+    0.98
+  ),
+  new PantsCategory(
+    'baizhequn',
+    'pants/奎英的百褶裙.png',
+    [
+      { type: 'def', valCoefficient: 1.2 },
+      { type: 'bloc', valCoefficient: 1.5 },
+      { type: 'hp', valCoefficient: 1.4 },
+    ],
+    'FuRenBiHu'
+  ),
+  new PantsCategory(
+    'yulan',
+    'pants/鱼篮.png',
+    [
+      { type: 'def', valCoefficient: 1.2 },
+      { type: 'bloc', valCoefficient: 1.3 },
+      { type: 'hp', valCoefficient: 1.6 },
+    ],
+    'LingGan'
+  ),
+  new PantsCategory(
+    'qiutu',
+    'pants/囚徒.png',
+    [
+      { type: 'def', valCoefficient: 1.8 },
+      { type: 'hp', valCoefficient: 2.3 },
+    ],
+    'WanKang'
+  ),
+  new PantsCategory(
+    'wuwei',
+    'pants/五味.png',
+    [
+      { type: 'def', valCoefficient: 1.2 },
+      { type: 'bloc', valCoefficient: 1.4 },
+      { type: 'hp', valCoefficient: 1.5 },
+    ],
+    'WuWei'
+  ),
+];
+
+export const pantsUniqueCategorys: PantsCategory[] = [
+  new PantsCategory('mhlg', 'pants/梦回龙宫.png', [
+    { type: 'def', valCoefficient: 2 },
+    { type: 'hp', valCoefficient: 2.8 },
+  ]),
+  new PantsCategory('longlin', 'pants/龙鳞胫甲.png', [
+    { type: 'def', valCoefficient: 0.9 },
+    { type: 'critDmg', valCoefficient: 1.7 },
+    { type: 'atk', valCoefficient: 1.7 },
+  ]),
+  new PantsCategory('cangjing', 'pants/藏经甲.png', [
+    { type: 'def', valCoefficient: 1.5 },
+    { type: 'bloc', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 1.4 },
+  ]),
+  new PantsCategory('egui', 'pants/饿鬼.png', [
+    { type: 'def', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 1.7 },
+    { type: 'atk', valCoefficient: 1.0 },
+  ]),
+  new PantsCategory('qijia', 'pants/泣甲.png', [
+    { type: 'hp', valCoefficient: 2 },
+    { type: 'atk', valCoefficient: 2 },
+    { type: 'bloc', valCoefficient: 1.2 },
+  ]),
+];
+export const pantsCategorys: PantsCategory[] = [
+  new PantsCategory('kaishulin', 'pants/铠鼠鳞.png', [
+    { type: 'def', valCoefficient: 2 },
+    { type: 'hp', valCoefficient: 0.6 },
+  ]),
+  new PantsCategory('guanjia', 'pants/管家服.png', [
+    { type: 'def', valCoefficient: 0.8 },
+    { type: 'hp', valCoefficient: 1.8 },
+  ]),
+  new PantsCategory('shengxian', 'pants/升仙.png', [
+    { 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, category, extraQuality) => {
+  const type = 'pants';
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(pantsExtraEntry(quality, lv, extraQuality));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const pantsExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
+};
+
+export const pantsSamples = createSamples(pantsCategorys, pantsUniqueCategorys, pantsColorfulCategorys, 'pants', coefficient);
diff --git a/src/config/equips/ring.ts b/src/config/equips/ring.ts
index 2edb88c..6641059 100644
--- a/src/config/equips/ring.ts
+++ b/src/config/equips/ring.ts
@@ -1,114 +1,130 @@
-import { Entry, Quality, EquipBase, Equip } from './bean';
-import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './constant';
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, extra_entry_num } from './constant';
 
 const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def'];
 
-export const ringUniqueCategorys = [
-  {
-    name: 'death',
-    icon: 'U_ring01.png',
-    entry: [
-      { type: 'crit', valCoefficient: 1 },
-      { type: 'critDmg', valCoefficient: 0.5 },
-      { type: 'hp', valCoefficient: 0.8 },
+const coefficient = { shabby: 0.6, ordinary: 0.9, artifact: 1.3, epic: 1.6, unique: 1.8, colorful: 2 };
+
+class RingCategory extends Categorys {
+  type: string = 'ring';
+}
+
+export const ringColorfulCategorys: Categorys[] = [
+  new RingCategory(
+    'jingangzhuo',
+    'ring/金刚琢.png',
+    [
+      { type: 'critDmg', valCoefficient: 1.5 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 1 },
     ],
-  },
-  {
-    name: 'realFurryRing',
-    icon: 'U_ring02.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1.2 },
+    'SLWX,JinGangZhuo',
+    0.9
+  ),
+  new RingCategory(
+    'pojie',
+    'ring/破戒.png',
+    [
+      { type: 'critDmg', valCoefficient: 1.5 },
       { type: 'crit', valCoefficient: 0.5 },
       { type: 'atk', valCoefficient: 0.7 },
     ],
-  },
-  {
-    name: 'pioneer',
-    icon: 'U_ring03.png',
-    entry: [
+    'FengXie'
+  ),
+  new RingCategory(
+    'mantanghong',
+    'ring/满堂红.png',
+    [
       { type: 'critDmg', valCoefficient: 1 },
       { type: 'crit', valCoefficient: 0.5 },
-      { type: 'hp', valCoefficient: 0.7 },
+      { type: 'hp', valCoefficient: 1.5 },
     ],
-  },
-  {
-    name: 'susan',
-    icon: 'U_ring04.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1.6 },
-      { type: 'atk', valCoefficient: 1.1 },
+    'ShiZhong'
+  ),
+  new RingCategory(
+    'hanba',
+    'ring/旱魃.png',
+    [
+      { type: 'critDmg', valCoefficient: 1 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'hp', valCoefficient: 1.5 },
     ],
-  },
-  {
-    name: 'moonlight',
-    icon: 'U_ring05.png',
-    entry: [
-      { type: 'critDmg', valCoefficient: 1.5 },
-      { type: 'hp', valCoefficient: 1.2 },
+    'ShenShang'
+  ),
+  new RingCategory(
+    'yaozuzhili',
+    'ring/妖族之力.png',
+    [
+      { type: 'critDmg', valCoefficient: 0.7 },
+      { type: 'crit', valCoefficient: 0.5 },
+      { type: 'atk', valCoefficient: 1.5 },
     ],
-  },
+    'TongJueFanJi',
+    0.5
+  ),
+];
+
+export const ringUniqueCategorys: RingCategory[] = [
+  new RingCategory('death', 'U_ring01.png', [
+    { type: 'crit', valCoefficient: 1 },
+    { type: 'critDmg', valCoefficient: 0.5 },
+    { type: 'hp', valCoefficient: 0.8 },
+  ]),
+  new RingCategory('realFurryRing', 'U_ring02.png', [
+    { type: 'critDmg', valCoefficient: 1.2 },
+    { type: 'crit', valCoefficient: 0.5 },
+    { type: 'atk', valCoefficient: 0.7 },
+  ]),
+  new RingCategory('pioneer', 'U_ring03.png', [
+    { type: 'critDmg', valCoefficient: 1 },
+    { type: 'crit', valCoefficient: 0.5 },
+    { type: 'hp', valCoefficient: 0.7 },
+  ]),
+  new RingCategory('susan', 'U_ring04.png', [
+    { type: 'critDmg', valCoefficient: 1.6 },
+    { type: 'atk', valCoefficient: 1.1 },
+  ]),
+  new RingCategory('moonlight', 'U_ring05.png', [
+    { type: 'critDmg', valCoefficient: 1.5 },
+    { type: 'hp', valCoefficient: 1.2 },
+  ]),
 ];
 export const ringCategorys = [
-  {
-    name: 'life',
-    icon: 'Ac_9.png',
-    entry: [{ type: 'hp', valCoefficient: 1.5 }],
-  },
-  {
-    name: 'imperialSoul',
-    icon: 'Ac_10.png',
-    entry: [
-      { type: 'hp', valCoefficient: 1 },
-      { type: 'atk', valCoefficient: 0.5 },
-    ],
-  },
-  {
-    name: 'furryRing',
-    icon: 'Ac_11.png',
-    entry: [
-      { type: 'hp', valCoefficient: 0.9 },
-      { type: 'atk', valCoefficient: 0.3 },
-      { type: 'crit', valCoefficient: 0.8 },
-    ],
-  },
+  new RingCategory('life', 'Ac_9.png', [{ type: 'hp', valCoefficient: 1.5 }]),
+  new RingCategory('imperialSoul', 'Ac_10.png', [
+    { type: 'hp', valCoefficient: 1 },
+    { type: 'atk', valCoefficient: 0.5 },
+  ]),
+  new RingCategory('furryRing', 'Ac_11.png', [
+    { type: 'hp', valCoefficient: 0.9 },
+    { type: 'atk', valCoefficient: 0.3 },
+    { type: 'crit', valCoefficient: 0.8 },
+  ]),
 ];
 
 export const initialRing = () => {
   const type = 'ring';
-  const qualityBean = new Quality(qualitys[0], type);
-  const base = new EquipBase('initial', 'Ac_10.png', [new Entry('hp', 20, '+20', 100)]);
-  const extraEntry = [new Entry('crit', 10, '+10%', 100)];
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]], '');
+  const base = new EquipBase('initial', 'Ac_10.png', [new Entry('atk', 1, '+1', 1, 1)]);
+  const extraEntry = [new Entry('crit', 10, '+10%', 10, 10)];
   return new Equip(type, 1, qualityBean, base, extraEntry);
 };
 
-export const createRing = (quality, lv) => {
+export const createring = (quality, lv, category, extraQuality) => {
   const type = 'ring';
-  const qualityBean = new Quality(quality, type);
-  const base = createBase(quality, lv);
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
-    extraEntry.push(ringExtraEntry(quality, lv));
+    extraEntry.push(ringExtraEntry(quality, lv, extraQuality));
   }
   return new Equip(type, lv, qualityBean, base, extraEntry);
 };
 
-export const ringExtraEntry = (quality, lv) => {
-  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
-  const initor = entry_initor[type];
-  const qualityCoefficient = quality_coefficient.ring[quality];
-  const entry = initor(lv, qualityCoefficient);
-  return entry;
+export const ringExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? ringUniqueCategorys : ringCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
-  const entry = new Array();
-  category.entry.forEach((item) => {
-    const initor = entry_initor[item.type];
-    const qualityCoefficient = quality_coefficient.ring[quality];
-    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
-  });
-  return new EquipBase(category.name, category.icon, entry);
-};
+export const ringSamples = createSamples(ringCategorys, ringUniqueCategorys, ringColorfulCategorys, 'ring', coefficient);
diff --git a/src/config/equips/shoes.ts b/src/config/equips/shoes.ts
new file mode 100644
index 0000000..9a21224
--- /dev/null
+++ b/src/config/equips/shoes.ts
@@ -0,0 +1,96 @@
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, extra_entry_num } from './constant';
+
+const extraEntrys = ['atk', 'hp', 'def', 'moveSpeed', 'defPercent', 'hpPercent'];
+const coefficient = { shabby: 0.7, ordinary: 1, artifact: 1.3, epic: 1.5, unique: 1.8, colorful: 1.8 };
+
+class ShoesCategory extends Categorys {
+  type: string = 'shoes';
+}
+
+export const shoesColorfulCategorys: Categorys[] = [
+  new ShoesCategory('lingyun', 'shoes/灵韵集能器.png', [
+    { type: 'moveSpeed', valCoefficient: 1.2 },
+    { type: 'atk', valCoefficient: 1.8 },
+    { type: 'hp', valCoefficient: 2.2 },
+  ]),
+  new ShoesCategory('siben', 'shoes/私奔.png', [
+    { type: 'moveSpeed', valCoefficient: 2 },
+    { type: 'def', valCoefficient: 1.6 },
+    { type: 'hp', valCoefficient: 2.4 },
+  ]),
+  new ShoesCategory('qxzl', 'shoes/浅夏紫灵.png', [
+    { type: 'moveSpeed', valCoefficient: 1.5 },
+    { type: 'atk', valCoefficient: 1.2 },
+    { type: 'hp', valCoefficient: 2.8 },
+  ]),
+  new ShoesCategory('xuedun', 'shoes/血遁靴.png', [
+    { type: 'moveSpeed', valCoefficient: 2.8 },
+    { type: 'hp', valCoefficient: 4 },
+  ]),
+  new ShoesCategory('wajiang', 'shoes/蛙将足.png', [
+    { type: 'moveSpeed', valCoefficient: 1.4 },
+    { type: 'atk', valCoefficient: 1.5 },
+    { type: 'def', valCoefficient: 2.5 },
+  ]),
+];
+
+export const shoesUniqueCategorys: ShoesCategory[] = [
+  new ShoesCategory('talang', 'shoes/踏浪.png', [
+    { type: 'moveSpeed', valCoefficient: 1.8 },
+    { type: 'hp', valCoefficient: 1 },
+    { type: 'atk', valCoefficient: 1.2 },
+  ]),
+  new ShoesCategory('jiuwanli', 'shoes/九万里.png', [
+    { type: 'moveSpeed', valCoefficient: 1.9 },
+    { type: 'def', valCoefficient: 1 },
+    { type: 'hp', valCoefficient: 1.2 },
+  ]),
+  new ShoesCategory('hongchen', 'shoes/红尘.png', [
+    { type: 'moveSpeed', valCoefficient: 1.2 },
+    { type: 'def', valCoefficient: 1.5 },
+    { type: 'hp', valCoefficient: 1.4 },
+  ]),
+];
+export const shoesCategorys: ShoesCategory[] = [
+  new ShoesCategory('lingguan', 'shoes/灵官靴.png', [
+    { type: 'moveSpeed', valCoefficient: 0.8 },
+    { type: 'def', valCoefficient: 1.8 },
+  ]),
+  new ShoesCategory('quanchi', 'shoes/犬齿鞋.png', [
+    { type: 'moveSpeed', valCoefficient: 0.8 },
+    { type: 'hp', valCoefficient: 1.8 },
+  ]),
+  new ShoesCategory('kunlun', 'shoes/昆仑履.png', [
+    { 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, category, extraQuality) => {
+  const type = 'shoes';
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
+  const extraEntry = new Array();
+  const extraEntryNum = extra_entry_num[quality];
+  for (let i = 0; i < extraEntryNum; i++) {
+    extraEntry.push(shoesExtraEntry(quality, lv, extraQuality));
+  }
+  return new Equip(type, lv, qualityBean, base, extraEntry);
+};
+
+export const shoesExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
+};
+
+export const shoesSamples = createSamples(shoesCategorys, shoesUniqueCategorys, shoesColorfulCategorys, 'shoes', coefficient);
diff --git a/src/config/equips/weapon.ts b/src/config/equips/weapon.ts
index 3f7ad35..b8cd768 100644
--- a/src/config/equips/weapon.ts
+++ b/src/config/equips/weapon.ts
@@ -1,181 +1,204 @@
-import { Entry, Quality, EquipBase, Equip } from './bean';
-import { qualitys, entry_initor, extra_entry_num, quality_coefficient } from './constant';
+import { createExtraEntry, createBase, createSamples } from './base';
+import { Entry, Quality, EquipBase, Equip, Categorys } from './bean';
+import { qualitys, extra_entry_num } from './constant';
 
-const extraEntrys = ['atk', 'crit', 'critDmg', 'hp', 'def', 'atkPercent', 'defPercent', 'hpPercent'];
+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 weaponUniqueCategorys = [
-  {
-    name: 'creation',
-    icon: 'U_Sword01.png',
-    entry: [
+class WeaponCategory extends Categorys {
+  type: string = 'weapon';
+}
+
+export const weaponColorfulCategorys: Categorys[] = [
+  new WeaponCategory(
+    'qiuai',
+    'weapon/求爱.png',
+    [
       { type: 'atk', valCoefficient: 1.8 },
       { type: 'crit', valCoefficient: 1.5 },
       { type: 'critDmg', valCoefficient: 1.3 },
     ],
-  },
-  {
-    name: 'nameless',
-    icon: 'U_Sword02.png',
-    entry: [
-      { type: 'atk', valCoefficient: 2.7 },
-      { type: 'crit', valCoefficient: 2.5 },
+    'IceBlade,SeeRed'
+  ),
+  new WeaponCategory(
+    'qici',
+    'weapon/鳍刺.png',
+    [
+      { type: 'atk', valCoefficient: 2 },
+      { type: 'bloc', valCoefficient: 1.2 },
+      { type: 'def', valCoefficient: 1.2 },
     ],
-  },
-  {
-    name: 'scarlet',
-    icon: 'U_Sword03.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.8 },
+    'QiCi'
+  ),
+  new WeaponCategory(
+    'kantou',
+    'weapon/砍头.png',
+    [
+      { type: 'atk', valCoefficient: 1.6 },
       { type: 'crit', valCoefficient: 1.5 },
-      { type: 'critDmg', valCoefficient: 1.3 },
+      { type: 'critDmg', valCoefficient: 1.5 },
     ],
-  },
-  {
-    name: 'death',
-    icon: 'U_Sword04.png',
-    entry: [
+    'BaoNue'
+  ),
+  new WeaponCategory(
+    'shangxin',
+    'weapon/伤心刺.png',
+    [
       { type: 'atk', valCoefficient: 1.8 },
+      { type: 'crit', valCoefficient: 1.2 },
+      { type: 'critDmg', valCoefficient: 1.8 },
+    ],
+    'ZhaXin'
+  ),
+  new WeaponCategory(
+    'aozhidu',
+    'weapon/鳌之毒.png',
+    [
+      { type: 'atk', valCoefficient: 1.6 },
+      { type: 'bloc', valCoefficient: 1.2 },
+      { type: 'hp', valCoefficient: 1.6 },
+    ],
+    'AoZhiDu'
+  ),
+  new WeaponCategory(
+    'shijiucha',
+    'weapon/十九叉.png',
+    [
+      { type: 'atk', valCoefficient: 1.2 },
+      { type: 'def', valCoefficient: 1.6 },
+      { type: 'hp', valCoefficient: 1.6 },
+    ],
+    'ShiJiuCha',
+    0.98
+  ),
+  new WeaponCategory('datiecheng', 'weapon/大铁城.png', [
+    { type: 'atk', valCoefficient: 4.2 },
+    { type: 'critDmg', valCoefficient: 4.2 },
+  ]),
+  new WeaponCategory(
+    'qingguang',
+    'weapon/青光.png',
+    [
+      { type: 'atk', valCoefficient: 1.5 },
       { type: 'crit', valCoefficient: 1.5 },
-      { type: 'critDmg', valCoefficient: 1.3 },
+      { type: 'critDmg', valCoefficient: 1.5 },
     ],
-  },
-  {
-    name: 'frostDragon',
-    icon: 'U_Sword05.png',
-    entry: [
+    'JianQiDongSiFang',
+    0.8
+  ),
+  new WeaponCategory(
+    'baoxue',
+    'weapon/暴雪.png',
+    [
       { type: 'atk', valCoefficient: 1.8 },
       { type: 'crit', valCoefficient: 1.5 },
       { type: 'critDmg', valCoefficient: 1.3 },
     ],
-  },
-  {
-    name: 'dragon',
-    icon: 'U_Sword06.png',
-    entry: [
+    'BaoFengXue'
+  ),
+  new WeaponCategory(
+    'shayi',
+    'weapon/杀意.png',
+    [
       { type: 'atk', valCoefficient: 2.8 },
-      { type: 'critDmg', valCoefficient: 2.2 },
-    ],
-  },
-  {
-    name: 'adventurer',
-    icon: 'U_Sword07.png',
-    entry: [
-      { type: 'atk', valCoefficient: 2.4 },
-      { type: 'hp', valCoefficient: 1.8 },
-    ],
-  },
-  {
-    name: 'seraphim',
-    icon: 'U_Sword08.png',
-    entry: [
-      { type: 'atk', valCoefficient: 2.6 },
-      { type: 'def', valCoefficient: 1.8 },
-    ],
-  },
-  {
-    name: 'shuzhuwan',
-    icon: 'U_Sword09.png',
-    entry: [{ type: 'atk', valCoefficient: 3.9 }],
-  },
-  {
-    name: 'leibse',
-    icon: 'U_Sword10.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.9 },
-      { type: 'def', valCoefficient: 1.2 },
-      { type: 'bloc', valCoefficient: 0.4 },
+      { type: 'crit', valCoefficient: 1.5 },
     ],
-  },
+    'BoDongShaYi',
+    0.9
+  ),
 ];
-export const weaponCategorys = [
-  {
-    name: 'hellrock',
-    icon: 'W_Sword016.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.2 },
-      { type: 'crit', valCoefficient: 1.3 },
-    ],
-  },
-  {
-    name: 'warrior',
-    icon: 'W_Sword007.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.2 },
-      { type: 'def', valCoefficient: 0.5 },
-    ],
-  },
-  {
-    name: 'redWillow',
-    icon: 'W_Sword019.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.3 },
-      { type: 'hp', valCoefficient: 1.1 },
-    ],
-  },
-  {
-    name: 'sword',
-    icon: 'W_Sword001.png',
-    entry: [{ type: 'atk', valCoefficient: 1.7 }],
-  },
-  {
-    name: 'waveBlade',
-    icon: 'W_Sword021.png',
-    entry: [{ type: 'atk', valCoefficient: 1.7 }],
-  },
-  {
-    name: 'furryPaw',
-    icon: 'W_Fist003.png',
-    entry: [
-      { type: 'atk', valCoefficient: 2 },
-      { type: 'crit', valCoefficient: 0.7 },
-    ],
-  },
-  {
-    name: 'iceCrystals',
-    icon: 'W_Sword018.png',
-    entry: [
-      { type: 'atk', valCoefficient: 1.4 },
-      { type: 'critDmg', valCoefficient: 1.3 },
-    ],
-  },
+
+export const weaponUniqueCategorys: WeaponCategory[] = [
+  new WeaponCategory('creation', 'U_Sword01.png', [
+    { type: 'atk', valCoefficient: 1.8 },
+    { type: 'crit', valCoefficient: 1.5 },
+    { type: 'critDmg', valCoefficient: 1.3 },
+  ]),
+  new WeaponCategory('nameless', 'U_Sword02.png', [
+    { type: 'atk', valCoefficient: 2.7 },
+    { type: 'crit', valCoefficient: 2.5 },
+  ]),
+  new WeaponCategory('scarlet', 'U_Sword03.png', [
+    { type: 'atk', valCoefficient: 1.8 },
+    { type: 'crit', valCoefficient: 1.5 },
+    { type: 'critDmg', valCoefficient: 1.3 },
+  ]),
+  new WeaponCategory('death', 'U_Sword04.png', [
+    { type: 'atk', valCoefficient: 1.8 },
+    { type: 'crit', valCoefficient: 1.5 },
+    { type: 'critDmg', valCoefficient: 1.3 },
+  ]),
+  new WeaponCategory('frostDragon', 'U_Sword05.png', [
+    { type: 'atk', valCoefficient: 1.8 },
+    { type: 'crit', valCoefficient: 1.5 },
+    { type: 'critDmg', valCoefficient: 1.3 },
+  ]),
+  new WeaponCategory('dragon', 'U_Sword06.png', [
+    { type: 'atk', valCoefficient: 2.8 },
+    { type: 'critDmg', valCoefficient: 2.2 },
+  ]),
+  new WeaponCategory('adventurer', 'U_Sword07.png', [
+    { type: 'atk', valCoefficient: 2.4 },
+    { type: 'hp', valCoefficient: 1.8 },
+  ]),
+  new WeaponCategory('seraphim', 'U_Sword08.png', [
+    { type: 'atk', valCoefficient: 2.6 },
+    { type: 'def', valCoefficient: 1.8 },
+  ]),
+  new WeaponCategory('shuzhuwan', 'U_Sword09.png', [{ type: 'atk', valCoefficient: 3.9 }]),
+  new WeaponCategory('leibse', 'U_Sword10.png', [
+    { type: 'atk', valCoefficient: 1.9 },
+    { type: 'def', valCoefficient: 1.2 },
+    { type: 'bloc', valCoefficient: 0.4 },
+  ]),
+];
+export const weaponCategorys: WeaponCategory[] = [
+  new WeaponCategory('hellrock', 'W_Sword016.png', [
+    { type: 'atk', valCoefficient: 1.2 },
+    { type: 'crit', valCoefficient: 1.3 },
+  ]),
+  new WeaponCategory('warrior', 'W_Sword007.png', [
+    { type: 'atk', valCoefficient: 1.2 },
+    { type: 'def', valCoefficient: 0.5 },
+  ]),
+  new WeaponCategory('redWillow', 'W_Sword019.png', [
+    { type: 'atk', valCoefficient: 1.3 },
+    { type: 'hp', valCoefficient: 1.1 },
+  ]),
+  new WeaponCategory('sword', 'W_Sword001.png', [{ type: 'atk', valCoefficient: 1.7 }]),
+  new WeaponCategory('waveBlade', 'W_Sword021.png', [{ type: 'atk', valCoefficient: 1.7 }]),
+  new WeaponCategory('furryPaw', 'W_Fist003.png', [
+    { type: 'atk', valCoefficient: 2 },
+    { type: 'crit', valCoefficient: 0.7 },
+  ]),
+  new WeaponCategory('iceCrystals', 'W_Sword018.png', [
+    { type: 'atk', valCoefficient: 1.4 },
+    { type: 'critDmg', valCoefficient: 1.3 },
+  ]),
 ];
 
 export const initialWeapon = () => {
   const type = 'weapon';
-  const qualityBean = new Quality(qualitys[0], type);
-  const base = new EquipBase('initial', 'W_Sword001.png', [new Entry('atk', 1, '+1', 100)]);
-  const extraEntry = [new Entry('atk', 1, '+1', 100)];
+  const qualityBean = new Quality(qualitys[0], coefficient[qualitys[0]], '');
+  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) => {
+export const createweapon = (quality, lv, category, extraQuality) => {
   const type = 'weapon';
-  const qualityBean = new Quality(quality, type);
-  const base = createBase(quality, lv);
+  const qualityBean = new Quality(quality, coefficient[quality], extraQuality);
+  const base = createBase(quality, lv, category, coefficient, extraQuality);
   const extraEntry = new Array();
   const extraEntryNum = extra_entry_num[quality];
   for (let i = 0; i < extraEntryNum; i++) {
-    extraEntry.push(weaponExtraEntry(quality, lv));
+    extraEntry.push(weaponExtraEntry(quality, lv, extraQuality));
   }
   return new Equip(type, lv, qualityBean, base, extraEntry);
 };
 
-export const weaponExtraEntry = (quality, lv) => {
-  const type = extraEntrys[Math.floor(Math.random() * extraEntrys.length)];
-  const initor = entry_initor[type];
-  const qualityCoefficient = quality_coefficient.weapon[quality];
-  const entry = initor(lv, qualityCoefficient);
-  return entry;
+export const weaponExtraEntry = (quality, lv, extraQuality) => {
+  return createExtraEntry(quality, lv, extraEntrys, coefficient, extraQuality);
 };
 
-const createBase = (quality, lv) => {
-  const array = quality == 'unique' ? weaponUniqueCategorys : weaponCategorys;
-  const category = array[Math.floor(Math.random() * array.length)];
-  const entry = new Array();
-  category.entry.forEach((item) => {
-    const initor = entry_initor[item.type];
-    const qualityCoefficient = quality_coefficient.weapon[quality];
-    entry.push(initor(lv, qualityCoefficient, item.valCoefficient));
-  });
-  return new EquipBase(category.name, category.icon, entry);
-};
+export const weaponSamples = createSamples(weaponCategorys, weaponUniqueCategorys, weaponColorfulCategorys, 'weapon', coefficient);
diff --git a/src/config/i18n/index.ts b/src/config/i18n/index.ts
index bda7dac..11cb253 100644
--- a/src/config/i18n/index.ts
+++ b/src/config/i18n/index.ts
@@ -1,4 +1,4 @@
-import { createI18n } from 'vue3-i18n';
+import { createI18n, I18nInstance } from 'vue3-i18n';
 import Zh from './zh';
 import En from './en';
 
@@ -11,4 +11,18 @@ const i18n = createI18n({
   messages,
 });
 
-export default i18n
+export const createt = (sufix: string) => {
+  return (key: string): string => {
+    key = sufix + key;
+    return i18n.t(key);
+  };
+};
+
+// export class Myi18n {
+//   mt: (key: string) => string;
+//   constructor(sufix: string) {
+//     this.mt =
+//   }
+// }
+
+export default i18n;
diff --git a/src/config/i18n/zh/euips.ts b/src/config/i18n/zh/euips.ts
new file mode 100644
index 0000000..f460817
--- /dev/null
+++ b/src/config/i18n/zh/euips.ts
@@ -0,0 +1,234 @@
+export const quality = {
+  shabby: '破旧',
+  ordinary: '普通',
+  artifact: '神器',
+  epic: '史诗',
+  unique: '独特',
+  colorful: '神话',
+};
+export const extraQuality = {
+  yuangu: '远古',
+  taigu: '太古',
+};
+export const weapon = {
+  type: '武器',
+  qiuai: ['求爱', '我不是在求你爱我，而是，不接受我的爱，你就要死。    ----琵琶精'],
+  qici: ['鳍刺', '这美丽簪成了夺命的刺。多少年后，你还记得是谁曾以此为你绾起青丝。'],
+  kantou: ['砍头', '你知道比砍头更痛苦的是什么吗？'],
+  shangxin: ['伤心刺', '比砍头更痛苦的，是伤心。'],
+  aozhidu: ['鳌之毒', '相思有毒，曲终无怨。'],
+  shijiucha: ['十九叉', '每个人都至少有两面。但据说它的主人会有十九个人格。'],
+  datiecheng: ['大铁城', '其重如一整座冥铁打造的郢都城。'],
+  qingguang: ['青光', '你活着看到的最后东西是一道青光。'],
+  baoxue: ['暴雪', '铁匠将交付时间推延了二十四次。'],
+  shayi: ['杀意', '仇敌，莫让吾听闻汝名。'],
+  chengba: ['称霸', '霸者不藏其锋，以天地为鞘。'],
+  chulian: ['初恋', '我的初恋在月亮之上。    ----八戒'],
+  duwu: ['黩武', '若未用够最后一丝力气，如何能甘心。'],
+  emeng: ['噩梦', '我最近的噩梦，都和一只猴子有关......    ----增长天王'],
+  heifeng: ['黑风', '这把斧子一直不肯相信它的主人已经死去。'],
+  shishen: ['弑神', '从斩妖台流落到地府的禁忌之物，慎用。'],
+  jlys: ['九灵·元圣', '当坐骑总比没命了强。'],
+  llzx: ['冷龙之心', '长九尺三寸，苍青之气盘绕九十三匝。'],
+  lmlr: ['狸猫利刃', '比时光还要无情。'],
+  liuying: ['流萤', '若不困顿於林野，必凄惶於道路。'],
+  liubuxiang: ['六不像', '汝若身披业火，当一念不起，六欲尽灭。'],
+  longxian: ['龙衔', '天之西北有幽冥无日之国，有龙衔烛而照之也。'],
+  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: '防具',
+  baihua: ['百花内甲', '内甲缝着一个香囊，本有百花香，如今只余勿忘我。'],
+  heixi: ['黑犀', '本是七星剑的剑鞘，被小妖偷来做成了皮甲一副，冬暖夏凉。'],
+  guiwen: ['龟纹铠', '督军穿上这件铠甲后觉得自己有了顶撞正妻的勇气，事后证明是幻觉。'],
+  wuxing: ['五行压贴', '除了玄奘，谁都不准动！'],
+  bianfu: ['蝙蝠氅', '穿上它，你能在一秒钟内分辨二百五十组回音。'],
+  dongfang: ['东方', '陆吾时常遥望东方，没有人知道他看到了什么。'],
+  dourong: ['斗融之甲', '它的主人最后成了一条龙的食物。'],
+  guimen: ['鬼门甲', '不要妄图破坏它，它曾经是冥界之门的一部分。'],
+  gyft: ['鬼蜮焚天', '三途河岸那魅惑者亡灵、怒火焚天的红花。'],
+  hubugui: ['狐不归', '刀锋冷，映月辉；世情浊，胡不归？'],
+  meirengu: ['美人鼓', '白骨夫人曾鼓与花果山以壮百万妖君，声阙五百里'],
+  tiancheng: ['天成', '石像天成，好事者略施雕琢。'],
+  tungui: ['吞鬼甲', '执搏挫锐，噬食鬼魅。画虎于门，鬼不敢入。'],
+  yanyu: ['炎狱', '穿在身上全身毛孔都要冒烟了。'],
+  yufu: ['鱼腹', '藏玉泥中，匿珪鱼腹'],
+  dispute: ['争执连身衣', '争执连身衣'],
+  jianHao: ['剑豪盔甲', '剑豪盔甲'],
+  samurai: ['隐武士铠甲', '隐武士铠甲'],
+  trackers: ['芬撒里尔追踪者', '芬撒里尔追踪者'],
+  rongYi: ['肃清者戎衣', '相传看到这一袭黑衣的人都死了。'],
+  nightwear: ['红月的夜行衣', '红月的夜行衣'],
+  wildDragon: ['先代狂龙战士盔甲', '先代狂龙战士盔甲'],
+  guard: ['紫金守护胸甲', '够肉才能输出'],
+  redWillow: ['赤柳血铠', '似乎会给使用者提供生命气息'],
+  warrior: ['战士重铠', '六级战士使用的重型铠甲'],
+  lightArmor: ['天权轻甲', '舍弃了防御性能的轻甲，因为更加轻便，攻击性能更加突出'],
+  furryArmor: ['哈皮毛毛连身衣', '哈皮毛毛'],
+  initial: ['新手布衣', '新手菜鸡穿的破旧衣物'],
+};
+export const neck = {
+  type: '项链',
+  chitong: ['赤瞳金玉坠', '传闻为仙族神器。佩戴者回洞悉敌人的弱点。'],
+  duanji: ['断·极', '若众生都断了情欲，那世间岂不是一色苍凉。'],
+  hushi: ['虎视', '我看见了你，偷丹贼。    ----三仙的丹房'],
+  xuenu: ['血怒', '我们都曾把愤怒埋藏在鲜血里。'],
+  guiyan: ['鬼眼', '多少楼台平山演，鬼使飞阁绿林空。'],
+  longteng: ['龙腾护心镜', '腾龙即出，四海来朝。'],
+  fannao: ['百八烦恼珠', '求人不如求己。'],
+  zhuxian: ['诛仙', '原来，神的身体流动的血，都是冷的。'],
+  fodengyou: ['佛灯油', '听说灵山永寂，灯影不摇，我若去了，便叫它风起云动。    ----黄风大圣'],
+  aige: ['姜氏哀歌', '这悲伤的歌声浸透了这条项链，你听。'],
+  limao: ['狸猫内丹', '影中之影，幻中之幻。'],
+  lenglong: ['冷龙', '避暑圣物。'],
+  liuli: ['琉璃碎片', '有人在人间寻找了它整整五百年。'],
+  nvwangfeng: ['女王蜂项链', '以毒攻毒，百毒不侵。'],
+  fouzhu: ['十八念佛珠', '别人念佛是为了求如来保佑，如来念佛又是为了什么。'],
+  wuxinggui: ['太乙神器 五行圭', '太乙出品，必属精品。'],
+  zhongsheng: ['众生醉', '美酒斟杯莫思量，烦丝一甩九霄扬。'],
+  bianhua: ['最初的彼岸花', '三千年生叶，叶落始开花。三千年开花，花谢始叶生。'],
+
+  demonSlayer: ['十字旅团降魔项链', '十字旅团降魔项链'],
+  darkDragon: ['进阶黑暗龙王项链', '进阶黑暗龙王项链'],
+  single: ['单身贵族项链', '真棒，真帅。有了这条帅气的项链，一辈子单身都不会孤独'],
+  demons: ['魔族之翼展', '你能看到什么呢'],
+  ipaya: ['伊帕娅之项链', '伊帕娅之项链'],
+  crusade: ['十字军项链', '十字军佩戴的项链'],
+  gintamaEyes: ['银魂之眼', '银魂之眼'],
+  iceDragon: ['冰龙凝雪', '冰龙凝雪'],
+  initial: ['新手项坠', '一个破旧的的项链'],
+};
+export const ring = {
+  type: '戒指',
+  jingangzhuo: ['金刚琢', '无敌。'],
+  pojie: ['破戒', '我心中爱你美丽，怎能嘴上装四大皆空。    ----金蝉子'],
+  mantanghong: ['满堂红', '青灯知有喜，花发满堂红。'],
+  hanba: ['旱魃', '国师与旱魃斗法七日，始有甘霖降车迟国。'],
+  yaozuzhili: ['妖族之力', '妖王的荣耀。'],
+  siyan: ['四眼', '我花了十万年才长出一只眼睛。'],
+  taiyang: ['太阳真火戒', '这里面有太阳的光辉。'],
+  taiyin: ['太阴紫电戒', '这里面有月亮的锋芒。'],
+  zhengui: ['镇鬼', '妖王的血染红了他，而群鬼闻之顿寂。'],
+  bingxin: ['冰心', '这是一颗世间最冷的心，再没有更寒的霜可以加诸其上。'],
+  huangquan: ['黄泉之尘', '这尘埃上有一个黄泉的国度。'],
+  lengqie: ['楞伽指环', '楞伽，此云难入。'],
+  luwuzhimu: ['陆吾之目', '似乎随时会睁开。'],
+  yishan: ['移山', '山神很忙。'],
+  binglin: ['冰粼暮光', '灭却心头火，剔起佛前灯。'],
+  chuixian: ['垂涎', '最好不要吵醒一只冬眠的熊。    ----黑风大王的冬眠居'],
+  cike: ['刺客', '最强的刺客总是无名。'],
+  guichan: ['鬼缠', '小鬼难缠。'],
+  guigu: ['鬼骨戒', '世道酆都阴城险，我觉弹指一笑间。'],
+  jinjiezhi: ['金戒指', '这下你应该满意了吧！'],
+  wangyue: ['望月', '犀牛望月，其影于角。燃其犀角，可见冥界诸灵。'],
+  wumingjie: ['无名戒', '某个在孽镜台被吃掉的倒霉鬼的遗物。'],
+
+  death: ['死神名片戒指', '死神名片戒指'],
+  realFurryRing: ['真·毛毛指环', '死神名片戒指'],
+  pioneer: ['先驱者戒指', '先驱者戒指'],
+  susan: ['素盏呜尊的意志', '素盏呜尊的意志'],
+  moonlight: ['月夜见尊的意志', '月夜见尊的意志'],
+  life: ['生命指环', '据说拥有增强佩戴者体质的神秘功效'],
+  imperialSoul: ['御魂之戒', '出来吧，卡赞！吸纳所有彷徨的灵魂！   ——鬼剑士约翰'],
+  furryRing: ['毛毛指环', '喵喵戒指，上面有没有摸到毛毛jio的怨念'],
+  initial: ['新手指环', '一个破旧的的指环'],
+};
+export const jewelry = {
+  type: '饰品',
+  tuyao: ['屠妖', '没有妖证明过“自由”两个字，试图证明得妖，都死了'],
+  shadan: ['杀旦头饰', '好一个三生醉的大青衣，转眼是冷如冰的刺杀旦!'],
+  simianta: ['太乙神器·四面塔', '李天王有一次差点拿错了。'],
+  shuzhuang: ['梳妆镜', '都上来，一个个仔细看打!    ----琵琶精'],
+  liulipan: ['琉璃盘', '盘底书:凌虚子制。'],
+  ghdp: ['勾魂夺魂', '神鬼游舍，摄魂夺魄。'],
+  youerhuan: ['白骨夫人的右耳环', '你一定以为还有左耳环，这个真没有。    ----白骨夫人'],
+  jingboyu: ['金钵盂', '大众休言，妖精未走，见在我这钵盂之下。    ----如来'],
+  zijingboyu: ['紫金钵盂', '金饭碗'],
+  hanjing: ['寒晶佩', '蜡烛红的珊瑚枝，其色芬然如火。'],
+  ylhm: ['月灵幻梦', '天际间散落的银砂，汇聚月之灵华发出冰洁的光芒，它将随着少年的脚步，指引他们找到家的方向。'],
+  liangren: ['良人', '空香唤蝶，良人未来。莱葭渐冷，相思已破。'],
+  duzhan: ['督战', '死战不退。'],
+  weihun: ['未婚', '本应是香艳的一晚，却不见你的欢惀之色    ----琵琶精的婚房'],
+  cltx: ['赤羚天禧', '白羊一阵如仙醉，蝶戏花儿牧女追。'],
+  huangyan: ['谎言', '神说他们爱世人，所以给他们苦难。'],
+  zhenjing: ['真经', '我不相信。    ----玄奘'],
+  maming: ['马鸣玉佩', '有天下之马初喃之音，慷慨非常。'],
+  shiwangsy: ['狮王手印', '最强三人组的唯一标识，仿冒必究。'],
+};
+export const pants = {
+  type: '裤子',
+  guijia: ['鬼甲', '据说是由鬼魂的怨念凝聚而成。'],
+  baizhequn: ['荃英的百褶裙', '每一个褶子里，都是荃英的心血。'],
+  yulan: ['鱼篮', '观世音菩萨在紫竹林以六十二亿根竹篾编织而成。'],
+  qiutu: ['囚徒', '躯体，是思想的最大囚笼。'],
+  wuwei: ['五味', '酸多伤脾，苦多伤肺，辛多伤肝，甘多伤肾，咸多伤心。'],
+  mhlg: ['梦回龙宫', '沧海离歌一阕悲，梦里龙宫几度回。'],
+  longlin: ['龙鳞胫甲', '每一片鳞片都来之不同的龙，包括四海龙王'],
+  cangjing: ['藏经甲', '内刻小乘佛法精意。'],
+  egui: ['饿鬼', '饿鬼诞下的孩子，任是饿鬼。'],
+  qijia: ['泣甲', '这山一般高大的白骨里禁锢着一个弱小不堪的魂魄。'],
+  kaishulin: ['铠鼠鳞', '十万粒黄沙打磨，光鲜可鉴。'],
+  guanjia: ['管家服', '有些异味，最好先洗一洗。'],
+  shengxian: ['升仙', '你只需要明白，真正得赐仙籍的，都不会走升仙台。'],
+  initial: ['新手裤子', '新手菜鸡使用的破旧裤子。'],
+};
+export const shoes = {
+  type: '鞋子',
+  lingyun: ['灵韵集能器', '闪开，俺老孙还有一个很重要的约会。'],
+  siben: ['私奔', '这些年，除了爱，我一无所有，但你不爱我的一无所有。    ----荃木狼'],
+  qxzl: ['浅夏紫灵', '夏日么么哒！'],
+  xuedun: ['血遁靴', '客观，赶着投胎么？我想你需要他。    ----郢都城门鬼差'],
+  wajiang: ['蛙将足', '大小刚刚合适。'],
+  talang: ['踏浪', '东海水晶宫出品。'],
+  jiuwanli: ['九万里', '逐风而来。'],
+  hongchen: ['红尘', '滚滚红尘里有隐约的耳语，跟随我俩的传说。'],
+  lingguan: ['灵官靴', '天上之物，不染凡尘。'],
+  quanchi: ['犬齿鞋', '犬齿交错。'],
+  kunlun: ['昆仑履', '即使名字也已经忘却，始终不曾忘却自己的使命。'],
+  initial: ['新手鞋子', '新手菜鸡使用的破旧鞋子'],
+};
+export const bracers = {
+  type: '护腕',
+  limao: ['狸猫足印', '无声，快速，锐利，不可思议。'],
+  dushe: ['毒蛇', '即使血是冷的，但你又怎知它不向往温暖。'],
+  xianglong: ['降龙', '见龙在田，利见大人。'],
+  huojing: ['火晶环', '闻上去有股老君八卦炉中丹屑的味道。'],
+  xingjia: ['刑枷', '我无法为野心套上邢枷，所以只好走向毁灭。'],
+  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 51%
rename from src/config/i18n/zh.ts
rename to src/config/i18n/zh/index.ts
index 8b416b2..7e8e0e9 100644
--- a/src/config/i18n/zh.ts
+++ b/src/config/i18n/zh/index.ts
@@ -1,3 +1,7 @@
+import { weapon, armor, neck, ring, jewelry, pants, shoes, bracers, quality, extraQuality } from './euips';
+import * as skills from './skills';
+import * as point from './point';
+
 export default class Zh {
   title = '挂机放置游戏';
 
@@ -10,101 +14,50 @@ export default class Zh {
   sellLocked = '装备已锁定，请先解锁再出售';
   sellEquip = '出售装备获得金币';
   stFinish = '装备已经达到目标强化等级。';
-  stNoCoins = '钱不够啊，强化啥呢。';
+  stNoCoins = '钱不够啊，想啥呢。';
   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: ['新手指环', '一个破旧的的指环'],
-  };
+  weapon = weapon;
+  armor = armor;
+  neck = neck;
+  ring = ring;
+  jewelry = jewelry;
+  pants = pants;
+  shoes = shoes;
+  bracers = bracers;
+  quality = quality;
+  extraQuality = extraQuality;
+  skill = skills;
 
-  quality = {
-    shabby: '破旧',
-    ordinary: '普通',
-    artifact: '神器',
-    epic: '史诗',
-    unique: '独特',
-  };
+  point = point;
 
   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 = ['金币', '你拥有的金币数量', '在这里，钱就是万能的'];
 
   equip = '装备';
   backpack = '背包(B)';
+  addGrid = ['扩充背包', '是否花费${0}金币扩充${1}格背包？', '废话，不差钱', '算了，太贵了', '背包最多扩充到${0}格'];
   neaten = '一键整理';
   use = '装备';
   strengthen = '强化';
@@ -120,7 +73,8 @@ export default class Zh {
     '强化概率：6级80%，7级65%，8级45%，9级30%，10级以后20%',
   ];
   reforge = '重铸';
-  reforgeDesc = ['重铸说明', '点击任意词条花费金币重铸装备所有词条', '重铸时词条颜色与百分比值显示了该词条的等级'];
+  reforgeAction = ['点击花费${0}金币重铸', '恢复原词条', '保留新词条'];
+  reforgeDesc = ['点击任意词条花费金币重铸装备所有词条', '重铸时词条颜色与百分比值显示了该词条的等级', '重铸后可选择保留原词条或新词条'];
   lock = '锁定';
   unlock = '解锁';
   sell = '出售';
@@ -134,6 +88,7 @@ export default class Zh {
   ];
   cannotInherited = ['身上对应部分并未穿戴装备，无法继承', '身上装备强化等级小于或等于当前装备，无需继承'];
   inheritedConfirm = ['确认继承', '继承后被继承装备强化等级将清零，确认要继承吗？', '哥有钱，点了', '算了', '装备继承成功'];
+  reRoll = ['重ROLL概率', 'ROLL到该装备后重新ROLL取装备的概率，概率越大代表掉落概率越低。'];
 
   shop = '商店(S)';
   watiTime = '下次刷新次数获取：';
@@ -149,17 +104,37 @@ export default class Zh {
   autoSell = ['自动出售设置', '若勾选会在副本获得该品质装备时自动出售，背包满时自动出售所有品质装备', '自动出售装备'];
 
   dungeon = '副本(T)';
-  difficulty = ['简单', '普通', '困难', '极难'];
-  dungeonTips = ['当前副本难度', '双击或右键开始挑战副本'];
+  //   difficulty = ['简单', '普通', '困难', '极难', '小秘境', '大秘境'];
+  difficulty = {
+    normal: '普通',
+    hard: '困难',
+    pain: '极难',
+    xiaomi: '小秘境',
+    dami: '大秘境',
+  };
+  layer = '层';
+  dungeonTips = [
+    '当前副本',
+    '当前副本BOSS额外爆率',
+    '正常副本难度等级为：普通、困难、极难',
+    'BOSS有概率额外掉落独特装备，难度越高爆率越高',
+    '100以后开放小秘境和大秘境',
+    '大小秘境有概率掉落神话品质装备',
+    '神话品质装备有概率提升为远古神话或太古神话',
+    '大秘境有概率掉落强化相关卷轴（未实装）',
+  ];
+  dungeonAction = ['重复挑战', '向上挑战', '开始挑战'];
 
-  monster = '副本普通怪物';
-  boss = '副本首领';
-  eliteMonster = '无尽模式精英怪';
+  player = '你';
+  monster = '小怪';
+  boss = '首领';
   startDungeon = '你已进入';
-  battle = '你遭遇了(lv${lv}${name}),正在战斗中...';
-  bouts = ['点击查看战斗过程', '回合', '触发了暴击', '你造成了${dmg}点伤害', '受到${dmg}点伤害', '战斗结束', '你获胜', '你战败'];
-  killMonster = '你击杀了(lv${lv}${name})，共受到了${dmg}点伤害';
-  beKilled = '你被(lv${lv}${name})击败，共受到了${dmg}点伤害';
+  battle = '你遭遇了(${0}${1}),正在战斗中...';
+  bouts = '点击查看战斗过程';
+  //   bout = ['回合', '你使用了【${0}】', '触发了暴击', '造成了${0}点伤害', '受到${0}点伤害', '战斗结束', '你获胜', '你战败', '偷取${0}点生命', '反弹${0}点伤害'];
+  bout = ['战斗结束,你获胜', '战斗结束,你战败'];
+  killMonster = '你击杀了(lv${0}${1})，累计（减去偷取）受到了${2}点伤害';
+  beKilled = '你被(lv${0}${1})击败，累计（减去偷取）受到了${2}点伤害';
   getCoins = '获得金币:';
   uniqueBooty = '稀有掉落';
   dungeonSuccess = '副本探索成功';
@@ -181,7 +156,8 @@ export default class Zh {
   copyArchive = ['复制存档', '已经复制存档了，建议保存到备忘录', '复制存档失败'];
   pasteArchive = ['粘贴存档', '粘贴存档内容到输入框成功', '粘贴失败'];
   cleanArchive = ['删除存档'];
-  importArchive = ['导入', '导入存档成功，继续游戏吧！', '导入存档失败'];
+  importArchive = ['导入', '导入存档成功，继续游戏吧！', '导入存档失败', '存档版本已过期，无法导入！'];
+  experiential = ['导入体验存档成功，体验时间${0}分钟。', '体验存档无法保存！', '体验时间已过，自动读取本地存档。'];
 
   music = ['播放或禁音背景音乐(M)'];
 
diff --git a/src/config/i18n/zh/point.ts b/src/config/i18n/zh/point.ts
new file mode 100644
index 0000000..420226d
--- /dev/null
+++ b/src/config/i18n/zh/point.ts
@@ -0,0 +1,6 @@
+export const menu = '属性加点(P)';
+export const desc = ['每级获得1属性点', '满级后通关小秘境和大秘境可以获取属性点', '最多可获取2000属性点'];
+export const total = '已获得属性点:';
+export const has = '可用属性点:';
+export const addPoints = '左键+1，右键+10';
+export const subtractPoints = '左键-1，右键-10';
diff --git a/src/config/i18n/zh/skills.ts b/src/config/i18n/zh/skills.ts
new file mode 100644
index 0000000..02772f7
--- /dev/null
+++ b/src/config/i18n/zh/skills.ts
@@ -0,0 +1,97 @@
+export const action = '主动';
+export const passive = '被动';
+
+export const user = '${0}使用了${1},';
+export const control = ['${0}被控制${1}回合', '控制失败', '受${0}影响，${1}无法释放技能。'];
+export const crit = ['触发了暴击'];
+
+export const attack = ['普通攻击', '伤害倍率100%', '${0}使用了${1}${4},对${2}造成了${3}点伤害'];
+export const iceBlade = ['冰刃', '暴击时有${0}几率释放冰线冲击,附加${1}%攻击力的伤害和${2}回合冰冻效果。', '触发了冰刃,附加${0}点伤害,冰冻${1}${2}回合'];
+export const seeRed = ['见红', '对目标施加${0}层流血，持续${1}回合。', '冷却${0}回合。'];
+export const qici = ['鳍刺', '攻击时有${0}%概率对目标施加${1}层流血，持续${2}回合。', '触发鳍刺，对${0}施加${1}层流血，持续${2}回合。'];
+export const baonue = ['暴虐', '攻击时有${0}%概率使目标筋脉爆裂，施加满层流血，持续${1}回合。', '触发暴虐，对${0}施加满层流血，持续${2}回合。'];
+export const zhaxin = ['扎心', '获得${0}%暴击伤害加成。'];
+export const aozhidu = ['鳌之毒', '攻击时使目标进入溃烂状态${0}回合。', '触发鳌之毒，${0}进入溃烂状态${1}回合'];
+export const shijiucha = ['十九叉', '每九次攻击获得连刺状态，使得第十次攻击附加${0}倍伤害。', '${0}触发十九叉连刺，附加${0}点伤害'];
+export const jianqidongsifang = ['剑气动四方', '攻击造成的伤害增加${0}%，但被攻击时受到的伤害也增加${1}%。'];
+export const baofengxue = ['暴风雪', '使目标进入冰冻状态${0}回合，冷却${1}回合。对boss只有${2}%成功率。'];
+export const bodongshayi = ['波动杀意', '每层杀意提升的基础攻击力提高到${0}%，并且杀意最多可以叠加${1}层'];
+
+export const bhxdjc = [
+  '百花羞的矜持',
+  '当生命值低于${0}%时，获得自身最大生命值${1}%的护盾（护盾能吸收等额伤害，但每回合自然衰减10%），此效果每场战斗只能触发一次。',
+  '触发百花羞得矜持，获得${0}点护盾。',
+];
+export const tiebi = ['铁壁', '获得${0}%伤害减免，持续${1}回合，冷却时间${2}回合', '${0}使用了铁壁，获得${1}%伤害减免，持续${2}回合。'];
+export const dujunqianneng = ['督军的潜能', '生命值低于${0}%时，获得${1}%伤害减免。', '血量低于${0}%，触发督军的潜能，获得${1}%伤害减免。'];
+export const jinguanghushen = ['金光护身', '抵抗一次死亡，并回复${0}%的生命，此效果每场战斗只能触发一次。', '触发金光护身，回复${0}%生命。'];
+export const laobukepo = ['牢不可破', '提升${0}%格挡值。'];
+
+export const xingyunshuzi = [
+  '幸运数字',
+  '战斗开始时随机获得一个幸运数字，若攻击造成的伤害以幸运数字结尾，则额外造成幸运数字倍伤害。',
+  '${0}在本场战斗的幸运数字为：${1}。',
+  '触发幸运数字，对${0}额外造成${1}点伤害',
+];
+export const duan = ['断', '攻击目标后，若目标血量低于${0}%，则直接处决目标。', '目标血量低于${0}%，触发【断】，造成${1}点伤害'];
+export const hongyan = ['红眼', '生命低于${0}%时，提高${1}点基础攻击力，且攻击附加${2}%攻击力的伤害。', '血量低于${0}%，触发红眼，附加${1}点伤害。'];
+export const shayi = [
+  '杀意',
+  '攻击时增加一层杀意（每层杀意提升${0}%基础攻击力），被暴击则减少${1}层，杀意最多叠加${2}层。',
+  '增加一层杀意，当前${0}层',
+  '被暴击,减少${0}层杀意。',
+];
+export const numu = ['怒目', '被攻击时提升${0}%基础攻击力，最多叠加${1}层。', '增加一层怒目，当前${0}层'];
+export const longteng = ['龙腾护佑', '获得${0}%伤害减免，被攻击时有${1}%概率获得${2}%生命上限的护盾。', '触发龙腾护佑，获得${0}点护盾。'];
+
+export const SLWX = ['森罗万象', '增加${0}%攻击加成、伤害加成、暴击率、暴击伤害。'];
+export const jinggangzhuo = ['金刚琢', '攻击时有${0}%几率使目标进入缴械状态${1}回合。', '触发金刚镯，目标缴械${0}回合'];
+export const fengxie = ['奉邪', '每次暴击，增加${0}%的暴击伤害，最多叠加${1}层，未暴击时层数清零。', '触发奉邪，当前${0}层。', '奉邪层数清零。'];
+export const shizhong = ['噬忠', '每次被暴击，增加${0}%的暴击伤害减免，最多叠加${1}层，持续到战斗结束。', '触发噬忠，当前${0}层。'];
+export const shenshang = ['神赏', '暴击时有${0}%概率恢复自身生命${1}点。', '触发神赏，恢复生命${0}点。'];
+export const tongjuefanji = [
+  '痛觉反击',
+  '每次受到暴击时，对目标使用刺痛反击，伤害倍率${0}%。',
+  '触发反击，对${0}造成${1}点伤害。',
+  '${0}被控制，无法释放技能。',
+];
+
+export const fate = ['化缘', '副本掉落金币奖励提高${0}%。'];
+export const vampire = ['汲血', '生命偷取${0}%。', '触发汲血,偷取${0}点生命'];
+export const prototype = ['现原形', '将目标变为猴子，持续${0}回合，冷却${1}回合，对boss只有${2}%成功率。'];
+export const critFear = ['暴击恐惧', '暴击时附加${0}%攻击力的额外伤害。', '触发暴击恐惧,附加${0}点伤害。'];
+export const liulipan = ['琉璃盘', '使用后产生黑红内丹,临时提高${0}点基础攻击力进行攻击,冷却${1}回合。'];
+export const JHSY = ['镜花水月', '被攻击时有${0}%概率反弹${1}%所受伤害。', '${0}触发了镜花水月,反弹${1}点伤害。'];
+
+export const lizhao = ['利爪', '攻击时有${0}%概率增加${1}%技能伤害倍率。', '触发利爪，增加${0}%技能伤害倍率。'];
+export const judu = ['剧毒', '被攻击时有${0}%概率喷出毒液，使目标进入溃烂状态${1}回合。', '触发剧毒，${0}进度溃烂状态${1}回合。'];
+export const xianglong = ['降龙', '攻击时，若生命值低于${0}%，增加${1}%伤害加成。', '触发降龙，增加${1}%伤害加成。'];
+export const dalidan = ['大力丹', '提升${0}%攻击加成。'];
+
+export const kongbulingyu = ['恐怖领域', '周围敌方目标防御力降低${0}点。', '防御力降低${0}点。'];
+export const furenbihu = [
+  '白骨夫人的庇护',
+  '血量低于${0}%时，获得${1}%伤害减免，持续${2}回合，此效果每场战斗只能触发一次。',
+  '血量低于${0}%，触发白骨夫人的庇护，获得${1}%伤害减免',
+];
+export const linggan = ['灵感', '每回合回复${0}%生命。'];
+export const wankang = ['顽抗', '被攻击时反弹${0}%所受伤害，最大反弹值等于${1}%生命上限。', '${0}触发顽抗,反弹${1}点伤害'];
+export const wuwei = ['五味', '获得${0}%伤害减免。'];
+
+export const atkbuff = ['提升${0}点基础攻击力。', '提升${0}%基础攻击力。', '提升${0}%攻击加成。', '提升${0}%伤害加成。'];
+export const critbuff = ['提升${0}%暴击率。', '提升${0}%暴击伤害。', '提升${0}%暴击减免。', '提升${0}%暴击伤害减免。'];
+export const defbuff = ['提升${0}点防御。', '提升${0}%防御。', '获得${0}%伤害减免。'];
+export const blocbuff = ['提升${0}点格挡。', '提升${0}%格挡。'];
+export const kuilan = '防御降低${0}%。';
+export const liuxue = ['每回合流失%{0}当前生命值', '受（${0}层）流血影响，${1}损失${2}生命值。'];
+
+//未实装，待补充
+
+export const ruiyayin = ['锐牙印', '攻击时有${0}概率偷取目标${1}%暴击率，持续${2}回合。'];
+
+export const xuanwo = ['漩涡', '攻击时有${0}概率提升${1}%点基础攻击力，持续${2}回合，冷去${3}回合。'];
+
+export const shichou = ['世仇', '每回合对周围地方目标施加震慑（攻击力降低${0}%）状态，最多叠加${1}层。'];
+export const nuyi = ['奴役', '攻击时有${0}概率附加尸毒，持续${1}回合，若目标在尸毒持续时间内死亡，则回复所有生命。'];
+export const jiupinjinlian = ['九品金莲', '目标死亡时有${0}%概率额外掉一件装备。'];
+export const zhuanjie = ['黑白钻戒', '获得${0}%伤害减免。'];
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/armor.ts b/src/config/skill/armor.ts
new file mode 100644
index 0000000..b8a9854
--- /dev/null
+++ b/src/config/skill/armor.ts
@@ -0,0 +1,84 @@
+import { PrePassiveSkill, BuffSkill, CounterSkill, StartPassiveSkill } from './base';
+import i18n from '../i18n';
+import { BattleRole, callDmgReduc, replace } from '@/tool';
+import { BlocPercentBuff } from './buff';
+const { t } = i18n;
+
+//百花羞的矜持
+export class BHXDJC extends PrePassiveSkill {
+  name: string = 'bhxdjc';
+  hpPercent: number = 60;
+  shieldPercentOfHp: number = 80;
+  cd: number = 999;
+  desc(): string {
+    return replace(t('skill.bhxdjc.1'), [this.hpPercent, this.shieldPercentOfHp]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.attr.curHp / owner.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const shield = Math.ceil((owner.attr.hp * this.shieldPercentOfHp) / 100);
+    owner.shield += shield;
+    owner.battleLog(replace(t('skill.bhxdjc.2'), [shield]));
+  }
+}
+//铁壁
+export class TieBi extends BuffSkill {
+  name: string = 'tiebi';
+  last: number = 4;
+  cd: number = 6;
+  dmgReduc: number = 40;
+  desc(): string {
+    return replace(t('skill.tiebi.1'), [this.dmgReduc, this.last, this.cd]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.extraAttr.dmgReduc = callDmgReduc(owner.extraAttr.dmgReduc, this.dmgReduc);
+  }
+  log(owner: BattleRole, target: BattleRole): void {
+    owner.battleLog(replace(t('skill.tiebi.2'), [t(owner.type), this.dmgReduc, this.last]));
+  }
+}
+//督军的潜能
+export class DuJunQianNeng extends PrePassiveSkill {
+  name: string = 'dujunqianneng';
+  hpPercent: number = 50;
+  dmgReduc: number = 40;
+  desc(): string {
+    return replace(t('skill.dujunqianneng.1'), [this.hpPercent, this.dmgReduc]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.attr.curHp / owner.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.extraAttr.dmgReduc = callDmgReduc(owner.extraAttr.dmgReduc, this.dmgReduc);
+    owner.battleLog(replace(t('skill.dujunqianneng.2'), [this.hpPercent, this.dmgReduc]));
+  }
+}
+//金光护身
+export class JinGuangHuShen extends CounterSkill {
+  name: string = 'jinguanghushen';
+  cd: number = 999;
+  hpPercent: number = 35;
+  desc(): string {
+    return replace(t('skill.jinguanghushen.1'), [this.hpPercent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.isDeath();
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.addHp((owner.attr.hp * this.hpPercent) / 100);
+    owner.battleLog(replace(t('skill.jinguanghushen.2'), [this.hpPercent]));
+  }
+}
+//牢不可破
+export class LaoBuKePo extends StartPassiveSkill {
+  name: string = 'laobukepo';
+  percent: number = 200;
+  desc(): string {
+    return replace(t('skill.laobukepo.1'), [this.percent]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const laobukepo = new BlocPercentBuff(this.name, this.percent, 9999);
+    owner.putBuff(laobukepo);
+  }
+}
diff --git a/src/config/skill/base.ts b/src/config/skill/base.ts
new file mode 100644
index 0000000..3200154
--- /dev/null
+++ b/src/config/skill/base.ts
@@ -0,0 +1,203 @@
+import { BattleRole, callReducPercent, replace } from '@/tool';
+import { type_boss } from '@/config';
+import i18n from '../i18n';
+import { ControlBuff } from './buff';
+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;
+    }
+  }
+  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 StartPassiveSkill extends PassiveSkill {
+  beforeBattle(owner: BattleRole, target: BattleRole): void {
+    this.takeEffect(owner, target);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return true;
+  }
+}
+//攻击前触发的被动
+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) {
+    const rate = target.type == type_boss ? this.bossRate : this.rate;
+    let log = t('skill.control.1');
+    if (Math.random() < rate / 100) {
+      target.putBuff(new ControlBuff(this.name, this.last));
+      log = replace(t('skill.control.0'), [t(target.type), this.last]);
+    }
+    log = log = replace(t('skill.user'), [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;
+  precent: number = 100;
+  desc(): string {
+    return t('skill.attack.1');
+  }
+  use(owner: BattleRole, target: BattleRole) {
+    owner.skillPercent += this.precent;
+    owner.callDmg(target);
+    let critLog = owner.crit ? t('skill.crit.0') : '';
+    if (owner.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);
+    }
+  }
+}
+//主动增益技能
+export abstract class BuffSkill extends ActionSkill {
+  abstract last: number;
+  rmdLast = 0;
+  beforeAtk(owner: BattleRole, target: BattleRole): void {
+    super.beforeAtk(owner, target);
+    this.check(owner, target);
+  }
+  check(owner: BattleRole, target: BattleRole): void {
+    if (this.rmdLast > 0) {
+      this.rmdLast--;
+      this.takeEffect(owner, target);
+    }
+  }
+  abstract takeEffect(owner: BattleRole, target: BattleRole): void;
+  use(owner: BattleRole, target: BattleRole): void {
+    this.rmdLast = this.last;
+    this.log(owner, target);
+    this.check(owner, target);
+  }
+  abstract log(owner: BattleRole, target: BattleRole): void;
+}
diff --git a/src/config/skill/bracers.ts b/src/config/skill/bracers.ts
new file mode 100644
index 0000000..4ff0eb5
--- /dev/null
+++ b/src/config/skill/bracers.ts
@@ -0,0 +1,68 @@
+import { CounterSkill, Attack, Control, GainsSkill, SufPassiveSkill, Vampire, PrePassiveSkill, PassiveSkill, StartPassiveSkill } from './base';
+import i18n from '../i18n';
+import { BattleRole, callDmgPercent, replace } from '@/tool';
+import { AtkPercentBuff, KuiLan } from './buff';
+const { t } = i18n;
+//降龙
+export class Xianglong extends PrePassiveSkill {
+  name: string = 'xianglong';
+  hpPercent: number = 30;
+  dmgPercent: number = 100;
+  last: number = 1;
+  desc(): string {
+    return replace(t('skill.xianglong.1'), [this.hpPercent, this.dmgPercent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.attr.curHp / owner.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const extra = owner.extraAttr;
+    extra.dmgPercent = callDmgPercent(extra.dmgPercent, this.dmgPercent);
+    owner.battleLog(replace(t('skill.xianglong.2'), [this.hpPercent, this.dmgPercent]));
+  }
+}
+//大力丹
+export class DaLiDan extends StartPassiveSkill {
+  name: string = 'dalidan';
+  atkPercent: number = 100;
+  desc(): string {
+    return replace(t('skill.dalidan.1'), [this.atkPercent]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const dalidan = new AtkPercentBuff(this.name, this.atkPercent, 9999);
+    owner.putBuff(dalidan);
+  }
+}
+//剧毒
+export class JuDu extends CounterSkill {
+  name: string = 'judu';
+  rate: number = 60;
+  last: number = 2;
+  desc(): string {
+    return replace(t('skill.judu.1'), [this.rate, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const judu = new KuiLan('kuilan', this.last);
+    target.putBuff(judu);
+    owner.battleLog(replace(t('skill.judu.2'), [t(target.type), this.last]));
+  }
+}
+//利爪
+export class LiZhao extends PrePassiveSkill {
+  name: string = 'lizhao';
+  rate: number = 30;
+  percent: number = 100;
+  desc(): string {
+    return replace(t('skill.lizhao.1'), [this.rate, this.percent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.action != null && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.skillPercent += this.percent;
+    owner.battleLog(replace(t('skill.lizhao.2'), [this.percent]));
+  }
+}
diff --git a/src/config/skill/buff.ts b/src/config/skill/buff.ts
new file mode 100644
index 0000000..8ebe780
--- /dev/null
+++ b/src/config/skill/buff.ts
@@ -0,0 +1,203 @@
+import { BattleRole, callDmgPercent, callDmgReduc, replace } from '@/tool';
+import i18n from '../i18n';
+const { t } = i18n;
+
+//BUFF
+export abstract class Buff {
+  order: number = 1;
+  abstract type: string;
+  name: string;
+  layer: number = 1;
+  maxLayer: number = 1;
+  last: number;
+
+  constructor(name: string, last: number, maxLayer?: number) {
+    this.name = name;
+    this.last = last;
+    this.maxLayer = maxLayer || 1;
+  }
+  abstract desc(): string;
+  check(): boolean {
+    if (this.layer <= 0) {
+      return false;
+    }
+    if (this.last > 0) {
+      this.last--;
+    }
+    return this.last > 0;
+  }
+  addLayer(add: number) {
+    const n = this.layer + add;
+    if (n > this.maxLayer) {
+      this.layer = this.maxLayer;
+    } else if (n < 0) {
+      this.layer = 0;
+    } else {
+      this.layer = n;
+    }
+  }
+  abstract takeEffect(owner: BattleRole): void;
+}
+//攻击时触发的BUFF
+export abstract class AttackBuff extends Buff {
+  type: string = 'attackBuff';
+}
+//被攻击时触发的BUFF
+export abstract class AttackedBuff extends Buff {
+  type: string = 'attackedBuff';
+}
+///攻击时触发的百分比BUFF
+export abstract class PercentAttackBuff extends AttackBuff {
+  percent: number;
+  constructor(name: string, percent: number, last: number, maxLayer?: number) {
+    super(name, last, maxLayer);
+    this.percent = percent;
+  }
+}
+//被攻击时触发的百分比BUFF
+export abstract class PercentAttackedBuff extends AttackedBuff {
+  percent: number;
+  constructor(name: string, percent: number, last: number, maxLayer?: number) {
+    super(name, last, maxLayer);
+    this.percent = percent;
+  }
+}
+//被攻击时触发的固定数值BUFF
+export abstract class ConstantAttackBuff extends AttackedBuff {
+  number: number;
+  constructor(name: string, number: number, last: number, maxLayer?: number) {
+    super(name, last, maxLayer);
+    this.number = number;
+  }
+}
+//被攻击时触发的固定数值BUFF
+export abstract class ConstantAttackedBuff extends AttackedBuff {
+  number: number;
+  constructor(name: string, number: number, last: number, maxLayer?: number) {
+    super(name, last, maxLayer);
+    this.number = number;
+  }
+}
+//伤害加成增减益BUFF
+export class DmgPercentBuff extends PercentAttackBuff {
+  desc(): string {
+    return replace(t('skill.atkbuff.3'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.dmgPercent = callDmgPercent(owner.extraAttr.dmgPercent, this.percent);
+  }
+}
+//基础攻击百分比增减益BUFF
+export class BaseAtkPercentBuff extends PercentAttackBuff {
+  desc(): string {
+    return replace(t('skill.atkbuff.1'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.baseAtk += (this.percent / 100) * this.layer * owner.attr.baseAtk;
+  }
+}
+//攻击加成增减益BUFF
+export class AtkPercentBuff extends PercentAttackBuff {
+  desc(): string {
+    return replace(t('skill.atkbuff.2'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.atkPercent += this.percent;
+  }
+}
+//爆伤增减益BUFF
+export class CritDmgBuff extends PercentAttackBuff {
+  desc(): string {
+    return replace(t('skill.critbuff.1'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.critDmg += this.percent * this.layer;
+  }
+}
+//爆伤减免增减益BUFF
+export class CritDmgReducBuff extends PercentAttackedBuff {
+  desc(): string {
+    return replace(t('skill.critbuff.3'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.critDmgReduc += this.percent * this.layer;
+  }
+}
+//伤害减免增减益BUFF
+export class DmgReducBuff extends PercentAttackedBuff {
+  desc(): string {
+    return replace(t('skill.defbuff.2'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.dmgReduc = callDmgReduc(owner.extraAttr.dmgReduc, this.percent);
+  }
+}
+//格挡百分比增减益BUFF
+export class BlocPercentBuff extends PercentAttackedBuff {
+  desc(): string {
+    return replace(t('skill.blocbuff.2'), [this.percent * this.layer]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.bloc += Math.ceil(owner.attr.bloc * this.percent);
+  }
+}
+//控制异常
+export class ControlBuff extends AttackBuff {
+  constructor(name: string, last: number) {
+    super(name, last);
+  }
+  desc(): string {
+    return t('skill.' + this.name + '.0');
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.action = null;
+    owner.battleLog(replace(t('skill.control.2'), [t('skill.' + this.name + '.0'), t(owner.type)]));
+  }
+}
+//溃烂
+export class KuiLan extends PercentAttackedBuff {
+  constructor(name: string, last: number) {
+    super(name, 50, last);
+  }
+  desc(): string {
+    return replace(t('skill.kongbulingyu.2'), [this.percent]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.def += owner.attr.def * (this.percent / -100);
+  }
+}
+//恐怖领域
+export class KBLYDebuff extends ConstantAttackedBuff {
+  desc(): string {
+    return replace(t('skill.kongbulingyu.2'), [this.number]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.extraAttr.def -= this.number;
+  }
+}
+//灵感
+export class LingGanBuff extends PercentAttackBuff {
+  desc(): string {
+    return replace(t('skill.linggan.1'), [this.percent]);
+  }
+  takeEffect(owner: BattleRole): void {
+    owner.addHp(Math.ceil(owner.attr.hp * (this.percent / 100)));
+  }
+}
+//流血
+export class LiuXue extends AttackBuff {
+  percent: number = 2;
+  maxLayer: number = 10;
+  constructor(layer: number, last: number) {
+    super('liuxue', last);
+    this.layer = layer > this.maxLayer ? this.maxLayer : layer;
+  }
+  desc(): string {
+    return replace(t('skill.liuxue.0'), [this.percent]);
+  }
+  takeEffect(owner: BattleRole): void {
+    const dmg = Math.ceil(owner.attr.curHp * (this.percent / 100) * this.layer);
+    owner.addHp(-1 * dmg);
+    owner.battleLog(replace(t('skill.liuxue.1'), [this.layer, t(owner.type), dmg]));
+  }
+}
diff --git a/src/config/skill/index.ts b/src/config/skill/index.ts
new file mode 100644
index 0000000..687ef7c
--- /dev/null
+++ b/src/config/skill/index.ts
@@ -0,0 +1,9 @@
+export * from './base';
+export * from './weapon';
+export * from './armor';
+export * from './neck';
+export * from './ring';
+export * from './jewelry';
+export * from './bracers';
+export * from './pants';
+export * from './buff';
diff --git a/src/config/skill/jewelry.ts b/src/config/skill/jewelry.ts
new file mode 100644
index 0000000..d48dd1b
--- /dev/null
+++ b/src/config/skill/jewelry.ts
@@ -0,0 +1,80 @@
+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 = 65;
+  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.atk * this.percent) / 100);
+    target.addHp(-1 * additional);
+    owner.battleLog(replace(t('skill.critFear.2'), [additional]));
+  }
+}
+//琉璃盘
+export class Liulipan extends Attack {
+  order: number = 10;
+  lv?: number;
+  name: string = 'liulipan';
+  atk: number = 50;
+  cd: number = 5;
+  desc(): string {
+    return replace(t('skill.liulipan.1'), [(this.lv || 1) * this.atk, this.cd]);
+  }
+  use(owner: BattleRole, target: BattleRole): void {
+    owner.extraAttr.baseAtk += (this.lv || 1) * this.atk;
+    super.use(owner, target);
+  }
+}
+//镜花水月
+export class JHSY extends CounterSkill {
+  name: string = 'JHSY';
+  rate: number = 40;
+  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.baseDmg * 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/neck.ts b/src/config/skill/neck.ts
new file mode 100644
index 0000000..7da152b
--- /dev/null
+++ b/src/config/skill/neck.ts
@@ -0,0 +1,134 @@
+import { SufPassiveSkill, PrePassiveSkill, CounterSkill } from './base';
+import { createt } from '../i18n';
+import { BattleRole, replace } from '@/tool';
+import { BaseAtkPercentBuff, DmgReducBuff } from './buff';
+const st = createt('skill.');
+const t = createt('');
+
+//断
+export class Duan extends SufPassiveSkill {
+  name: string = 'duan';
+  hpPercent: number = 20;
+  order: number = 999;
+  dmg: number = 999999999;
+  desc(): string {
+    return replace(st('duan.1'), [this.hpPercent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0 && target.attr.curHp / target.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    target.addHp(-1 * this.dmg);
+    owner.battleLog(replace(st('duan.2'), [this.hpPercent, this.dmg]));
+  }
+}
+//红眼
+export class HongYan extends PrePassiveSkill {
+  name: string = 'hongyan';
+  hpPercent: number = 65;
+  atk: number = 2000;
+  atkPercent: number = 200;
+  desc(): string {
+    return replace(st('hongyan.1'), [this.hpPercent, this.atk, this.atkPercent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.attr.curHp / owner.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.extraAttr.baseAtk += this.atk;
+  }
+  afterAtk(owner: BattleRole, target: BattleRole): void {
+    if (this.trigger(owner, target)) {
+      const additional = Math.ceil((owner.atk * this.atkPercent) / 100);
+      target.addHp(-1 * additional);
+      owner.battleLog(replace(st('hongyan.2'), [this.hpPercent, additional]));
+    }
+  }
+}
+//杀意
+export class ShaYi extends SufPassiveSkill {
+  name: string = 'shayi';
+  atkPercent: number = 3;
+  maxLayer: number = 10;
+  reduc: number = 3;
+  retains: string[] = ['percent', 'maxLayer'];
+  desc(): string {
+    return replace(st('shayi.1'), [this.atkPercent, this.reduc, this.maxLayer]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const shayi = new BaseAtkPercentBuff(this.name, this.atkPercent, 9999, this.maxLayer);
+    owner.putBuff(shayi, this.retains);
+    owner.battleLog(replace(st('shayi.2'), [shayi.layer]));
+  }
+  onAtked(owner: BattleRole, target: BattleRole): void {
+    if (target.crit) {
+      const shayi = new BaseAtkPercentBuff(this.name, this.atkPercent, 9999, this.maxLayer);
+      shayi.layer = -1 * this.reduc;
+      owner.putBuff(shayi, this.retains);
+      owner.battleLog(replace(st('shayi.3'), [this.reduc]));
+    }
+  }
+}
+
+//怒目
+export class NuMu extends CounterSkill {
+  name: string = 'numu';
+  atkPercent: number = 3;
+  layer: number = 0;
+  maxLayer: number = 10;
+  desc(): string {
+    return replace(st('numu.1'), [this.atkPercent, this.maxLayer]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return target.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const numu = new BaseAtkPercentBuff(this.name, this.atkPercent, 9999, this.maxLayer);
+    owner.putBuff(numu);
+    owner.battleLog(replace(st('numu.2'), [numu.layer]));
+  }
+}
+//龙腾
+export class LongTeng extends CounterSkill {
+  name: string = 'longteng';
+  dmgReduc: number = 8;
+  rate: number = 8;
+  shieldPercentOfHp: number = 8;
+  desc(): string {
+    return replace(st('longteng.1'), [this.dmgReduc, this.rate, this.shieldPercentOfHp]);
+  }
+  beforeBattle(owner: BattleRole, target: BattleRole): void {
+    owner.putBuff(new DmgReducBuff(this.name, this.dmgReduc, 9999));
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return target.dmg > 0 && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const shield = Math.ceil((owner.attr.hp * this.shieldPercentOfHp) / 100);
+    owner.shield += shield;
+    owner.battleLog(replace(st('longteng.2'), [shield]));
+  }
+}
+//幸运数字
+export class XingYunShuZi extends SufPassiveSkill {
+  name: string = 'xingyunshuzi';
+  num: number = 0;
+  desc(): string {
+    return st('xingyunshuzi.1');
+  }
+  beforeBattle(owner: BattleRole, target: BattleRole): void {
+    this.num = Math.ceil(Math.random() * 9);
+    owner.battleLog(replace(st('xingyunshuzi.2'), [t(owner.type), this.num]));
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return this.num > 0 && owner.dmg % 10 == this.num;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const dmg = owner.dmg * this.num;
+    target.addHp(-1 * dmg);
+    owner.battleLog(replace(st('xingyunshuzi.3'), [t(target.type), dmg]));
+  }
+}
diff --git a/src/config/skill/pants.ts b/src/config/skill/pants.ts
new file mode 100644
index 0000000..4d71f82
--- /dev/null
+++ b/src/config/skill/pants.ts
@@ -0,0 +1,79 @@
+import { SufPassiveSkill, PrePassiveSkill, CounterSkill, StartPassiveSkill } from './base';
+import i18n from '../i18n';
+import { BattleRole, replace } from '@/tool';
+import { DmgReducBuff, KBLYDebuff, LingGanBuff } from './buff';
+const { t } = i18n;
+
+//恐怖领域
+export class KongBuLingYu extends StartPassiveSkill {
+  name: string = 'kongbulingyu';
+  defReduc: number = 500;
+  desc(): string {
+    return replace(t('skill.kongbulingyu.1'), [this.defReduc]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const buff = new KBLYDebuff(this.name, this.defReduc, 9999);
+    target.putBuff(buff);
+  }
+}
+//白骨夫人的庇护
+export class FuRenBiHu extends PrePassiveSkill {
+  name: string = 'furenbihu';
+  cd: number = 999;
+  hpPercent: number = 30;
+  last: number = 3;
+  dmgReduc: number = 100;
+  desc(): string {
+    return replace(t('skill.furenbihu.1'), [this.hpPercent, this.dmgReduc, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.attr.curHp / owner.attr.hp < this.hpPercent / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.extraAttr.dmgReduc = this.dmgReduc;
+    owner.battleLog(replace(t('skill.furenbihu.2'), [this.hpPercent, this.dmgReduc]));
+  }
+}
+//灵感
+export class LingGan extends StartPassiveSkill {
+  name: string = 'linggan';
+  percent: number = 1;
+  desc(): string {
+    return replace(t('skill.linggan.1'), [this.percent]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const linggan = new LingGanBuff(this.name, this.percent, 9999);
+    owner.putBuff(linggan);
+  }
+}
+//顽抗
+export class WanKang extends CounterSkill {
+  name: string = 'wankang';
+  percent: number = 30;
+  hpPercnet: number = 100;
+  desc(): string {
+    return replace(t('skill.wankang.1'), [this.percent, this.hpPercnet]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return target.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    let reflected = Math.ceil((target.baseDmg * this.percent) / 100);
+    const max = Math.ceil((owner.attr.hp * this.hpPercnet) / 100);
+    reflected > max && (reflected = max);
+    target.addHp(-1 * reflected);
+    owner.battleLog(replace(t('skill.wankang.2'), [t(owner.type), reflected]));
+  }
+}
+//五味
+export class WuWei extends StartPassiveSkill {
+  name: string = 'wuwei';
+  dmgReduc: number = 20;
+  desc(): string {
+    return replace(t('skill.wuwei.1'), [this.dmgReduc]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const wuwei = new DmgReducBuff(this.name, this.dmgReduc, 9999);
+    owner.putBuff(wuwei);
+  }
+}
diff --git a/src/config/skill/ring.ts b/src/config/skill/ring.ts
new file mode 100644
index 0000000..f807b2c
--- /dev/null
+++ b/src/config/skill/ring.ts
@@ -0,0 +1,124 @@
+import { SufPassiveSkill, PrePassiveSkill, PassiveSkill, CounterSkill } from './base';
+import i18n from '../i18n';
+import { BattleRole, callDmgPercent, replace } from '@/tool';
+import { ControlBuff, CritDmgBuff, CritDmgReducBuff } from './buff';
+const { t } = i18n;
+
+//森罗万象
+export class SLWX extends PrePassiveSkill {
+  name: string = 'SLWX';
+  percent: number = 30;
+  desc(): string {
+    return replace(t('skill.SLWX.1'), [this.percent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return true;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const extra = owner.extraAttr;
+    extra.atkPercent += this.percent;
+    extra.dmgPercent = callDmgPercent(extra.dmgPercent, this.percent);
+    extra.crit += this.percent;
+    extra.critDmg += this.percent;
+  }
+}
+
+//金刚琢
+export class JinGangZhuo extends SufPassiveSkill {
+  name: string = 'jinggangzhuo';
+  rate: number = 10;
+  last: number = 2;
+  desc(): string {
+    return replace(t('skill.jinggangzhuo.1'), [this.rate, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    target.putBuff(new ControlBuff(this.name, this.last));
+    owner.battleLog(replace(t('skill.jinggangzhuo.2'), [this.last]));
+  }
+}
+
+//奉邪
+export class FengXie extends SufPassiveSkill {
+  name: string = 'fengxie';
+  critDmg: number = 50;
+  layer: number = 0;
+  maxLayer: number = 5;
+  desc(): string {
+    return replace(t('skill.fengxie.1'), [this.critDmg, this.maxLayer]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const fengxie = new CritDmgBuff(this.name, this.critDmg, 9999, this.maxLayer);
+    if (owner.crit) {
+      owner.putBuff(fengxie);
+      owner.battleLog(replace(t('skill.fengxie.2'), [fengxie.layer]));
+    } else {
+      owner.attackBuff.delete(this.name);
+      owner.battleLog(t('skill.fengxie.3'));
+    }
+  }
+}
+
+//噬忠
+export class ShiZhong extends CounterSkill {
+  name: string = 'shizhong';
+  critDmgReduc: number = 50;
+  layer: number = 0;
+  maxLayer: number = 3;
+  desc(): string {
+    return replace(t('skill.shizhong.1'), [this.critDmgReduc, this.maxLayer]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return target.crit;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const shizhong = new CritDmgReducBuff(this.name, this.critDmgReduc, 9999, this.maxLayer);
+    owner.putBuff(shizhong);
+    owner.battleLog(replace(t('skill.shizhong.2'), [shizhong.layer]));
+  }
+}
+
+//神赏
+export class ShenShang extends SufPassiveSkill {
+  name: string = 'shenshang';
+  rate: number = 20;
+  hp: number = 10000;
+  desc(): string {
+    return replace(t('skill.shenshang.1'), [this.rate, this.hp]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.crit && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    owner.addHp(this.hp);
+    owner.battleLog(replace(t('skill.shenshang.2'), [this.hp]));
+  }
+}
+
+//痛觉反击
+export class TongJueFanJi extends CounterSkill {
+  name: string = 'tongjuefanji';
+  percent: number = 100;
+  desc(): string {
+    return replace(t('skill.tongjuefanji.1'), [this.percent]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return target.crit;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    if (!owner.action) {
+      const log = replace(t('skill.tongjuefanji.3'), [t(owner.type)]);
+      owner.battleLog(log);
+      return;
+    }
+    owner.skillPercent = this.percent;
+    owner.callDmg(target);
+    target.addHp(-1 * owner.dmg);
+    owner.battleLog(replace(t('skill.tongjuefanji.2'), [owner.dmg]));
+  }
+}
diff --git a/src/config/skill/weapon.ts b/src/config/skill/weapon.ts
new file mode 100644
index 0000000..634cb7c
--- /dev/null
+++ b/src/config/skill/weapon.ts
@@ -0,0 +1,171 @@
+import { ActionSkill, Attack, Control, PassiveSkill, PrePassiveSkill, StartPassiveSkill, SufPassiveSkill } from './base';
+import { createt } from '../i18n';
+import { replace, BattleRole } from '@/tool';
+import { BaseAtkPercentBuff, ControlBuff, CritDmgBuff, DmgPercentBuff, DmgReducBuff, KuiLan, LiuXue } from './buff';
+
+const t = createt('');
+const st = createt('skill.');
+//冰刃
+export class IceBlade extends SufPassiveSkill {
+  name: string = 'iceBlade';
+  rate: number = 10;
+  percent: number = 1000;
+  last: number = 1;
+  desc(): string {
+    return replace(st('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.atk * this.percent) / 100);
+    target.addHp(-1 * additional);
+    target.putBuff(new ControlBuff(this.name, this.last));
+    owner.battleLog(replace(st('iceBlade.2'), [additional, t(target.type), this.last]));
+  }
+}
+//见红
+export class SeeRed extends ActionSkill {
+  name: string = 'seeRed';
+  layer: number = 5;
+  cd: number = 5;
+  last: number = 5;
+  desc(): string {
+    return replace(st('seeRed.1'), [this.layer, this.last]) + replace(st('seeRed.2'), [this.cd]);
+  }
+  use(owner: BattleRole, target: BattleRole): void {
+    owner.skillPercent = 0;
+    const liuxue = new LiuXue(this.layer, this.last);
+    target.putBuff(liuxue);
+    owner.battleLog(replace(st('user'), [t(owner.type), st(this.name + '.0')]) + replace(st('seeRed.1'), [this.layer, this.last]));
+  }
+}
+//鳍刺
+export class QiCi extends SufPassiveSkill {
+  name: string = 'qici';
+  rate: number = 30;
+  layer: number = 3;
+  last: number = 4;
+  desc(): string {
+    return replace(st('qici.1'), [this.rate, this.layer, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0 && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const liuxue = new LiuXue(this.layer, this.last);
+    target.putBuff(liuxue);
+    owner.battleLog(replace(st('qici.2'), [t(target.type), this.layer, this.last]));
+  }
+}
+//暴虐
+export class BaoNue extends SufPassiveSkill {
+  name: string = 'baonue';
+  rate: number = 30;
+  last: number = 2;
+  desc(): string {
+    return replace(st('baonue.1'), [this.rate, this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0 && Math.random() < this.rate / 100;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const liuxue = new LiuXue(9999, this.last);
+    target.putBuff(liuxue);
+    owner.battleLog(replace(st('baonue.2'), [t(target.type), this.last]));
+  }
+}
+//扎心
+export class ZhaXin extends StartPassiveSkill {
+  name: string = 'zhaxin';
+  critDmg: number = 200;
+  desc(): string {
+    return replace(st('zhaxin.1'), [this.critDmg]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const zhaxin = new CritDmgBuff(this.name, this.critDmg, 9999);
+    owner.putBuff(zhaxin);
+  }
+}
+//鳌之毒
+export class AoZhiDu extends SufPassiveSkill {
+  name: string = 'aozhidu';
+  last: number = 2;
+  desc(): string {
+    return replace(st('aozhidu.1'), [this.last]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const aozhidu = new KuiLan('kuilan', this.last);
+    target.putBuff(aozhidu);
+    owner.battleLog(replace(st('aozhidu.2'), [t(target.type), this.last]));
+  }
+}
+//十九叉
+export class ShiJiuCha extends SufPassiveSkill {
+  name: string = 'shijiucha';
+  times: number = 9;
+  cout: number = 0;
+  desc(): string {
+    return replace(st('shijiucha.1'), [this.times]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return owner.dmg > 0;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    this.cout++;
+    if (this.cout >= 10) {
+      this.cout = 0;
+      const dmg = owner.dmg * this.times;
+      owner.battleLog(replace(st('shijiucha.2'), [t(owner.type), dmg]));
+    }
+  }
+}
+//剑气动四方
+export class JianQiDongSiFang extends StartPassiveSkill {
+  name: string = 'jianqidongsifang';
+  dmgPercent: number = 50;
+  dmgReduc: number = -20;
+  desc(): string {
+    return replace(st('jianqidongsifang.1'), [this.dmgPercent, this.dmgReduc * -1]);
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const buff1 = new DmgPercentBuff(this.name, this.dmgPercent, 9999);
+    owner.putBuff(buff1);
+    const buff2 = new DmgReducBuff(this.name, this.dmgPercent, 9999);
+    owner.putBuff(buff2);
+  }
+}
+//暴风雪
+export class BaoFengXue extends Control {
+  name: string = 'baofengxue';
+  cd: number = 10;
+  last: number = 3;
+  rate: number = 100;
+  bossRate: number = 65;
+  desc(): string {
+    return replace(st('baofengxue.1'), [this.last, this.cd, this.bossRate]);
+  }
+}
+
+// 波动杀意
+export class BoDongShaYi extends PrePassiveSkill {
+  name: string = 'bodongshayi';
+  perent: number = 6;
+  maxLayer: number = 15;
+  desc(): string {
+    return replace(st('bodongshayi.1'), [this.perent, this.maxLayer]);
+  }
+  trigger(owner: BattleRole, target: BattleRole): boolean {
+    return true;
+  }
+  takeEffect(owner: BattleRole, target: BattleRole): void {
+    const shayi: any = owner.attackBuff.get('shayi');
+    if (shayi) {
+      shayi.percent = this.perent;
+      shayi.maxLayer = this.maxLayer;
+    }
+  }
+}
diff --git a/src/store/action.ts b/src/store/action.ts
index ab24d57..5e9ab42 100644
--- a/src/store/action.ts
+++ b/src/store/action.ts
@@ -1,6 +1,5 @@
-import { initialWeapon, initialArmor, initialNeck, initialRing, i18n, archive_name, audio_mp3 } from '@/config';
-import { conisOfsell } from '@/tool';
-import { Base64 } from 'js-base64';
+import { initialWeapon, initialArmor, initialNeck, initialRing, i18n, audio_mp3 } from '@/config';
+import { conisOfsell, saveArchive, getArchive } from '@/tool';
 
 const backgound = new Audio(audio_mp3.background);
 backgound.loop = true;
@@ -46,7 +45,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,42 +67,38 @@ export const useEquip = ({ state, commit }, index) => {
 };
 
 export const saveGame = ({ state, commit }) => {
-  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,
-    backpack: state.grid,
-    autoSell: state.autoSell,
-    shop: state.shop,
-    reborn: state.rebornPoints,
-  };
-  var saveData = Base64.encode(Base64.encode(JSON.stringify(data)));
-  localStorage.setItem(archive_name, saveData);
-  commit('set_sys_info', { msg: t('saveGame.2'), type: 'win' });
+  if (state.experiential) {
+    commit('set_sys_info', { msg: t('experiential.1'), type: 'warning' });
+  } else {
+    saveArchive(state);
+    commit('set_sys_info', { msg: t('saveGame.2'), type: 'win' });
+  }
 };
 
 export const loadGame = ({ commit }, data?) => {
-  if (!data) {
-    try {
-      const archive = localStorage.getItem(archive_name) || '';
-      data = JSON.parse(Base64.decode(Base64.decode(archive)));
-    } catch (error) {}
+  if (data) {
+    loadArchive(commit, data);
+    return;
   }
+  getArchive().then((rsp: any) => {
+    loadArchive(commit, rsp);
+  });
+};
+const loadArchive = (commit, data) => {
   if (!data) {
     commit('set_sys_info', { msg: t('loadEmpty'), type: 'warning' });
   } else if (data == 'undfind') {
     commit('set_sys_info', { msg: t('loadError'), type: 'warning' });
   } else {
+    commit('set_experiential', data.experiential);
     commit('set_player_equips', data.equips);
-    commit('set_player_lv', data.lv || 1);
-    commit('set_endless_lv', data.endlessLv || 1);
+    commit('set_player_layer', data.layer || 1);
     commit('set_player_coins', data.coins || 0);
-    commit('set_backpack', data.backpack);
+    commit('set_backpack', data.grid);
     commit('set_auto_sell', data.autoSell);
     commit('set_shop', data.shop);
-    data.reborn && (data.reborn.recoverSpeed = 0);
-    commit('set_reborn_points', data.reborn);
+    commit('set_points', data.points);
+    commit('set_player_lv', data.lv || 1);
     commit('set_sys_info', { msg: t('loadSuccess'), type: 'win' });
   }
   commit('call_player_attribute');
diff --git a/src/store/mutation.ts b/src/store/mutation.ts
index 4e61ce5..4973308 100644
--- a/src/store/mutation.ts
+++ b/src/store/mutation.ts
@@ -1,10 +1,9 @@
 import { callPlayerAttribute, conisOfsell, getArrayEmptyIdx, callEuqipTipsLocation } from '@/tool';
-import { reborn_point_coefficients, reborn_arrts, i18n } from '@/config';
+import { i18n, piont_arrts, point_coefficients } 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.baseAttribute);
 };
 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,26 +79,50 @@ 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 = parseInt(data) || 1;
+  data = data < 1 ? 1 : data;
+  state.playerAttribute.lv = data;
+  state.playerAttribute.attribute.lv = data;
+  const total = state.points.total;
+  if (total < data) {
+    const add = data - total;
+    add_point(state, add);
+  }
+};
+export const set_player_layer = (state, data) => {
+  data = parseInt(data);
   data = data < 1 ? 1 : data;
-  state.playerAttribute.lv = parseInt(data || 1);
+  state.playerAttribute.layer = data;
 };
-export const set_reborn_points = (state, rebornPoints) => {
-  state.rebornPoints = rebornPoints;
-  const rebornAttribute = {};
-  reborn_arrts.forEach((attr) => {
-    rebornAttribute[attr] = rebornPoints[attr] * reborn_point_coefficients[attr];
+export const add_point = (state, add) => {
+  const total = state.points.total;
+  if (total >= 2000) {
+    return;
+  }
+  if (total + add > 2000) {
+    add = 2000 - total;
+  }
+  state.points.total += add;
+  state.points.has += add;
+};
+export const set_points = (state, points) => {
+  state.points = points;
+  const baseAttribute = {};
+  piont_arrts.forEach((attr) => {
+    baseAttribute[attr] = points[attr] * point_coefficients[attr];
   });
-  state.rebornAttribute = rebornAttribute;
+  state.baseAttribute = baseAttribute;
   call_player_attribute(state);
 };
 export const add_player_curhp = (state, hp) => {
+  hp = Math.ceil(hp);
   const attr = state.playerAttribute.attribute;
   let curHp = attr.curHp + hp;
   curHp > attr.hp && (curHp = attr.hp);
   curHp < 0 && (curHp = 0);
   state.playerAttribute.attribute.curHp = curHp;
 };
+export const set_experiential = (state, data) => {
+  state.experiential = data || false;
+};
diff --git a/src/store/state.ts b/src/store/state.ts
index 4c325ee..92f8ec5 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, Player, Points, BaseAttribute } 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,
-  },
+  points: new Points(),
+  baseAttribute: new BaseAttribute(),
   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,
@@ -78,10 +31,9 @@ export default {
     left: '0',
     imgLeft: '0px',
     clip: 'rect(96px, 32px, 144px, 0px)',
-    // playerStyle: {
-    //   left: '0%',
-    //   backgroundPosition: '0px 96px',
-    // },
     battleShow: false,
+    repeat: true,
+    upward: true,
   },
+  experiential: false,
 };
diff --git a/src/tool/IndexedDB.ts b/src/tool/IndexedDB.ts
new file mode 100644
index 0000000..75e227a
--- /dev/null
+++ b/src/tool/IndexedDB.ts
@@ -0,0 +1,81 @@
+import { deepCopy } from './caller';
+
+const db_name = 'transmigration_game';
+export const store_name_archive = 'archive';
+export const key_name_archive = 'version';
+
+const version = 1;
+let db;
+/**
+ * 打开数据库
+ * @param {object} dbName 数据库的名字
+ * @param {string} version 数据库的版本
+ * @return {object} 该函数会返回一个数据库实例
+ */
+function openDB() {
+  return new Promise((resolve, reject) => {
+    //  兼容浏览器
+    var indexedDB = window.indexedDB;
+
+    // 打开数据库，若没有则会创建
+    const request = indexedDB.open(db_name, version);
+    // 数据库打开成功回调
+    request.onsuccess = function (e) {
+      db = request.result; // 数据库对象
+      console.log('数据库打开成功');
+      resolve(db);
+    };
+    // 数据库打开失败的回调
+    request.onerror = function (e) {
+      console.log('数据库打开报错');
+    };
+    // 数据库有更新时候的回调
+    request.onupgradeneeded = function (e) {
+      // 数据库创建或升级的时候会触发
+      console.log('onupgradeneeded');
+      db = request.result; // 数据库对象
+      createStore();
+    };
+  });
+}
+
+const createStore = () => {
+  if (!db.objectStoreNames.contains(store_name_archive)) {
+    const objectStore = db.createObjectStore(store_name_archive, { keyPath: key_name_archive });
+    // 创建索引，在后面查询数据的时候可以根据索引查
+    // objectStore.createIndex(index_name_equip, index_name_equip, { unique: false });
+  }
+};
+
+await openDB();
+
+export const insertToStore = (storeName, data) => {
+  data = deepCopy(data);
+  return new Promise<boolean>((resolve, reject) => {
+    const request = db
+      .transaction([storeName], 'readwrite') // 事务对象 指定表格名称和操作模式（"只读"或"读写"）
+      .objectStore(storeName) // 仓库对象
+      .put(data);
+
+    request.onsuccess = function (event) {
+      resolve(true);
+    };
+
+    request.onerror = function (event) {
+      resolve(false);
+    };
+  });
+};
+
+export const getFromStore = (storeName, id) => {
+  return new Promise((resolve, reject) => {
+    const store = db.transaction([storeName], 'readonly').objectStore(storeName);
+    const request = store.get(id);
+    request.onsuccess = (e) => {
+      resolve(request.result);
+    };
+    request.onerror = (e) => {
+      resolve([]);
+    };
+  });
+};
diff --git a/src/tool/archive.ts b/src/tool/archive.ts
new file mode 100644
index 0000000..dacda1a
--- /dev/null
+++ b/src/tool/archive.ts
@@ -0,0 +1,75 @@
+import { Equip, Player, Points } from '@/config';
+import { getFromStore, insertToStore, store_name_archive } from './IndexedDB';
+import { uuid } from './random';
+export const archive_version = '1.0';
+const archive_version_strengthen = '1.0_flag';
+
+export class GameArchive {
+  version: String;
+  equips: Equip[];
+  lv: number;
+  layer: number;
+  coins: number;
+  grid: any[];
+  autoSell: string[];
+  shop: any[];
+  points: Points;
+
+  constructor(player: Player, grid: any[], autoSell: any[], shop: any[], points: Points) {
+    this.version = archive_version;
+    this.equips = [player.weapon, player.armor, player.ring, player.neck, player.jewelry, player.pants, player.shoes, player.bracers];
+    this.lv = player.lv;
+    this.layer = player.layer;
+    this.coins = player.coins;
+    this.grid = grid;
+    this.autoSell = autoSell;
+    this.shop = shop;
+    this.points = points;
+  }
+}
+
+export const saveArchive = (state) => {
+  const archive = new GameArchive(state.playerAttribute, state.grid, state.autoSell, state.shop, state.points);
+  getFromStore(store_name_archive, archive_version_strengthen).then((flag: any) => {
+    const time = new Date().getTime();
+    if (!flag || !flag.time || flag.time + 10 * 60 * 1000 < time) {
+      flag = { version: archive_version_strengthen, time: time };
+    }
+    const equips = new Array();
+    Array.prototype.push.apply(equips, archive.equips);
+    Array.prototype.push.apply(equips, archive.grid);
+    equips.forEach((equip) => {
+      if (!equip) return;
+      if (equip.strengthenLv > 0 && !equip.id) {
+        equip.id = uuid();
+      }
+      if (equip.id) {
+        flag[equip.id] = equip.strengthenLv;
+      }
+    });
+    insertToStore(store_name_archive, archive);
+    insertToStore(store_name_archive, flag);
+  });
+};
+
+export const checkImportArchive = async (data): Promise<void> => {
+  getFromStore(store_name_archive, archive_version_strengthen).then((rsp: any) => {
+    if (!rsp) return;
+    const equips = new Array();
+    Array.prototype.push.apply(equips, data.equips);
+    Array.prototype.push.apply(equips, data.grid);
+    equips.forEach((equip) => {
+      if (!equip || !equip.id) return;
+      const slv = rsp[equip.id];
+      slv && (equip.strengthenLv = slv);
+    });
+  });
+};
+
+export const getArchive = () => {
+  return new Promise((resolve, reject) => {
+    getFromStore(store_name_archive, archive_version).then((rsp: any) => {
+      resolve(rsp);
+    });
+  });
+};
diff --git a/src/tool/caller.ts b/src/tool/caller.ts
deleted file mode 100644
index ecfdeb6..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 = (0.5 * attribute.def) / (35 + 0.55 * 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..f0533b1
--- /dev/null
+++ b/src/tool/caller/attribute.ts
@@ -0,0 +1,138 @@
+import { Player, Attribute } from '@/config';
+import { deepCopy } from '.';
+
+/**
+ * 计算角色最终属性于技能
+ * @param player 角色
+ * @param rA 转生属性
+ */
+export const callPlayerAttribute = (player: Player, base: 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(base);
+  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(callDmgPercent(attribute[key], item.value));
+    } else if (key == 'dmgReduc') {
+      attribute[key] = callDmgReduc(attribute[key], item.value);
+    } else {
+      attribute[key] += item.value;
+    }
+  });
+  attribute.dmgReduc = Math.floor(attribute.dmgReduc * 100) / 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 ? 100 : attribute.crit) / 100, // 暴击率最多100%
+    critdmg = attribute.critDmg / 100,
+    dmgPercent = attribute.dmgPercent / 100;
+  attribute.dps = Math.ceil((1 - crit + crit * critdmg) * atk * (1 + dmgPercent));
+  //计算减伤比例
+  attribute.reducPercent = callReducPercent(attribute.def, player.lv);
+  player.attribute = attribute;
+};
+
+/**
+ * 计算防御提供的减伤比例
+ * @param def 防御
+ * @returns 减伤比例
+ */
+export const callReducPercent = (def: number, lv: number): number => {
+  const constant = 300;
+  const factor = def < 0 ? -1.05263 : 1.05263;
+  return def / (constant + factor * def) + (100 - lv) * 0.0003;
+};
+
+/**
+ * 计算新增伤害减免后的伤害减免
+ * @param source 已有伤害减免
+ * @param add 新增伤害减免
+ * @returns 最终伤害减免
+ */
+export const callDmgReduc = (has, addition) => {
+  if (has > 100 || addition > 100) {
+    return 100;
+  }
+  return 100 - (100 - has) * (1 - addition / 100);
+};
+
+/**
+ * 计算新增伤害加成后的伤害加成
+ * @param source 已有伤害加成
+ * @param add 新增伤害加成
+ * @returns 最终伤害加成
+ */
+export const callDmgPercent = (has, addition) => {
+  return (100 + has) * (1 + addition / 100) - 100;
+};
+
+/**
+ * 计算装备强化后的基础属性
+ * @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..64a7cad
--- /dev/null
+++ b/src/tool/caller/battle.ts
@@ -0,0 +1,271 @@
+import { Equip, Skills, Monster, Attribute, Player } from '@/config';
+import { randonBootyEquip, deepCopy, replace, callReducPercent, callDmgReduc, callDmgPercent } 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;
+  attackBuff: Map<string, Skills.AttackedBuff> = new Map();
+  attackedBuff: Map<string, Skills.AttackedBuff> = new Map();
+  //临时状态
+  action: Skills.ActionSkill | null = null;
+  atk: number = 0;
+  dmg: number = 0;
+  baseDmg: number = 0;
+  crit: boolean = false;
+  extraAttr: Attribute = new Attribute();
+  shield: number = 0;
+  skillPercent: number = 100;
+
+  constructor(attr: Attribute, commit, type: string) {
+    this.attr = attr;
+    this.commit = commit;
+    this.type = type;
+    this.addSkill(attr.skill); //添加默认主动技能普通攻击
+    this.initTmp();
+  }
+
+  initTmp = () => {
+    this.action = null;
+    this.atk = 0;
+    this.dmg = 0;
+    this.baseDmg = 0;
+    this.crit = false;
+    this.extraAttr = new Attribute();
+    this.extraAttr.hp = 0;
+    this.extraAttr.critDmg = 0;
+    this.shield = Math.ceil(this.shield * 0.9);
+    this.skillPercent = 0;
+  };
+
+  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.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);
+    });
+    //攻击前计算双方BUFF
+    this.callAttackBuff();
+    target.callAttackedBuff();
+    this.action?.use(this, target);
+    //攻击后触发的被动技能
+    this.passives.forEach((skill) => {
+      skill.afterAtk(this, target);
+    });
+    //触发攻击目标的反制技能
+    target.onAttacked(this);
+  };
+
+  onAttacked = (target: BattleRole) => {
+    //触发反制技能
+    this.passives.forEach((skill) => {
+      skill.onAtked(this, target);
+    });
+    //初始化临时状态
+    this.initTmp();
+  };
+
+  battleLog = (log: string) => {
+    this.commit('set_sys_info', { type: 'battle', msg: log });
+  };
+
+  addHp = (hp: number) => {
+    if (hp < 0 && this.shield > 0) {
+      if (this.shield > -1 * hp) {
+        this.shield += hp;
+        return;
+      } else {
+        hp += this.shield;
+        this.shield = 0;
+      }
+    }
+    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;
+  };
+
+  /**
+   *
+   * @param skillPercent 技能伤害倍率
+   * @param target 被攻击目标
+   * @returns
+   */
+  callDmg = (target: BattleRole) => {
+    const attr = this.attr;
+    const extra = this.extraAttr;
+    const baseAtk = attr.baseAtk + extra.baseAtk; //基础攻击
+    const atkPercent = 1 + (attr.atkPercent + extra.atkPercent) / 100; //攻击加成
+    this.atk = baseAtk * atkPercent; //回合最终攻击力
+    const dmgPercent = callDmgPercent(attr.dmgPercent, extra.dmgPercent) / 100; //伤害加成
+    const factor = Math.random() * 0.1 + 0.95; //伤害随机系数
+    this.baseDmg = this.atk * (1 + dmgPercent) * (this.skillPercent / 100) * factor; //造成伤害
+    const crit = attr.crit + extra.crit - target.attr.critAvoid - target.extraAttr.critAvoid; //最终暴击率
+    this.crit = Math.random() < crit / 100;
+    if (this.crit) {
+      let critDmg = attr.critDmg + extra.critDmg - target.attr.critDmgReduc - target.extraAttr.critDmg; //目标最终承受暴击伤害
+      critDmg = critDmg < 100 ? 100 : critDmg; //暴击伤害不低于100%
+      this.baseDmg *= critDmg / 100; //暴击时目标承受伤害
+    }
+    const reducPercent = callReducPercent(target.attr.def + target.extraAttr.def, target.attr.lv); //目标防御提供的减伤比例
+    const dmgReduc = callDmgReduc(target.attr.dmgReduc, target.extraAttr.dmgReduc); //目标伤害减免
+    const takeDmgPercent = (1 - reducPercent) * (1 - dmgReduc / 100); //目标承受伤害比例
+    const bloc = target.attr.bloc + target.extraAttr.bloc; //目标格挡值
+    const dmg = Math.ceil(this.baseDmg * takeDmgPercent - bloc); //目标承受伤害
+    this.dmg = dmg < 1 ? 1 : dmg;
+  };
+
+  putBuff(buff: Skills.AttackBuff, retains?: string[]) {
+    const name = buff.name;
+    const type = buff.type;
+    const exit: Skills.Buff = this[type].get(name);
+    this[type].set(name, buff);
+    if (exit) {
+      if (retains) {
+        retains.forEach((key) => {
+          buff[key] = exit[key];
+        });
+      }
+      buff.addLayer(exit.layer);
+    }
+  }
+
+  callAttackBuff() {
+    this.attackBuff.forEach((value: Skills.Buff, key: string) => {
+      value.takeEffect(this);
+    });
+  }
+  callAttackedBuff() {
+    this.attackedBuff.forEach((value: Skills.Buff, key: string) => {
+      value.takeEffect(this);
+    });
+  }
+  checkBuff() {
+    checkBuf(this.attackBuff);
+    checkBuf(this.attackedBuff);
+  }
+}
+
+const checkBuf = (map: Map<string, Skills.Buff>) => {
+  const keys: string[] = new Array();
+  map.forEach((value: Skills.Buff, key: string, map: Map<String, Skills.Buff>) => {
+    if (!value || !value.check()) {
+      keys.push(key);
+    }
+  });
+  keys.forEach((key: string) => {
+    map.delete(key);
+  });
+};
+
+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, player.pants, player.shoes, player.bracers];
+  palyerEquips.forEach((equip) => {
+    equip && playerRole.addSkill(equip.base.skill, equip.lv);
+  });
+
+  monster = deepCopy(monster);
+  monster.curHp = monster.hp;
+  const monsterRole = new BattleRole(monster, commit, monster.type);
+  playerRole.onStartBattle(monsterRole);
+  monsterRole.onStartBattle(playerRole);
+  return { player: playerRole, monster: monsterRole };
+};
+
+export const battleOneBout = (player: BattleRole, monster: BattleRole): boolean => {
+  player.attack(monster);
+  if (player.isDeath() || monster.isDeath()) {
+    return true;
+  }
+  monster.attack(player);
+  if (player.isDeath() || monster.isDeath()) {
+    return true;
+  }
+  player.checkBuff();
+  monster.checkBuff();
+  return false;
+};
+
+/**
+ * 初始化装备技能
+ * @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..7a0adbb
--- /dev/null
+++ b/src/tool/caller/equip.ts
@@ -0,0 +1,94 @@
+import { strengthen_rates, strengthen_factor } 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, quality) => {
+  return Math.round((lv + 1) * 1.1 ** (strengthenLv ** 1.1) * (10 + lv / 5) * strengthen_factor[quality] + 100);
+};
+
+/**
+ * 装备从0强化到目标等级所需费用期望值
+ * @param lv 装备等级
+ * @param strengthenLv 装备目标强化等级
+ * @returns
+ */
+export const strengthenAvgCoins = (lv, strengthenLv, quality) => {
+  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, quality) / 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/crypot.ts b/src/tool/crypot.ts
new file mode 100644
index 0000000..69b2efb
--- /dev/null
+++ b/src/tool/crypot.ts
@@ -0,0 +1,41 @@
+import CryptoJS from 'crypto-js';
+/**
+ * AES-256-CBC对称加密
+ * @param text {string} 要加密的明文
+ * @param secretKey {string} 密钥，43位随机大小写与数字
+ * @returns {string} 加密后的密文，Base64格式
+ */
+export const AES_CBC_ENCRYPT = (text, secretKey) => {
+  var keyHex = CryptoJS.enc.Base64.parse(secretKey);
+  var ivHex = keyHex.clone();
+  // 前16字节作为向量
+  ivHex.sigBytes = 16;
+  ivHex.words.splice(4);
+  var messageHex = CryptoJS.enc.Utf8.parse(text);
+  var encrypted = CryptoJS.AES.encrypt(messageHex, keyHex, {
+    iv: ivHex,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7,
+  });
+  return encrypted.toString();
+};
+
+/**
+ * AES-256-CBC对称解密
+ * @param textBase64 {string} 要解密的密文，Base64格式
+ * @param secretKey {string} 密钥，43位随机大小写与数字
+ * @returns {string} 解密后的明文
+ */
+export const AES_CBC_DECRYPT = (textBase64, secretKey) => {
+  var keyHex = CryptoJS.enc.Base64.parse(secretKey);
+  var ivHex = keyHex.clone();
+  // 前16字节作为向量
+  ivHex.sigBytes = 16;
+  ivHex.words.splice(4);
+  var decrypt = CryptoJS.AES.decrypt(textBase64, keyHex, {
+    iv: ivHex,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7,
+  });
+  return CryptoJS.enc.Utf8.stringify(decrypt);
+};
diff --git a/src/tool/formatter.ts b/src/tool/formatter.ts
index 0e31702..791be89 100644
--- a/src/tool/formatter.ts
+++ b/src/tool/formatter.ts
@@ -7,3 +7,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/index.ts b/src/tool/index.ts
index ce66072..4c8d00f 100644
--- a/src/tool/index.ts
+++ b/src/tool/index.ts
@@ -3,6 +3,9 @@ export * from './formatter';
 export * from './random';
 export * from './mixins';
 export * from './mobile';
+export * from './IndexedDB';
+export * from './crypot';
+export * from './archive';
 
 export const getArrayEmptyIdx = (array) => {
   for (let i = 0; i < array.length; i++) {
diff --git a/src/tool/random.ts b/src/tool/random.ts
index c9a7abc..9cd278c 100644
--- a/src/tool/random.ts
+++ b/src/tool/random.ts
@@ -1,22 +1,73 @@
-import { qualitys, createWeapon, createArmor, createNeck, createRing } from '@/config/equips';
+import { difficultys, Categorys, qualitys, extra_quality, extra_quality_rate, extra_quality_lv } from '@/config';
+import * as Equips from '@/config/equips';
 
-const creators = new Array();
-creators.push(createWeapon);
-creators.push(createArmor);
-creators.push(createNeck);
-creators.push(createRing);
+const types = ['weapon', 'arrmor', 'neck', 'ring', 'jewelry', 'bracers', 'pants', 'shoes'];
+const normal: Categorys[] = new Array();
+const uniques: Categorys[] = new Array();
+const colorfuls: Categorys[] = new Array();
+types.forEach((type) => {
+  const nkey = type + 'Categorys';
+  Array.prototype.push.apply(normal, Equips[nkey]);
+  const ukey = type + 'UniqueCategorys';
+  Array.prototype.push.apply(uniques, Equips[ukey]);
+  const ckey = type + 'ColorfulCategorys';
+  Array.prototype.push.apply(colorfuls, Equips[ckey]);
+});
 
 export const randonBootyEquip = (monster) => {
   const equips = new Array();
   const equip = randomEquip(monster.equipRates, monster.lv);
   equip && equips.push(equip);
-  const extraRates = [0, 0, 0, 0, monster.extraRate];
+  const extraRates = new Array();
+  monster.equipRates.forEach((e) => {
+    extraRates.push(0);
+  });
+  extraRates.push(monster.extraRate[0]);
+  extraRates.push(monster.extraRate[1]);
   const extraEquip = randomEquip(extraRates, monster.lv);
   extraEquip && equips.push(extraEquip);
   return equips;
 };
 
 export const randomEquip = (rates, lv) => {
+  const quality = randomQuality(rates);
+  if (quality) {
+    lv = randomLv(lv, quality);
+    const extraQuality = randomExtraQuality(quality);
+    extraQuality && (lv += extra_quality_lv);
+    const category = randomCategory(quality);
+    const creator = Equips['create' + category.type];
+    return creator(quality, lv, category, extraQuality);
+  } else {
+    return null;
+  }
+};
+const randomLv = (lv, quality) => {
+  if (quality == qualitys[4] || quality == qualitys[5]) {
+    lv += Math.floor(Math.random() * 6);
+  } else {
+    lv += Math.floor(Math.random() * 3);
+  }
+  lv = lv > 100 ? 100 : lv;
+  return lv;
+};
+const randomExtraQuality = (quality) => {
+  const r = Math.random();
+  let tmp = 0;
+  let extraQuality = '';
+  if (quality != qualitys[5]) {
+    return extraQuality;
+  }
+  for (let i = 0; i < extra_quality_rate.length; i++) {
+    tmp += extra_quality_rate[i];
+    if (r < tmp) {
+      extraQuality = extra_quality[i];
+      break;
+    }
+  }
+  return extraQuality;
+};
+const randomQuality = (rates) => {
   const r = Math.random();
   let tmp = 0;
   let quality = '';
@@ -27,16 +78,25 @@ export const randomEquip = (rates, lv) => {
       break;
     }
   }
-  if (quality) {
-    if (quality == qualitys[4]) {
-      lv += Math.floor(Math.random() * 6);
-    } else {
-      lv += Math.floor(Math.random() * 3);
+  return quality;
+};
+const randomCategory = (quality): Categorys => {
+  let categorys = normal;
+  if (quality == qualitys[4]) {
+    categorys = uniques;
+  } else if (quality == qualitys[5]) {
+    categorys = colorfuls;
+  }
+  while (true) {
+    const category = categorys[Math.floor(Math.random() * categorys.length)];
+    if (category.reRoll > 0) {
+      console.log('重ROLL概率:' + category.reRoll);
     }
-    const creator = creators[Math.floor(Math.random() * creators.length)];
-    return creator(quality, lv);
-  } else {
-    return null;
+    if (category.reRoll > 0 && Math.random() < category.reRoll) {
+      console.log('重ROLL');
+      continue;
+    }
+    return category;
   }
 };
 
@@ -46,27 +106,27 @@ export const randomEquipQuality = (lv) => {
 };
 
 export const randomDungeonDifficulty = () => {
-  const rates = [0.01, 0.84, 0.1, 0.05];
+  const rates = [0.85, 0.1, 0.05];
   const r = Math.random();
   let tmp = 0;
   for (let i = 0; i < rates.length; i++) {
     tmp += rates[i];
     if (r < tmp) {
-      return i;
+      return difficultys[i];
     }
   }
-  return 1;
+  return difficultys[0];
 };
 
 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/archive.vue b/src/views/archive.vue
index d3b9a69..dc56177 100644
--- a/src/views/archive.vue
+++ b/src/views/archive.vue
@@ -22,8 +22,9 @@ import { useStore } from "vuex";
 import { computed, onMounted, ref, onBeforeUnmount } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip, Dialog } from "@/components"
-import { menu_icons, archive_name } from "@/config";
-import { Base64 } from "js-base64";
+import { menu_icons } from "@/config";
+import { getArchive, AES_CBC_ENCRYPT, AES_CBC_DECRYPT, checkImportArchive, saveArchive, replace, archive_version } from "@/tool";
+
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
@@ -31,23 +32,38 @@ const showArchive = computed(() => {
     return state.curMenu == 'archive';
 });
 const archive = ref('');
+const key = 'KUf4hM5rThssysJhcRFCfxLR8Imihjl0eMsyhh1M7Wk';
+let timeOut = 0;
 
 const showMenu = () => {
     if (showArchive.value) {
         state.curMenu = null;
     } else {
         state.curMenu = 'archive';
-        archive.value = localStorage.getItem(archive_name) || '';
+        getArchive().then((rsp: any) => {
+            archive.value = AES_CBC_ENCRYPT(JSON.stringify(rsp), key);
+        });
     }
 }
 
 const copyArchive = () => {
-    navigator.clipboard.writeText(archive.value).then(() => {
+    if (navigator.clipboard && window.isSecureContext) {
+        navigator.clipboard.writeText(archive.value).then(() => {
+            commit('set_sys_info', { msg: t('copyArchive.1'), type: 'win' })
+            showMenu();
+        }).catch(() => {
+            commit('set_sys_info', { msg: t('copyArchive.2'), type: 'waring' })
+        });
+    } else {
+        const textField = document.createElement("textarea");
+        textField.innerText = archive.value;
+        document.body.appendChild(textField);
+        textField.select();
+        document.execCommand("copy");
+        textField.remove();
         commit('set_sys_info', { msg: t('copyArchive.1'), type: 'win' })
-    }, () => {
-        commit('set_sys_info', { msg: t('copyArchive.2'), type: 'waring' })
-    });
-    showMenu();
+        showMenu();
+    }
 }
 
 const pasteArchive = () => {
@@ -59,16 +75,32 @@ const pasteArchive = () => {
     });
 }
 
-const importArchive = () => {
+const importArchive = async () => {
     try {
-        const data = JSON.parse(Base64.decode(Base64.decode(archive.value)));
+        const data = JSON.parse(AES_CBC_DECRYPT(archive.value, key));
         if (!data || data == 'undfind') {
             commit('set_sys_info', { msg: t('loadEmpty'), type: 'warning' });
         }
-        dispatch('loadGame', data);
-        localStorage.setItem(archive_name, archive.value);
+        if (data.version != archive_version) {
+            commit('set_sys_info', { msg: t('importArchive.3'), type: 'warning' });
+            return;
+        }
+        await checkImportArchive(data);
+        await dispatch('loadGame', data);
+        if (state.experiential) {
+            commit('set_sys_info', { msg: replace(t('experiential.0'), [data.experientialTime]), type: 'win' });
+            const time = data.experientialTime || 10;
+            clearTimeout(timeOut);
+            timeOut = setTimeout(() => {
+                commit('set_sys_info', { msg: replace(t('experiential.2'), [data.experientialTime]), type: 'warning' });
+                dispatch('loadGame');
+            }, time * 60 * 100);
+        } else {
+            saveArchive(state);
+        }
         showMenu();
     } catch (error) {
+        console.log(error);
         commit('set_sys_info', { msg: t('loadError'), type: 'warning' });
     }
 }
@@ -79,10 +111,11 @@ const keydown = (e) => {
     }
 }
 onMounted(() => {
-    document.addEventListener('keydown', keydown)
+    document.addEventListener('keydown', keydown);
 });
 onBeforeUnmount(() => {
-    document.removeEventListener('keydown', keydown)
+    document.removeEventListener('keydown', keydown);
+    clearTimeout(timeOut);
 })
 
 onMounted(() => { });
diff --git a/src/views/backpack/auto-sell.vue b/src/views/backpack/auto-sell.vue
index 8cbcba3..631b8d2 100644
--- a/src/views/backpack/auto-sell.vue
+++ b/src/views/backpack/auto-sell.vue
@@ -13,12 +13,14 @@
                 <label :for="qualitys[0]">{{ t('quality.' + qualitys[0]) }}</label>
                 <input type="checkbox" v-model="autoSell" :value="qualitys[1]" :id="qualitys[1]">
                 <label :for="qualitys[1]">{{ t('quality.' + qualitys[1]) }}</label>
-            </div>
-            <div>
                 <input type="checkbox" v-model="autoSell" :value="qualitys[2]" :id="qualitys[2]">
                 <label :for="qualitys[2]">{{ t('quality.' + qualitys[2]) }}</label>
+            </div>
+            <div>
                 <input type="checkbox" v-model="autoSell" :value="qualitys[3]" :id="qualitys[3]">
                 <label :for="qualitys[3]">{{ t('quality.' + qualitys[3]) }}</label>
+                <input type="checkbox" v-model="autoSell" :value="qualitys[4]" :id="qualitys[4]">
+                <label :for="qualitys[4]">{{ t('quality.' + qualitys[4]) }}</label>
             </div>
         </div>
     </span>
diff --git a/src/views/backpack/equip-menu.vue b/src/views/backpack/equip-menu.vue
index 5c8118c..3906c2f 100644
--- a/src/views/backpack/equip-menu.vue
+++ b/src/views/backpack/equip-menu.vue
@@ -10,8 +10,8 @@
         ]" />
     </Dialog>
 
-    <Dialog :title="t('strengthen') + t('equip')" v-model="showStrengthen" :top="state.mobile ? '5rem' : '10rem'"
-        left="2rem" padding="0" :z="11" :obscured="true">
+    <Dialog :title="t('strengthen') + t('equip')" v-model="showStrengthen" top="5rem" left="2rem" padding="0" :z="11"
+        :obscured="true">
         <Strengthen :equip="state.grid[index]" />
     </Dialog>
 
diff --git a/src/views/backpack/grid.vue b/src/views/backpack/grid.vue
index c124de7..bc8d344 100644
--- a/src/views/backpack/grid.vue
+++ b/src/views/backpack/grid.vue
@@ -17,28 +17,39 @@
         <span class="capacity" :class="{ 'height': itemNum / grid.length > 0.8 }">
             {{ itemNum }}/{{ grid.length }}
         </span>
+        <button class="button addGrid" @click="addGrid">+</button>
         <button class="button" @click="neaten">{{ t('neaten') }}</button>
         <button class="button" @click="sellAll">{{ t('sellAll') }}</button>
         <AutoSell />
     </div>
 
+    <Confirm ref="confirm" width="8rem" :tip="replace(t('addGrid.1'), [needCoins, addNum])" :confirm="t('addGrid.2')"
+        :cancel="t('addGrid.3')" @confirm="confirmAddGrid" />
+
 </template>
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
 import { computed, onMounted, ref } from "vue";
 import { useI18n } from "vue3-i18n";
-import EquipIcon from "@/components/equip-icon.vue";
+import { EquipIcon, Confirm } from "@/components";
 import { lock_icon, backpack_num } from "@/config";
 import AutoSell from "./auto-sell.vue";
-import { userMobile } from "@/tool";
+import { userMobile, replace } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 const grid = computed(() => {
     return state.grid;
 });
-const emit = defineEmits(['openEquipMenu'])
+const emit = defineEmits(['openEquipMenu']);
+const confirm = ref();
+const userCoins = computed(() => {
+    return state.playerAttribute.coins;
+})
+const needCoins = 2000000;
+const addNum = 8;
+const maxNum = 160;
 
 const itemNum = computed(() => {
     let i = 0;
@@ -51,9 +62,9 @@ const itemNum = computed(() => {
 });
 
 const neaten = () => {
-    const tem = new Array(backpack_num);
+    const tem = new Array(grid.value.length);
     let i = 0;
-    state.grid.forEach((item) => {
+    grid.value.forEach((item) => {
         if (item) {
             tem[i] = item
             i++;
@@ -78,6 +89,24 @@ mobile.onClick = (e, data) => {
     commit('show_equip_tip', { equip: data[0], compare: true, e: e.touches[0] })
 }
 
+const addGrid = (e) => {
+    if (grid.value.length >= maxNum) {
+        commit("set_sys_info", { msg: replace(t('addGrid.4'), [maxNum]), type: "warning", });
+        return;
+    }
+    confirm.value.open(0, e)
+}
+const confirmAddGrid = () => {
+    if (userCoins.value < needCoins) {
+        commit("set_sys_info", { msg: t('stNoCoins'), type: "warning", });
+        return
+    }
+    commit("add_player_coins", -1 * needCoins);
+    for (let i = 0; i < addNum; i++) {
+        grid.value.push(null);
+    }
+}
+
 onMounted(() => { });
 </script>
 <style lang="scss" scoped>
@@ -89,7 +118,8 @@ onMounted(() => { });
     align-items: flex-start;
     flex-wrap: wrap;
     display: flex;
-    padding-left: 1.3rem;
+    padding-left: 0.8rem;
+    overflow: auto;
 }
 
 .grid {
@@ -97,7 +127,7 @@ onMounted(() => { });
     height: 3.5rem;
     border: 1px solid #ccc;
     margin-left: -1px;
-    margin-top: -1px;
+    // margin-top: -1px;
     box-shadow: inset 0 0 6px 6px rgba($color: #000000, $alpha: 0.5);
 
     .equip {
@@ -154,10 +184,16 @@ onMounted(() => { });
         color: red;
     }
 
+
     .button {
         float: right;
         margin-top: 0.9rem;
     }
+
+    .addGrid {
+        padding: 0 0.8rem;
+        float: left;
+    }
 }
 
 @media only screen and (max-width: 768px) {
@@ -196,6 +232,11 @@ onMounted(() => { });
         .button {
             margin-top: 0.5rem;
         }
+
+        .addGrid {
+            padding: 0 0.4rem;
+            float: left;
+        }
     }
 
 }
diff --git a/src/views/backpack/inherited.vue b/src/views/backpack/inherited.vue
index fb147c5..80d7107 100644
--- a/src/views/backpack/inherited.vue
+++ b/src/views/backpack/inherited.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="inherited" v-if="target && source">
         <div class="coins">
-            {{ t('coins.0') }}:{{ useCoins }}
+            {{ t('coins.0') }}:{{ userCoins }}
         </div>
         <div class="message">
             <p>{{ t('inherited.1') + needCoins }}</p>
@@ -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>
@@ -81,12 +81,12 @@ import { EquipIcon, Confirm } from "@/components";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
-const useCoins = computed(() => {
+const userCoins = computed(() => {
     return state.playerAttribute.coins;
 })
 const needCoins = computed(() => {
-    const need = strengthenAvgCoins(prop.target.lv, prop.source.strengthenLv)
-    const used = strengthenAvgCoins(prop.source.lv, prop.source.strengthenLv)
+    const need = strengthenAvgCoins(prop.target.lv, prop.source.strengthenLv, prop.target.quality.quality)
+    const used = strengthenAvgCoins(prop.source.lv, prop.source.strengthenLv, prop.source.quality.quality)
     return need > used ? need - used : 0;
 })
 const confirm = ref();
@@ -108,10 +108,11 @@ const inherited = (e) => {
 }
 
 const confirmInherited = () => {
-    if (useCoins.value < needCoins.value) {
+    if (userCoins.value < needCoins.value) {
         commit("set_sys_info", { msg: t('stNoCoins'), type: "warning", });
         return
     }
+    commit("add_player_coins", -1 * needCoins.value);
     prop.target.strengthenLv = prop.source.strengthenLv;
     prop.source.strengthenLv = 0;
     commit("set_sys_info", { msg: t('inheritedConfirm.4'), type: "win", });
diff --git a/src/views/backpack/player.vue b/src/views/backpack/player.vue
index e717fd8..db5bd73 100644
--- a/src/views/backpack/player.vue
+++ b/src/views/backpack/player.vue
@@ -2,18 +2,16 @@
     <div class="player">
         <div class="attributes">
             <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> {{ formartNum(coins) }} </div>
                 <div v-for="attr in attrs" :key="attr">{{ formartNum(attribute[attr]) }}{{ attr_unitys[attr] }} </div>
-                <div> {{ coins }} </div>
             </div>
         </div>
         <div class="equips">
@@ -39,12 +37,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,
     ]
@@ -53,9 +51,9 @@ 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(() => {
-    return formartNum(state.playerAttribute.coins);
+    return state.playerAttribute.coins;
 })
 
 onMounted(() => { });
@@ -74,6 +72,7 @@ onMounted(() => { });
     height: 100%;
     float: left;
     font-size: 1.1rem;
+    overflow: auto;
 
     .label {
         float: left;
diff --git a/src/views/backpack/reforge.vue b/src/views/backpack/reforge.vue
new file mode 100644
index 0000000..92bca60
--- /dev/null
+++ b/src/views/backpack/reforge.vue
@@ -0,0 +1,162 @@
+<template>
+    <div @mouseover="reforgeFlag = true" @mouseleave="reforgeFlag = false; reforgeing = false;" @click="reforge">
+        <div class="extraEntry" v-if="!reforgeFlag || reforgeing">
+            <div v-if="tempEntry" class="extraEntry-item" v-for="(v, k) in tempEntry" :key="k">
+                <button class="button">
+                    <div>
+                        {{ t(v.type + '.0') }} : {{ v.showVal }}({{ v.percent }}%)
+                    </div>
+                </button>
+            </div>
+            <div v-if="!tempEntry" class="extraEntry-item" v-for="(v, k) in equip.extraEntry" :key="v.type + k">
+                <button class="button">
+                    <div>
+                        {{ t(v.type + '.0') }} : {{ v.showVal }}({{ v.percent }}%)
+                    </div>
+                </button>
+            </div>
+        </div>
+        <div class="reforge-tip" v-if="reforgeFlag && !reforgeing">
+            <div :class="useCoins < reforgeNeed ? 'red' : ''">{{ replace(t('reforgeAction.0'), [reforgeNeed]) }} </div>
+            <div>-{{ t('reforgeDesc.0') }}</div>
+            <div>-{{ t('reforgeDesc.1') }}</div>
+            <div>-{{ t('reforgeDesc.2') }}</div>
+        </div>
+    </div>
+    <div class="btn-group">
+        <button class="button" @click="saveOld">{{ t('reforgeAction.1') }}</button>
+        <button class="button" @click="saveNew">{{ t('reforgeAction.2') }}</button>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { useStore } from "vuex";
+import { reactive, onMounted, ref, computed, watch } from "vue";
+import { Tooltip, EquipIcon } from "@/components"
+import { createt } from "@/config/i18n";
+import { Entry, extra_entry_num, weaponExtraEntry, armorExtraEntry, neckExtraEntry, ringExtraEntry, jewelryExtraEntry, pantsExtraEntry, shoesExtraEntry, bracersExtraEntry } from "@/config";
+import { replace } from "@/tool";
+import { useI18n } from "vue3-i18n";
+
+const { t } = useI18n();
+const { state, commit, dispatch } = useStore();
+const reforgeFlag = ref(false);
+const reforgeing = ref(false);
+const reforgeNeed = computed(() => {
+    const equip = prop.equip;
+    if (!equip) {
+        return 0;
+    }
+    return Math.round(equip.lv * equip.quality.qualityCoefficient * (200 + 10 * equip.lv) / 6);
+})
+const useCoins = computed(() => {
+    return state.playerAttribute.coins;
+})
+const height = computed(() => {
+    if (prop.equip) {
+        return prop.equip.extraEntry.length * 2.5 + 'rem';
+    }
+    return '1rem';
+})
+const tempEntry = ref<Entry[] | null>();
+const tempId = ref();
+
+const prop = defineProps({
+    equip: {
+        type: Object,
+        default: null
+    }
+});
+watch(() => prop.equip, (n) => {
+    tempEntry.value = null;
+})
+
+const reforger = {
+    weapon: weaponExtraEntry,
+    armor: armorExtraEntry,
+    neck: neckExtraEntry,
+    ring: ringExtraEntry,
+    jewelry: jewelryExtraEntry,
+    pants: pantsExtraEntry,
+    shoes: shoesExtraEntry,
+    bracers: bracersExtraEntry,
+}
+const reforge = () => {
+    if (useCoins.value < reforgeNeed.value) {
+        commit("set_sys_info", { msg: t('stNoCoins'), type: "warning", });
+        return
+    }
+    const equip = prop.equip;
+    const quality = equip.quality.quality;
+    const extraQuality = equip.quality.extraQuality;
+    const extraEntryNum = extra_entry_num[quality];
+    const extraEntry = new Array();
+    for (let i = 0; i < extraEntryNum; i++) {
+        const entry = reforger[equip.type](quality, equip.lv, extraQuality);
+        extraEntry.push(entry);
+    }
+    commit("add_player_coins", -1 * reforgeNeed.value);
+    tempId.value = equip.id;
+    tempEntry.value = extraEntry;
+    reforgeing.value = true;
+}
+
+const saveOld = () => {
+    tempEntry.value = null;
+}
+const saveNew = () => {
+    if (!tempEntry.value) {
+        return;
+    }
+    prop.equip.extraEntry = tempEntry.value;
+    tempEntry.value = null;
+}
+
+onMounted(() => { });
+</script>
+<style lang="scss" scoped>
+.extraEntry {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    width: 100%;
+    padding-left: 1.2rem;
+    padding-bottom: 0.6rem;
+    height: v-bind('height');
+    cursor: pointer;
+
+    div {
+        display: flex;
+        justify-content: center;
+
+        &>div {
+            display: flex;
+            justify-content: center;
+        }
+    }
+
+    .button {
+        border: 0;
+        width: 80%;
+    }
+
+
+}
+
+.reforge-tip {
+    width: 100%;
+    flex-direction: column;
+    display: flex;
+    justify-content: center;
+    height: v-bind('height');
+    color: #68d5ed;
+}
+
+.red {
+    color: red !important;
+}
+
+.btn-group {
+    margin-bottom: 0.5rem;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/backpack/strengthen.vue b/src/views/backpack/strengthen.vue
index 3949c89..46399c1 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>
@@ -49,24 +49,7 @@
             <p>{{ t('stren.5') }}...</p>
             <button class="button" @click="stopAuto">{{ t('stren.6') }}</button>
         </div>
-        <Tooltip :infos="[t('reforgeDesc.1'), t('reforgeDesc.2')]" width="8rem">
-            <div class="descript">- {{ t('reforgeDesc.0') }} -</div>
-        </Tooltip>
-
-        <div class="extraEntry" @mouseover="reforgeFlag = true" @mouseleave="reforgeFlag = false; reforgeing = false;"
-            @click="reforge">
-            <div class="extraEntry-item" v-for="(v, k) in equip.extraEntry" :key="v.id"
-                v-if="!reforgeFlag || reforgeing">
-                <button class="button">
-                    <div>
-                        {{ t(v.type + '.0') }} : {{ v.showVal }}({{ v.percent }}%)
-                    </div>
-                </button>
-            </div>
-            <div :class="['extraEntry-item', useCoins < reforgeNeed ? 'red' : '']" v-if="reforgeFlag && !reforgeing">
-                点击花费{{ reforgeNeed }}金币重铸
-            </div>
-        </div>
+        <Reforge :equip="equip" />
     </div>
 </template>
 
@@ -75,30 +58,18 @@ import { useStore } from "vuex";
 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 { strengthenValue, strengthenCoins, replace } from "@/tool"
+import { extra_entry_num, weaponExtraEntry, armorExtraEntry, neckExtraEntry, ringExtraEntry, strengthen_rates, jewelryExtraEntry, pantsExtraEntry, shoesExtraEntry, bracersExtraEntry, Entry } from "@/config";
+import { createt } from "@/config/i18n";
+import Reforge from "./reforge.vue";
 
+const mt = createt('backpack.');
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 const auto = ref(false);
 const autoLv = ref(12);
-const reforgeFlag = ref(false);
-const reforgeing = ref(false);
 const testFlag = ref(false);
 const testResult = ref(0);
-const height = computed(() => {
-    if (prop.equip) {
-        return prop.equip.extraEntry.length * 2.5 + 'rem';
-    }
-    return '1rem';
-})
-const reforgeNeed = computed(() => {
-    const equip = prop.equip;
-    if (!equip) {
-        return 0;
-    }
-    return Math.round(equip.lv * equip.quality.qualityCoefficient * (200 + 10 * equip.lv) / 6);
-})
 
 const prop = defineProps({
     equip: {
@@ -111,7 +82,7 @@ const useCoins = computed(() => {
     return state.playerAttribute.coins;
 })
 const needCoins = computed(() => {
-    return strengthenCoins(prop.equip.lv, prop.equip.strengthenLv);
+    return strengthenCoins(prop.equip.lv, prop.equip.strengthenLv, prop.equip.quality.quality);
 })
 
 const strengthen = (test?) => {
@@ -150,31 +121,6 @@ const stopAuto = () => {
     auto.value = false;
 };
 
-const reforger = {
-    weapon: weaponExtraEntry,
-    armor: armorExtraEntry,
-    neck: neckExtraEntry,
-    ring: ringExtraEntry,
-}
-
-const reforge = () => {
-    if (useCoins.value < reforgeNeed.value) {
-        commit("set_sys_info", { msg: t('stNoCoins'), type: "warning", });
-        return
-    }
-    const equip = prop.equip;
-    const quality = equip.quality.quality;
-    const extraEntryNum = extra_entry_num[quality];
-    const extraEntry = new Array();
-    for (let i = 0; i < extraEntryNum; i++) {
-        const entry = reforger[equip.type](quality, equip.lv);
-        extraEntry.push(entry);
-    }
-    commit("add_player_coins", -1 * reforgeNeed.value);
-    equip.extraEntry = extraEntry;
-    reforgeing.value = true;
-}
-
 onMounted(() => { });
 </script>
 <style lang="scss" scoped>
@@ -254,43 +200,6 @@ onMounted(() => { });
     }
 }
 
-.extraEntry {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    width: 100%;
-    padding-left: 1.2rem;
-    padding-bottom: 0.6rem;
-    color: #68d5ed;
-    height: v-bind('height');
-    cursor: pointer;
-
-    div {
-        display: flex;
-        justify-content: center;
-
-        &>div {
-            display: flex;
-            justify-content: center;
-        }
-    }
-
-    .button {
-        border: 0;
-        width: 80%;
-    }
-
-    .reforge-tip {
-        height: 100%;
-        display: flex;
-        justify-content: center;
-    }
-
-    .red {
-        color: red;
-    }
-}
-
 @media only screen and (max-width: 768px) {
     .strengthen {
         width: 23rem;
@@ -303,7 +212,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..19e97e5 100644
--- a/src/views/dungeon/battle.vue
+++ b/src/views/dungeon/battle.vue
@@ -14,16 +14,19 @@
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { computed, nextTick, onMounted, ref } from "vue";
+import { computed, nextTick, onMounted, ref, watch } from "vue";
 import { useI18n } from "vue3-i18n";
-import { dungeon_icon, player_move_time, player_battle_time } from "@/config";
-import { randonBootyEquip, callBattleResult } from "@/tool";
+import { dungeon_icon, player_move_time, player_battle_time, difficultys } from "@/config";
+import { createBattleRole, battleOneBout, BattleRole, replace } from "@/tool";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 const battle = computed(() => {
     return state.battle;
 })
+const layer = computed(() => {
+    return state.playerAttribute.layer;
+})
 
 const props = defineProps({
     dungeon: {
@@ -66,16 +69,29 @@ const exploreDungeon = (monsterIdx) => {
             playerMove(idx2);
         } else {
             commit("set_sys_info", { msg: t('dungeonSuccess'), type: 'battle' });
+            commit('add_point', dungeon.points);
             if (dungeon.lv > state.playerAttribute.lv) {
                 commit('set_player_lv', dungeon.lv)
                 commit('set_sys_info', { msg: t('upgrade'), type: 'win' })
             }
-            if (dungeon.difficulty != 1) {
-                dungeon.setDifficulty(1);
+            if (dungeon.difficulty == difficultys[1] || dungeon.difficulty == difficultys[2]) {
+                dungeon.setDifficulty(difficultys[0]);
                 battle.value.battleShow = false;
                 dispatch('play_music', 'backgound');
-            } else {
+                return;
+            } else if (dungeon.difficulty == difficultys[4]) {
+                //通关大秘境后记录已通过层数并回满血
+                commit('set_player_layer', dungeon.layer);
+                commit('add_player_curhp', state.playerAttribute.attribute.hp);
+            }
+            if (state.battle.repeat) {
+                if (dungeon.difficulty == difficultys[4] && state.battle.upward) {
+                    dungeon.setLayer(layer.value + 1);
+                }
                 playerMove(0, 0);
+            } else {
+                battle.value.battleShow = false;
+                dispatch('play_music', 'backgound');
             }
         }
     })
@@ -94,41 +110,59 @@ 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);
     }
 }
-
+const battlePlayer = ref<BattleRole>();
+watch(() => state.playerAttribute.attribute, (n) => {
+    battlePlayer.value && (battlePlayer.value.attr = n);
+})
 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 + '');
-        };
-        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 });
+        const battleTime = Math.ceil(player_battle_time * 100 / (100 + state.baseAttribute.battleSpeed))
+        const lvOrLayer = props.dungeon?.difficulty == 'dami' ? state.playerAttribute.layer + t('layer') : 'lv' + monster.lv;
+        const monsterName = t('difficulty.' + props.dungeon?.difficulty) + t(monster.type);
+        const msg = replace(t('battle'), [lvOrLayer, monsterName])
+        commit("set_sys_info", { msg: msg, type: 'battle' });
+        const roles = createBattleRole(state.playerAttribute, monster, commit);
+        const player: BattleRole = roles.player;
+        battlePlayer.value = player;
+        const monster1: BattleRole = roles.monster;
+        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);
+        })
     });
 }
 
+const oneBout = (player: BattleRole, monster: BattleRole, battleTime: number) => {
+    return new Promise((resolve, reject) => {
+        battle.value.timeOut = setTimeout(() => {
+            const finished = battleOneBout(player, monster);
+            if (finished) {
+                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/dungeon/dungeon.vue b/src/views/dungeon/dungeon.vue
index 18d22b7..9de2b4c 100644
--- a/src/views/dungeon/dungeon.vue
+++ b/src/views/dungeon/dungeon.vue
@@ -1,14 +1,11 @@
 <template>
-    <div :class="['dungeon', 'df' + dungeon.difficulty]" @contextmenu.prevent.stop="emit('battle')"
-        @dblclick="emit('battle')" @mouseover="showTips" @mouseleave="closeTips">
+    <div :class="['dungeon', dungeon.difficulty]">
         <div class="icon">
             <img class="icon-img" :src="dungeon_icon[dungeon.difficulty]">
         </div>
-        <div class="lv">lv{{ dungeon.lv }}</div>
-        <!--  -->
-        <div class="tip" v-if="tipsShow" :style='tipsStyle'>
-            <div>{{ t('dungeonTips.0') }}：lv{{ dungeon.lv }}_{{ t('difficulty.' + dungeon.difficulty) }} </div>
-            <div>{{ t('dungeonTips.1') }}</div>
+        <div class="lv">
+            <span v-if="show_lv_df.includes(dungeon.difficulty)">lv{{ dungeon.lv }}</span>
+            <span v-else>{{ t('difficulty.' + dungeon.difficulty) }}</span>
         </div>
     </div>
 
@@ -18,71 +15,32 @@
 import { useStore } from "vuex";
 import { computed, onMounted, ref, watch } from "vue";
 import { useI18n } from "vue3-i18n";
-import { dungeon_icon } from "@/config";
+import { show_lv_df, dungeon_icon } from "@/config";
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
-const tipsShow = ref(false);
-const tipsStyle = ref({});
-const left = ref('0rem');
-const top = ref('0rem');
-const emit = defineEmits(['battle'])
 
 const props = defineProps({
     dungeon: {
         type: Object,
         default: null
     },
-    battleDungeon: {
-        type: Boolean,
-        default: true
-    }
-})
-
-watch(() => props.dungeon, () => {
-    ramdonPosition();
 })
 
-const ramdonPosition = () => {
-    if (state.mobile) {
-        left.value = Math.random() * 80 + 5 + 'vw';
-        top.value = Math.random() * 70 + 5 + 'vh';
-    } else {
-        left.value = Math.random() * 64 + 2.5 + 'rem';
-        top.value = Math.random() * 50 + 2.5 + 'rem';
-    }
-}
-
-const showTips = (e) => {
-    const x = e.pageX, y = e.pageY, maxH = window.innerHeight, maxW = window.innerWidth;
-    // const xt = x < 200 ? '15%' :  < maxH - 200 ? '0%' : '-40%';
-    const xt = '-33%';
-    const yt = y < maxH / 2 ? '100%' : '-100%';
-    tipsStyle.value = {
-        top: y > maxH / 2 ? '-6rem' : '5rem',
-        left: x < maxW / 2 ? '-2rem' : '-10rem'
-    }
-    tipsShow.value = true
-}
-const closeTips = () => {
-    tipsShow.value = false;
-}
-
-onMounted(() => {
-    ramdonPosition();
-});
+onMounted(() => { });
 </script>
 <style lang="scss" scoped>
 .dungeon {
     box-shadow: 0 0 4px 4px rgba(100, 255, 36, 0.6);
     border-radius: 5%;
-    background: rgba(0, 0, 0, 0.7);
+    background: rgba(0, 0, 0, 0.3);
     width: 3.4rem;
     float: left;
     cursor: pointer;
     position: absolute;
-    left: v-bind('left');
-    top: v-bind('top');
+    left: v-bind('dungeon.left');
+    right: v-bind('dungeon.right');
+    top: v-bind('dungeon.top');
 
     .icon {
         display: flex;
@@ -125,7 +83,7 @@ onMounted(() => {
     transform: scale(1.2); //设置图片按照比例放大1.2倍
 }
 
-.df2 {
+.hard {
     box-shadow: 0 0 4px 4px rgba(245, 241, 0, 0.6);
 
     .icon {
@@ -134,12 +92,40 @@ onMounted(() => {
 
 }
 
-.df3 {
+.pain {
     box-shadow: 0 0 4px 4px rgba(245, 54, 54, 0.5);
 
     .icon {
         background-color: rgba(245, 54, 54, 0.6);
     }
 
+}
+
+.xiaomi,
+.dami {
+    width: 4.4rem;
+
+    .icon {
+        width: 4rem;
+        height: 4rem;
+    }
+}
+
+.xiaomi {
+    box-shadow: 0 0 4px 4px rgba(37, 247, 248, 0.5);
+
+    .icon {
+        background-color: rgba(37, 247, 248, 0.6);
+    }
+
+}
+
+.dami {
+    box-shadow: 0 0 4px 4px rgba(38, 173, 203, 0.5);
+
+    .icon {
+        background-color: rgba(38, 173, 203, 0.6);
+    }
+
 }
 </style>
\ No newline at end of file
diff --git a/src/views/dungeon/dungeonMap.vue b/src/views/dungeon/dungeonMap.vue
index 40c6286..56fab2f 100644
--- a/src/views/dungeon/dungeonMap.vue
+++ b/src/views/dungeon/dungeonMap.vue
@@ -7,11 +7,16 @@
         <div id="map" class="map">
             <img class="map-img" :src="dungeon_icon.map">
             <span v-if="!state.battle.battleShow">
-                <DungeonView v-for="item in dungeons" :dungeon="item" :key="item.lv" @battle="startBattle(item)" />
+                <DungeonView v-for="item in dungeons" :dungeon="item" :key="item.lv"
+                    @click="curDungeon = item; tipsShow = true" />
+                <DungeonView v-if="xiaomi" :dungeon="xiaomi" @click="curDungeon = xiaomi; tipsShow = true" />
+                <DungeonView v-if="dami" :dungeon="dami" @click="curDungeon = dami; tipsShow = true" />
                 <img :src="refresh_icon" class="refresh" @click="refreshDungeons"></img>
             </span>
             <BattleView :dungeon="curDungeon" v-if="state.battle.battleShow" ref="battle" />
             <img v-if="state.mobile" :src="close_icon" class="close" @click="showMenu"></img>
+            <DungeonTips v-if="tipsShow" @close="tipsShow = false" :dungeon="curDungeon" @battle="startBattle" />
+
         </div>
     </teleport>
 
@@ -20,46 +25,91 @@
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { onBeforeUnmount, onMounted, ref } from "vue";
+import { onBeforeUnmount, onMounted, ref, computed, watch } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip, Dialog } from "@/components"
 import { menu_icons, Dungeon, refresh_icon, close_icon, dungeon_icon } from "@/config";
-import { randomDungeonDifficulty } from "@/tool";
+import { deepCopy, randomDungeonDifficulty } from "@/tool";
 import DungeonView from "./dungeon.vue"
+import DungeonTips from "./dungeonTips.vue"
 import BattleView from "./battle.vue"
 
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 const showMap = ref(false);
 const dungeons = ref<Dungeon[]>()
+const xiaomi = ref<Dungeon>();
+const dami = ref<Dungeon>();
 const battle = ref();
 const curDungeon = ref();
+const min = computed(() => {
+    const lv = state.playerAttribute.lv;
+    return lv < 6 ? 1 : lv - 5;
+})
+const max = computed(() => {
+    const lv = state.playerAttribute.lv;
+    return lv + 5 > 100 ? 100 : lv + 5;
+})
+const tipsShow = ref(false);
+const layer = computed(() => {
+    return state.playerAttribute.layer;
+})
 
 const showMenu = () => {
     showMap.value = !showMap.value;
 }
 
-const startBattle = (dungeon) => {
+const startBattle = () => {
+    tipsShow.value = false;
     state.battle.battleShow = true;
-    curDungeon.value = dungeon;
     if (battle.value) {
         battle.value?.startDungeon();
     } else {
         setTimeout(() => {
-            startBattle(dungeon);
+            startBattle();
         }, 50);
     }
 }
-
+const locations = [
+    ['20%', '85%'], ['37%', '80%'], ['20%', '68%'], ['25%', '55%'],
+    ['39%', '52%'], ['50%', '70%'], ['60%', '60%'], ['80%', '80%'],
+    ['30%', '44%'], ['20%', '18%'], ['27%', '10%'], ['45%', '20%'],
+    ['57%', '16%'], ['54%', '30%'], ['70%', '14%'], ['89%', '63%'],
+]
 const refreshDungeons = () => {
     const tmp = new Array();
-    const lv = state.playerAttribute.lv;
-    for (let i = lv < 6 ? 1 : lv - 5; i < lv + 6; i++) {
+    const arr = deepCopy(locations);
+    for (let i = min.value; i <= max.value; i++) {
         const df = randomDungeonDifficulty();
-        tmp.push(new Dungeon(i, df));
+        const dugeon = new Dungeon(i, df);
+        const idx = Math.floor((Math.random() * arr.length));
+        const locate = arr.splice(idx, 1)[0];
+        dugeon.left = locate[0];
+        dugeon.top = locate[1];
+        tmp.push(dugeon);
     }
     dungeons.value = tmp;
+    refreshSecret();
+}
+
+const refreshSecret = () => {
+    if (state.playerAttribute.lv >= 100) {
+        xiaomi.value = new Dungeon(100, 'xiaomi', 1);
+        xiaomi.value.right = '4%';
+        xiaomi.value.top = '43%';
+        dami.value = new Dungeon(100, 'dami', layer.value);
+        dami.value.right = '9%';
+        dami.value.top = '29%';
+    }
 }
+watch(layer.value, (n) => {
+    dami.value?.setLayer(n);
+})
+watch(() => state.battle.battleShow, (n) => {
+    if (!n) {
+        dami.value?.setLayer(layer.value);
+    }
+})
 
 const setStype = () => {
     if (showMap.value) {
@@ -81,7 +131,7 @@ const keydown = (e) => {
 
 onMounted(() => {
     document.addEventListener('keydown', keydown)
-    refreshDungeons();
+    setTimeout(refreshDungeons, 500);
     setStype();
     window.onresize = setStype;
 });
diff --git a/src/views/dungeon/dungeonTips.vue b/src/views/dungeon/dungeonTips.vue
new file mode 100644
index 0000000..71761ef
--- /dev/null
+++ b/src/views/dungeon/dungeonTips.vue
@@ -0,0 +1,127 @@
+<template>
+    <div class="tips" v-if="dungeon">
+        <img :src="close_icon" class="close" @click="emit('close')"></img>
+        <div class="title">
+            {{ t('dungeonTips.0') }}:
+            <span v-if="show_lv_df.includes(dungeon.difficulty)">lv_{{ dungeon.lv }}</span>
+            {{ t('difficulty.' + dungeon.difficulty) }}
+            <span v-if="dungeon.difficulty == 'dami'">({{ layer }}{{ t('layer') }})</span>
+        </div>
+        <div class="tip">
+            <p>- {{ t('dungeonTips.2') }}</p>
+            <p>- {{ t('dungeonTips.3') }}</p>
+            <p>- {{ t('dungeonTips.4') }}</p>
+            <p>- {{ t('dungeonTips.5') }}</p>
+            <p>- {{ t('dungeonTips.6') }}</p>
+            <p>- {{ t('dungeonTips.7') }}</p>
+        </div>
+        <div class="rates">
+            {{ t('dungeonTips.1') }}:
+            <p :class="qualitys[4]">- {{ t('quality.' + qualitys[4]) }}:{{ rate4 }}</p>
+            <p v-if="!show_lv_df.includes(dungeon.difficulty)" :class="qualitys[5]">
+                - {{ t('quality.' + qualitys[5]) }}:{{ rate5 }}
+            </p>
+        </div>
+        <div class="actions">
+            <input type="checkbox" v-model="battle.repeat" id="repeat">
+            <label for="repeat">{{ t('dungeonAction.0') }}</label>
+            <span v-if="dungeon.difficulty == 'dami'">
+                <input type="checkbox" v-model="battle.upward" id="upward">
+                <label for="upward">{{ t('dungeonAction.1') }}</label>
+            </span>
+            <button class="button" @click="emit('battle')">{{ t('dungeonAction.2') }}</button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { useStore } from "vuex";
+import { reactive, onMounted, ref, computed } from "vue";
+import { useI18n } from "vue3-i18n";
+import { close_icon, qualitys, show_lv_df } from "@/config";
+
+const { t } = useI18n();
+const { state, commit, dispatch } = useStore();
+const emit = defineEmits(['close', 'battle'])
+const rate4 = computed(() => {
+    if (!props.dungeon) {
+        return '';
+    }
+    const boss = props.dungeon.monsters[4];
+    return boss.extraRate[0].toFixed(4) * 100 + '%';
+})
+const rate5 = computed(() => {
+    if (!props.dungeon) {
+        return '';
+    }
+    const boss = props.dungeon.monsters[4];
+    return boss.extraRate[1].toFixed(4) * 100 + '%';
+})
+const battle = computed(() => {
+    return state.battle;
+})
+const layer = computed(() => {
+    return state.playerAttribute.layer;
+})
+
+const props = defineProps({
+    dungeon: {
+        type: Object,
+        default: null
+    },
+})
+
+onMounted(() => { });
+</script>
+<style lang="scss" scoped>
+.tips {
+    background: rgba(0, 0, 0, 0.6);
+    position: absolute;
+    left: calc(50% - 10rem);
+    top: calc(50% - 8rem);
+    width: 20rem;
+    text-align: left;
+    padding: 0.4rem;
+
+    .close {
+        cursor: pointer;
+        width: 2rem;
+        height: 2rem;
+        float: right;
+    }
+
+    .title {
+        height: 3rem;
+        line-height: 3rem;
+        font-size: 1.2rem;
+    }
+
+    .tip {
+        padding-left: 0.4rem;
+
+        p {
+            color: #999;
+            font-size: 0.8rem;
+            margin: 0rem;
+        }
+    }
+
+    .rates {
+        margin-top: 0.5rem;
+
+        p {
+            padding-left: 0.4rem;
+        }
+    }
+
+    .actions {
+        position: relative;
+        bottom: 0;
+        margin-top: 0.5rem;
+
+        button {
+            float: right;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/illustrated/equips.vue b/src/views/illustrated/equips.vue
index 8db8cdd..89ef8c3 100644
--- a/src/views/illustrated/equips.vue
+++ b/src/views/illustrated/equips.vue
@@ -1,11 +1,13 @@
 <template>
-    <div class="title">{{ t('quality.' + quality) }}{{ t(type + '.type') }}
+    <div v-if="samples.length > 0" :class="['title', quality]">
+        {{ t('extraQuality.' + extraQuality) }}
+        {{ 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 +17,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 +30,27 @@ const props = defineProps({
         type: String,
         default: ''
     },
-    categorys: {
+    extraQuality: {
+        type: String,
+        default: ''
+    },
+    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 +67,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..b7876f1 100644
--- a/src/views/illustrated/illustrated.vue
+++ b/src/views/illustrated/illustrated.vue
@@ -6,8 +6,11 @@
     <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" extraQuality="taigu" :samples="taigu[item.name]" />
+                <Equips :type="item.name" quality="colorful" extraQuality="yuangu" :samples="yuangu[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 +22,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, bracersSamples } from "@/config";
 import Equips from "./equips.vue";
 
 const { t } = useI18n();
@@ -28,24 +30,66 @@ const { state, commit, dispatch } = useStore();
 const showIllustrated = computed(() => {
     return state.curMenu == 'illustrated';
 });
+const taigu = {
+    weapon: weaponSamples.taigu,
+    armor: armorSamples.taigu,
+    neck: neckSamples.taigu,
+    ring: ringSamples.taigu,
+    jewelry: jewelrySamples.taigu,
+    pants: pantsSamples.taigu,
+    shoes: shoesSamples.taigu,
+    bracers: bracersSamples.taigu,
+}
+const yuangu = {
+    weapon: weaponSamples.yuangu,
+    armor: armorSamples.yuangu,
+    neck: neckSamples.yuangu,
+    ring: ringSamples.yuangu,
+    jewelry: jewelrySamples.yuangu,
+    pants: pantsSamples.yuangu,
+    shoes: shoesSamples.yuangu,
+    bracers: bracersSamples.yuangu,
+}
+const colorful = {
+    weapon: weaponSamples.colorful,
+    armor: armorSamples.colorful,
+    neck: neckSamples.colorful,
+    ring: ringSamples.colorful,
+    jewelry: jewelrySamples.colorful,
+    pants: pantsSamples.colorful,
+    shoes: shoesSamples.colorful,
+    bracers: bracersSamples.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,
+    bracers: bracersSamples.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,
+    bracers: bracersSamples.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' },
+    { label: t('bracers.type'), name: 'bracers' },
 ]
 
 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/menu.vue b/src/views/menu.vue
index ef11cb9..0a4b13c 100644
--- a/src/views/menu.vue
+++ b/src/views/menu.vue
@@ -2,7 +2,7 @@
     <div class='menu' @contextmenu.prevent="">
         <Backpack />
         <Shop />
-        <Reborn />
+        <Point />
         <SaveGame />
         <Archive />
         <Dungeon />
@@ -20,6 +20,7 @@ import Backpack from "./backpack";
 import Shop from "./shop";
 import Dungeon from './dungeon';
 import Reborn from "./reborn";
+import Point from "./point";
 import SaveGame from "./save-game.vue";
 import Archive from "./archive.vue";
 import Music from "./music.vue";
diff --git a/src/views/message/attribute.vue b/src/views/message/attribute.vue
index 4190ff3..ece54de 100644
--- a/src/views/message/attribute.vue
+++ b/src/views/message/attribute.vue
@@ -72,13 +72,10 @@ let interval = 0;
 const attribute = computed(() => {
     return state.playerAttribute.attribute;
 })
-const recoverSpeed = computed(() => {
-    return state.rebornAttribute.recoverSpeed;
-})
 
 onMounted(() => {
     interval = setInterval(() => {
-        commit('add_player_curhp', Math.ceil(attribute.value.hp * 0.02 * (1 + recoverSpeed.value / 100)))
+        commit('add_player_curhp', Math.ceil(attribute.value.hp * 0.02))
     }, 1000);
 });
 onBeforeUnmount(() => {
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/point/index.ts b/src/views/point/index.ts
new file mode 100644
index 0000000..98320e6
--- /dev/null
+++ b/src/views/point/index.ts
@@ -0,0 +1,3 @@
+import Point from './point.vue';
+
+export default Point;
diff --git a/src/views/reborn/reborn.vue b/src/views/point/point.vue
similarity index 55%
rename from src/views/reborn/reborn.vue
rename to src/views/point/point.vue
index df670e7..8665b51 100644
--- a/src/views/reborn/reborn.vue
+++ b/src/views/point/point.vue
@@ -1,32 +1,27 @@
 <template>
-    <Tooltip :infos="[t('rebornMenu.0'), t('rebornMenu.1')]" width="12rem">
+    <Tooltip :infos="[t('menu')]" width="12rem">
         <img class="menu-img" :src="menu_icons.reborn" @click="showMenu">
     </Tooltip>
 
-    <Dialog :title="t('rebornMenu.0')" v-model="showReborn" top="4rem" :left="state.mobile ? '4%' : '8%'"
-        padding="0.7rem">
+    <Dialog :title="t('menu')" v-model="showReborn" top="4rem" :left="state.mobile ? '4%' : '8%'" padding="0.7rem">
         <div class="message">
-            <p>{{ t('canGetPoint') + getPoints }}</p>
             <div class="tips">
-                <p>- {{ t('rebornDesc.0') }}</p>
-                <p>- {{ t('rebornDesc.1') }}</p>
-                <p>- {{ t('rebornDesc.2') }}</p>
-            </div>
-            <div class='btn-div'>
-                <button class="button" @click="reborn">{{ t('rebornConfirm') }}</button>
+                <p>- {{ t('desc.0') }}</p>
+                <p>- {{ t('desc.1') }}</p>
+                <p>- {{ t('desc.2') }}</p>
             </div>
         </div>
-        <div class="reborn">
+        <div class="points">
             <div class="info">
-                <p>{{ t('rebornNum.0') }} ：{{ rebornPoints.count }}次</p>
-                <p>{{ t('rebornNum.1') }} ：{{ rebornPoints.points }}</p>
+                <p>{{ t('total') }} ：{{ points.total }}</p>
+                <p>{{ t('has') }} ：{{ points.has }}</p>
             </div>
             <div class="attributes">
-                <div class="attribute" v-for="attr in reborn_arrts" :key="attr">
+                <div class="attribute" v-for="attr in piont_arrts" :key="attr">
                     <p>
                         <img :src="attr_icon_urls[attr]">
                         <span>
-                            {{ t(attr + '.0') }}：+{{ rebornAttribute[attr].toFixed(2) }}
+                            {{ t1(attr + '.0') }}：+{{ baseAttribute[attr] }}
                             {{ attr_unitys[attr] }}
                         </span>
                     </p>
@@ -35,7 +30,7 @@
                             <button class="button" @mousedown="mousedown(-1, attr, $event)"
                                 @touchstart="touchstart(-1, attr)" @touchend="touchend(-1)">-</button>
                         </Tooltip>
-                        <input type="number" min="0" disabled v-model="rebornPoints[attr]">
+                        <input type="number" min="0" disabled v-model="points[attr]">
                         <Tooltip :infos="[t('addPoints')]" width="10rem">
                             <button class="button" @mousedown="mousedown(1, attr, $event)"
                                 @touchstart="touchstart(1, attr)" @touchend="touchend(1)">+</button>
@@ -45,52 +40,29 @@
             </div>
         </div>
     </Dialog>
-
-    <Confirm ref="confirm" width="10rem" :tip="t('rebornComfirm.0').replace('${points}', getPoints + '')"
-        :confirm="t('rebornComfirm.1')" :cancel="t('rebornComfirm.2')" @confirm="confirmReborn" />
-
 </template>
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
-import { computed, onBeforeUnmount, onMounted, ref } from "vue";
+import { reactive, onMounted, ref, computed, onBeforeUnmount } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip, Dialog, Confirm } from "@/components"
-import { getPointsOfReborn } from "@/tool";
-import { menu_icons, reborn_arrts, attr_icon_urls, attr_unitys, backpack_num } from "@/config";
+import { menu_icons, piont_arrts, attr_icon_urls, attr_unitys, backpack_num } from "@/config";
+import { createt } from "@/config/i18n";
 
-const { t } = useI18n();
+const t = createt('point.');
+const t1 = useI18n().t;
 const { state, commit, dispatch } = useStore();
 const showReborn = computed(() => {
-    return state.curMenu == 'reborn';
+    return state.curMenu == 'point';
 });
-const getPoints = computed(() => {
-    return getPointsOfReborn(state.playerAttribute);
+const points = computed(() => {
+    return state.points;
 })
-const rebornPoints = computed(() => {
-    return state.rebornPoints;
+const baseAttribute = computed(() => {
+    return state.baseAttribute;
 })
-const rebornAttribute = computed(() => {
-    return state.rebornAttribute;
-})
-const confirm = ref();
-
-const reborn = (e) => {
-    if (state.playerAttribute.lv <= 30) {
-        commit("set_sys_info", { msg: t('rebornLvTip'), type: 'warning' });
-        return
-    }
-    confirm.value.open(0, e)
-}
-
-const confirmReborn = () => {
-    const points = getPoints.value;
-    rebornPoints.value.count++;
-    rebornPoints.value.points += points;
-    dispatch('reset_player_equi')
-    commit('set_player_coins', 0)
-    commit('set_backpack', new Array(backpack_num))
-}
+const arrts = ['hp', 'atk', 'crit', 'critDmg', 'def', 'bloc', 'moveSpeed', 'battleSpeed'];
 
 let flag = false;
 let curAttr = '';
@@ -136,9 +108,8 @@ const mouseup = (e) => {
 
 const changeAttribute = () => {
     if (flag) {
-        debugger
-        const rp = rebornPoints.value;
-        const point = rp.points;
+        const rp = points.value;
+        const point = rp.has;
         const oldPoint = rp[curAttr];
         let num = 0;
         if (curNum > 0 && point > 0) {
@@ -148,14 +119,15 @@ const changeAttribute = () => {
         }
         if (num != 0) {
             rp[curAttr] = oldPoint + num;
-            rp.points = point - num;
-            commit('set_reborn_points', rp)
+            rp.has = point - num;
+            commit('set_points', rp)
         }
         setTimeout(changeAttribute, 100);
     }
 }
+
 const showMenu = () => {
-    state.curMenu = showReborn.value ? null : 'reborn';
+    state.curMenu = showReborn.value ? null : 'point';
 }
 const keydown = (e) => {
     if (e.keyCode == 82 && !e.ctrlKey) {
@@ -165,7 +137,6 @@ const keydown = (e) => {
 onMounted(() => {
     document.addEventListener('keydown', keydown)
     document.addEventListener('mouseup', mouseup)
-    state.rebornPoints.points = 100;
 });
 onBeforeUnmount(() => {
     document.removeEventListener('keydown', keydown)
@@ -173,10 +144,6 @@ onBeforeUnmount(() => {
 })
 </script>
 <style lang="scss" scoped>
-* {
-    color: white;
-}
-
 .message {
     display: flex;
     flex-direction: column;
@@ -189,6 +156,7 @@ onBeforeUnmount(() => {
 
     .tips {
         padding-left: 1.3rem;
+        text-align: left;
 
         p {
             color: #999;
@@ -196,17 +164,9 @@ onBeforeUnmount(() => {
             margin: 0rem;
         }
     }
-
-
-    .btn-div {
-        padding: 0.1rem;
-        display: flex;
-        justify-content: flex-end;
-        padding-right: 2rem;
-    }
 }
 
-.reborn {
+.points {
     padding: 0.1rem;
     width: 32rem;
 
@@ -215,7 +175,6 @@ onBeforeUnmount(() => {
         display: flex;
         justify-content: space-between;
     }
-
 }
 
 .attributes {
@@ -227,7 +186,7 @@ onBeforeUnmount(() => {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 0.7rem;
+    padding: 0.3rem 0.7rem;
 
     p {
         display: flex;
@@ -254,61 +213,4 @@ onBeforeUnmount(() => {
 
     }
 }
-
-@media only screen and (max-width: 768px) {
-
-    .message {
-        padding-bottom: 0.5rem;
-
-        p {
-            margin: 0.5rem;
-        }
-
-        .tips {
-            padding-left: 0.8rem;
-        }
-
-        .btn-div {
-            padding: 0rem;
-            padding-right: 1rem;
-        }
-    }
-
-    .reborn {
-        padding: 0.1rem;
-        width: 23.5rem;
-
-        .info {
-            padding: 0.2rem;
-        }
-
-    }
-
-    .attributes {
-        padding: 0.05rem 0;
-    }
-
-    .attribute {
-        padding: 0.5rem 0rem;
-
-        p {
-
-            span {
-                margin-left: 0.2rem;
-            }
-        }
-
-        .group {
-
-            input {
-                width: 4rem;
-                color: black;
-                height: 1.8rem;
-                font-size: 0.8rem;
-            }
-
-        }
-    }
-
-}
 </style>
\ No newline at end of file
diff --git a/src/views/reborn/index.ts b/src/views/reborn/index.ts
deleted file mode 100644
index 52465ae..0000000
--- a/src/views/reborn/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Reborn from './reborn.vue';
-
-export default Reborn;
diff --git a/src/views/save-game.vue b/src/views/save-game.vue
index f102e48..562ac34 100644
--- a/src/views/save-game.vue
+++ b/src/views/save-game.vue
@@ -9,7 +9,7 @@ import { useStore } from "vuex";
 import { onBeforeUnmount, onMounted, ref } from "vue";
 import { useI18n } from "vue3-i18n";
 import { Tooltip } from "@/components"
-import { menu_icons, archive_name } from "@/config";
+import { menu_icons } from "@/config";
 import { Base64 } from "js-base64";
 
 const { t } = useI18n();
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>
diff --git a/src/views/version/update-log.vue b/src/views/version/update-log.vue
index fc7766a..bff72ae 100644
--- a/src/views/version/update-log.vue
+++ b/src/views/version/update-log.vue
@@ -1,6 +1,10 @@
 <template>
     <div class="version">
         <div class="title">当前版本：{{ curVersion }}</div>
+        <div class="title">
+            历史版本：
+            <a v-for="v in hisVersions" :href="v.url" target="_blank">{{ v.version }}</a>
+        </div>
         <div v-for="log in updateLogs">
             <div class="title">{{ log.date }}({{ log.version }})</div>
             <div v-if="log.desc" class="desc">-{{ log.desc }}</div>
@@ -28,9 +32,42 @@ import { useI18n } from "vue3-i18n";
 const { t } = useI18n();
 const { state, commit, dispatch } = useStore();
 
-const curVersion = '测试版';
+const curVersion = '1.0';
+const hisVersions = [
+    { version: '测试版', url: "http://couy.xumy.vip/test/" }
+]
 
 const updateLogs: any = [{
+    date: '2025-05-17', version: '1.0',
+    adjust: [
+        '新增装备属性:伤害加成,伤害减免,暴击避免,爆伤减免,移动速度,转生属性副本行进速度更改为移动速度',
+        '新增装备类型:饰品,裤子,鞋子,护腕',
+        '新增装备品质: 神话, 神话品质装备拥有独特的主被动技能',
+        '新增远古神话和太古神话品质',
+        '每个部位新增多个神话品质装备',
+        '设置副本等级上限和角色等级上限为100级',
+        '新增大秘境和小秘境(角色满级后开启)',
+        '增加扩充背包功能',
+        '重铸新增确认保留功能',
+        '攻击时新增伤害随机系数',
+        '调整部分旧版本装备属性',
+        '调整战斗逻辑, 适配新增属性和技能',
+        '调整护甲减伤比例(调低)',
+        '调整格挡属性数值(调低)',
+        '调整暴击率和暴击伤害数值随装备等级线性增长(1级为原来一半, 100级与原来相等)',
+        '防御加成(调高)、生命加成数值(调低)',
+        '装备图鉴显示方式调整,图鉴新增爆率显示',
+        '移除转生功能,转生点改为属性点',
+        '调整属性点对移动速度的加成(调低)',
+        '移除生命回复速度加点',
+        '存档功能调整(加密和校验)',
+        '调高独特装备强化费用',
+        '自动出售可勾选独特品质',
+        '更改世界地图图片,副本位置全地图随机改为调整在地图特定位置随机',
+        '装备随机方式变更,同品质所有部位随机',
+    ],
+    bug: ['修复继承不消耗金币BUG']
+}, {
     date: '2025-04-26', version: '测试版',
     adjust: [
         '新增装备强化继承功能',
@@ -101,9 +138,9 @@ const updateLogs: any = [{
     adjust: [
         '通过副本获得装备与金币',
         '副本分简单、普通、困难、极难四个难度，普通难度外副本通关后变为普通难度，普通难度副本通关后回继续挑战副本',
-        '通用装备分为四个等级：破旧、普通、神器、史诗', '主角默认每秒回血 2%',
+        '通用装备分为四个等级：破旧、普通、独特、史诗', '主角默认每秒回血 2%',
         '默认暴击伤害 150%',
-        '完成副本时可能掉落独特级别(5 个词条)的装备（通关后 2.5%掉落率，无尽挑战不会掉落）'
+        '完成副本时可能掉落独特级别(5 个词条)的装备'
     ]
 }]
 
diff --git a/yarn.lock b/yarn.lock
index ed29009..9c824d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2448,6 +2448,11 @@ cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypto-js@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
+
 css-declaration-sorter@^6.3.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"