update wardrobe

index.html

@@ -56,15 +56,13 @@
   </head>
     <div class='announcement'>
       Nikki's wardrobe. By Ivan's workshop<br/>
-      服装数据来自jillhx@贴吧 20150604<br/>
-      Update 20150605:<br/>
+      服装数据来自jillhx@贴吧 20150605<br/>
+      Update 20150605晚:<br/>
       <ul>
-        <li>jillhx的衣柜已经更新到：合计1812 衣柜占比93% 离全收集已经不远了！！</li>
-        <li>已经在amy_翡翠的帮助下将袜子和饰品按照装备部位区分，更方便选择</li>
-        <li>关卡权重更新了，注意公主关和少女关权重一样(谢谢dianashusy和娘娘不干啦的帮助)。楼主无能，还没有开启第六章支线，等待好心人解救中。你们使用时可以把大喵的提示加倍。</li>
+        <li>jillhx的衣柜已经更新到：合计1845 衣柜占比95% 离全收集已经不远了！请检查jillhx的衣柜贴看看有没有可以帮忙补完的。</li>
+        <li>已经更新全部关卡权重，具体数值可能有0.5的误差，不过基本不影响使用。</li>
       </ul>
       <strong>衣服属性错误请汇报给<a href="http://tieba.baidu.com/p/3783436049">jillhx的衣柜贴</a></strong><br/>
-      <strong>请抽空去<a href="http://tieba.baidu.com/p/3803353203">amy_翡翠的完善召集令</a>看看有没有你可以帮忙补充的衣服情报</strong><br/>
       <strong>注意！饰品穿多了有衰减，请不要穿超过10件饰品，不要穿低分饰品</strong><br/>
       说起来，看到各位纷纷拿到了连胜或者第一的各种成就，我很欣慰，其实最初的目的只是想让大家节省一些脑细胞和时间，不要把时间都浪费在无聊地筛选数字上，这种事情电脑做合适。
       没有想到的是那么多朋友都跑过来感谢说在线筛选器帮助了自己，我也看到了你们在吧里向其他人推荐这个网页，我很惶恐，也很感动。但愿这个小小的软件能让你们在玩奇迹的每一天心情都可以好一些。<br/>

levels.js

@@ -115,10 +115,12 @@ var levelsRaw = {
   '6-8': [1, -1, -3, -2, 2],
   '6-9': [-1, -2, -3, -2, 1],
   '6-10': [-1.5, 2, -1, 1, -2],
-  '6-11': [2, -1, -3, 2, 1]
+  '6-11': [2, -1, -3, 2, 1],
+  '6-支1': [-2, -1, -3, -2, 1],
+  '6-支2': [-3, 2, 1, 1, 2],
+  '6-支3': [-2, -3, 1, -1, 2]
 };
 
-
 function parseCriteriaList(criteria) {
   return {
     'simple': criteria[0],

raw/bottoms.csv

@@ -122,6 +122,7 @@
 夏日假期*白,140,3,,,5,,5,,5,,4,4,,森女系列,,定139,23,23,18,19,0,4,10,9,13,19,9
 小然,141,3,,,5,,3,,5,,5,5,,森女系列,,店/迷幻,23,23,20,18,0,5,8,10,15,18,10
 单纯以宁,142,2,,,4,,4,,3,,4,5,,森女系列,,迷,20,20,16,16,0,5,7,8,12,15,9
+美食外卖员*裙,147,3,,,5,,4,,4,,4,4,,,,设计图,21,21,17,17,0,4,8,9,12,17,9
 神圣医者*裙,148,3,,,5,5,,5,,4,,4,,OL,,1-9少,23,9,14,13,14,18,4,15,9,5,23
 爱丽丝奇遇,149,4,,5,,,5,,4,,5,4,,童话系,,兑换,23,18,13,13,5,9,14,5,18,14,4
 海豹小水手,150,4,,,3,,4,,6,,5,5,,小动物,,迷,23,23,19,18,0,5,10,8,16,18,8

raw/coat.csv

@@ -33,13 +33,16 @@
 音学园*蓝,022,3,,,4,,4,,5,,4,,5,,,定021,22,17,13,13,5,0,14,13,9,22,4
 音学园*白,023,3,,,4,,4,,4,,5,,4,,,定021,21,17,13,12,4,0,12,13,9,21,4
 画家*妃,024,4,,,5,5,,4,,,5,,5,防晒,,设计图,24,10,15,5,14,9,5,24,10,15,14
+画家*青,025,4,,,5,5,,,3,,6,,5,,,定024,24,14,19,8,10,5,8,21,14,19,10
+画家*红,026,4,,,5,,5,,2,,5,,5,,,定024,22,17,12,12,5,0,12,15,7,22,5
+画家*白,027,4,,,5,5,,,2,,6,,5,,,定024,23,13,18,7,10,5,7,21,13,18,10
 短款外套*灰,028,3,,,5,4,,5,,,4,,4,中性风,OL,店/迷幻,22,9,13,5,13,9,4,22,8,13,14
 短款外套*米,029,3,,,4,4,,5,,,4,,4,中性风,OL,定028,21,8,12,4,13,9,4,21,8,12,13
 短款外套*橙,030,3,,,4,5,,5,,,4,,4,,,定028,22,8,13,4,14,10,4,22,9,12,14
 短款外套*蓝,031,3,,,4,5,,4,,4,,,4,,,定028,21,4,9,8,17,13,8,17,5,8,17
 职场佳丽,032,3,,,5,5,,4,,4,,,4,OL,,定/迷幻,22,5,10,9,17,13,8,18,5,9,18
 卡布奇诺,033,3,,,5,3,,3,,,5,,5, 英伦,,设计图,21,10,13,5,11,6,5,21,8,15,11
-彩蝶,034,4,,,5,3,,,5,,5,,5,和风,,设计图,23,15,18,10,8,3,10,18,13,20,8
+彩蝶,034,4,,,5,3,,,5,,5,,5,和风,,设计图,,,,,,,,,,,
 巫女的短衣,035,4,,5,,5,,3,,,5,,5,和风,,设计图,23,5,10,0,18,13,10,18,15,10,8
 牛仔小妞,036,3,,,5,,4,3,,5,,5,,侠客联盟,,迷幻/5-6公,22,14,10,19,8,13,9,8,5,9,18
 牛仔风情,037,4,,5,,,5,5,,4,,5,,侠客联盟,,进化,24,10,5,14,14,19,14,5,10,5,14
@@ -53,7 +56,7 @@
 紫翼*珍稀,046,5,,5,,3,,,6,,6,5,,,,定045,25,17,20,11,8,13,11,9,25,12,8
 荧珑,047,3,,4,,,5,,5,,5,4,,童话系,,迷幻/4-1公,23,19,14,14,4,8,14,5,18,15,4
 荧珑*华丽,048,5,,5,,,5,,5,,6,5,,童话系,,进化,26,21,16,15,5,10,15,6,21,16,5
-沃裙兰袄,049,,,4,,5,,,4,,5,,5,中式古典,,迷,23,9,14,4,14,9,13,15,18,14,5
+沃裙兰袄,049,4,,4,,5,,,4,,5,,5,中式古典,,迷,23,9,14,4,14,9,13,15,18,14,5
 彼岸花,050,3,,5,,,4,,4,4,,5,,和风,,迷幻/2-8公,22,13,9,17,9,14,17,0,14,8,9
 彼岸花*华丽,051,4,,5,,4,,,3,5,,,5,和风,,进化/迷幻,22,3,7,8,19,14,18,9,12,8,9
 彼岸花*珍稀,052,5,,6,,5,,,4,5,,,5,和风,,进化,25,4,9,9,21,16,20,10,15,9,10
@@ -138,6 +141,9 @@
 豹纹开衫*冷,169,3,,5,,5,,4,,4,,,5,,,店,23,0,5,4,23,18,14,14,10,5,13
 豹纹开衫*暖,170,3,,3,,5,,5,,5,,,4,,,定169,22,0,5,5,22,18,12,14,8,4,15
 萤尘,171,3,,,5,3,,,4,,5,5,,,,店,22,19,22,14,3,8,4,13,17,14,13
+彩蝶*落花,176,4,,4,,4,,,4,,4,,6,,,定034,22,8,12,4,14,8,14,14,16,14,4
+彩蝶*兰趣,177,4,,5,,5,,5,,,3,,5,,,定034,23,3,8,0,20,15,10,18,13,8,10
+彩蝶*翠意,178,4,,4,,4,,4,,,6,,6,,,定034,24,6,10,0,18,12,10,20,14,12,8
 剪裁t恤*蓝,179,3,,,5,,5,3,,3,,5,,,,定039,21,15,10,18,6,11,8,8,5,10,16
 剪裁t恤*黑,180,3,,,4,,5,3,,5,,4,,,,定039,21,13,8,18,8,12,10,7,4,9,16
 剪裁t恤*浅咖,181,3,,,5,,3,3,,5,,5,,,,定039,21,13,10,18,8,13,8,8,5,8,18

raw/dress.csv

@@ -17,7 +17,12 @@
 白莲,004,3,,,4,5,,2,,,4,4,,,,定003,19,12,17,8,7,11,0,15,13,8,15
 白雪喵星人,006,4,,,5,,5,,5,,5,4,,,,迷,24,24,19,19,0,4,10,10,14,20,9
 虎皮喵星人,008,4,,,4,,4,,5,,5,4,,,,定006,22,22,18,17,0,4,9,9,14,18,8
+童话星辰,009,5,,4,,,4,,5,,5,5,,洛丽塔,,迷,23,19,15,14,4,9,13,5,19,14,5
+风谷星辰,010,5,,5,,,4,,6,,5,5,,洛丽塔,,定009,25,20,16,15,5,10,15,5,21,15,5
 仲夏星辰,011,5,,4,,,5,,6,,5,5,,洛丽塔,,定009,25,21,16,16,4,9,15,5,20,16,5
+巧克力泰迪,012,5,,6,,,4,,5,,5,5,,,,迷,25,19,15,14,6,11,15,5,21,14,5
+糖果泰迪,013,5,,5,,,5,,4,,5,5,,,,定012,24,19,14,14,5,10,14,5,19,14,5
+棉花糖泰迪,014,5,,4,,,5,,5,,6,5,,,,定012,25,21,16,15,4,9,14,6,20,16,5
 魔域筝灵,015,3,,5,,,2,,5,4,,5,,洛丽塔,哥特风,设计图,21,12,10,16,9,14,16,0,15,7,9
 神域筝灵,016,3,,4,,,2,,5,,5,5,,,,定015,21,17,15,12,4,9,11,5,19,12,5
 雪域筝灵,017,3,,4,,,4,,5,,4,4,,,,定015,21,17,13,13,4,8,13,4,17,13,4
@@ -56,6 +61,10 @@
 方片情人*黑,053,3,,,5,5,,4,,3,,4,,,,定051,21,9,14,12,12,16,3,14,9,5,21
 四叶草之恋*粉,054,3,,4,,,5,,4,,4,5,,,,店/幻,22,18,13,14,4,9,13,4,17,13,5
 四叶草之恋*蓝,055,3,,4,,,5,,4,,4,4,,,,定054,21,17,12,13,4,8,13,4,16,13,4
+歌者*粉,056,3,,,5,4,,,4,,4,,4,,,设计图,21,13,17,9,8,4,8,17,12,17,9
+歌者*紫,057,3,,,4,4,,,4,,5,,4,,,定056,21,13,17,8,8,4,8,17,13,17,8
+歌者*白,058,3,,,4,4,,,5,,5,5,,,,定056,23,19,23,14,4,9,5,13,19,14,13
+歌者*青,059,3,,,5,4,,,5,,5,4,,,,定056,23,19,23,14,4,8,5,14,18,15,13
 绿烟,060,4,,,5,5,,,5,,5,3,,中式古典,,迷幻/1-7公,23,18,23,13,5,8,5,15,18,15,13
 绿烟林微,061,5,,5,,5,,5,,,6,3,,中式古典,,进化,24,9,14,3,15,18,5,16,19,6,13
 名媛连衣裙,062,3,,,5,4,,5,,4,,,4,,,设计图,22,5,9,9,17,13,8,18,4,9,18
@@ -79,6 +88,7 @@
 梦幻芭比,081,4,,,5,3,,,5,5,,5,,洛丽塔,,店/迷幻,23,15,18,20,8,13,10,8,13,10,18
 镂花夜,082,4,,5,,5,,4,,4,,5,,,,迷幻,23,5,10,9,18,23,9,9,15,0,18
 星星连衣裙,083,3,,,5,4,,5,,,4,4,,碎花,,店,22,13,17,9,9,13,0,18,12,9,18
+午夜精灵,084,2,,,4,5,,4,,4,,4,,,,设计图,21,8,13,12,13,17,4,13,9,4,21
 品酒师,085,2,,,4,4,,4,,4,,,4,,,店/迷/6-1少,20,4,8,8,16,12,8,16,4,8,16
 惑影,086,3,,,4,4,,5,,4,,4,,,,店/迷幻,21,8,12,12,13,17,4,13,8,4,21
 凉爽夏天,087,2,,,4,4,,2,,,4,4,,,,店,18,12,16,8,6,10,0,14,12,8,14
@@ -152,6 +162,8 @@
 糖果心,171,3,,,5,,4,,4,,5,4,,洛丽塔,,设计图,22,22,18,17,0,4,8,10,13,18,9
 星夜占卜师,173,5,,6,,3,,,5,5,,,4,童话系,,迷幻,23,5,8,10,18,14,20,7,14,9,8
 金叶婀娜,174,4,,5,,5,,4,,5,,5,,晚礼服,,迷幻,24,5,10,10,19,24,10,9,15,0,19
+信鸽庄园,176,4,,3,,6,,5,,3,,,6,,,店,23,0,6,3,23,17,12,17,9,6,14
+鎏金岁月,177,4,,5,,5,,5,,4,,,4,,,设计图,23,0,5,4,23,19,13,14,10,4,14
 西域珍宝,178,5,,5,,5,,5,,3,,,5,,,幻,23,0,5,3,23,18,13,15,10,5,13
 暖之舞,179,3,,,3,4,,3,,3,,,2,欧式古典,,2-9少/3-8公,15,3,7,6,12,10,5,12,4,5,13
 暖暖之舞,180,4,,4,,5,,5,,4,,,5,欧式古典,,进化,23,0,5,4,23,18,13,15,9,5,14
@@ -201,6 +213,7 @@
 蝴蝶夫人,234,5,,6,,3,,,4,5,,5,,童话系,,成就,23,9,12,14,14,19,15,3,18,4,13
 雪梨汤,235,4,,4,,,4,,6,,3,6,,,,幻,23,19,15,16,4,10,14,3,19,13,6
 好学生,236,3,,,5,,5,,4,,3,4,,,,店,21,21,16,18,0,4,9,8,11,17,9
+稚红海,238,3,,,4,,4,,4,,2,5,,,,成就,19,19,15,17,0,5,8,6,11,14,9
 琉光蔷薇,241,4,,4,,,5,,4,,5,5,,洛丽塔,,幻,23,19,14,14,4,9,13,5,18,14,5
 梦幻下午茶,242,4,,4,,4,,,5,,5,5,,洛丽塔,,幻,23,15,19,10,8,13,9,9,23,10,9
 暗夜萝莉,243,4,,4,,5,,,5,,5,,4,哥特风,洛丽塔,幻,23,10,15,5,13,9,13,14,19,14,5
@@ -245,6 +258,9 @@
 瓷轻狂,288,3,,,3,5,,5,,3,,5,,民国服饰,旗袍,定286,21,8,13,11,13,18,3,13,10,3,21
 幽竹归,289,3,,,2,,5,,5,,5,5,,,,定286,22,22,17,17,0,5,10,7,15,17,7
 啄夕,291,4,,,3,5,,5,,3,,6,,民国服饰,旗袍,店,22,9,14,12,13,19,3,13,11,3,22
+岭梅,292,4,,,3,5,,5,,5,,5,,民国服饰,旗袍,定291,23,8,13,13,15,20,5,13,10,3,23
+浅草,293,4,,,5,3,,6,,3,,6,,民国服饰,旗袍,定291,23,11,14,14,12,18,3,14,9,5,23
+落英缤纷,294,4,,,5,5,,,4,4,,5,,民国服饰,旗袍,定291,23,14,19,18,9,14,8,10,14,9,19
 山杏叶,295,3,,3,,5,,3,,,5,,5,中式古典,,5-6少,21,5,10,0,16,11,8,18,13,10,8
 黄鹂,296,3,,,5,5,,3,,,5,,5,,,定295,23,10,15,5,13,8,5,23,10,15,13
 采桑,297,3,,,5,3,,3,,,5,,5,,,定295,21,10,13,5,11,6,5,21,8,15,11
@@ -265,7 +281,7 @@
 名媛连衣裙*白,315,3,,,4,5,,3,,,5,,4,,,定062,21,9,14,4,12,8,4,21,10,13,12
 金菊呈祥*鱼乐,316,3,,3,,6,,3,,,5,,3,和风,,定065,20,5,11,0,15,12,6,17,14,8,9
 金菊呈祥*鹅黄,317,3,,3,,5,,3,,,5,,5,和风,,定065,21,5,10,0,16,11,8,18,13,10,8
-金菊呈祥*落花,318,3,,3,,,,5,,,5,,5,和风,,定065,18,5,5,0,13,8,8,15,8,10,5
+金菊呈祥*落花,318,3,,3,,3,,5,,,5,,5,和风,,定065,21,5,8,0,16,11,8,18,11,10,8
 岚谧轻翠,319,3,,4,,4,,5,,,4,,5,和风,,定064,22,4,8,0,18,13,9,18,12,9,9
 岚谧轻海,320,3,,4,,4,,5,,,4,,4,和风,,定064,21,4,8,0,17,13,8,17,12,8,9
 岚谧轻蕊,321,3,,4,,2,,5,,,5,,5,和风,,定064,21,5,7,0,16,11,9,17,11,10,7

raw/hair.csv

@@ -70,6 +70,7 @@
 荒原珠*华丽,069,4,,5,,6,,,3,5,,,3,波西米亚,,进化,22,3,9,8,19,16,16,9,14,6,11
 荒原珠*珍稀,070,5,,6,,6,,,3,5,,,3,波西米亚,,进化,23,3,9,8,20,17,17,9,15,6,11
 中学少女,071,2,,,4,,3,,2,,4,4,,,,3-12公,17,17,14,13,0,4,5,8,10,13,8
+中学少女*华丽,072,3,,,5,4,,4,,,5,2,,,,进化,20,12,16,7,8,10,0,18,11,10,15
 洋娃娃*金,074,4,,5,,,6,,6,,3,,4,,,店,24,15,9,12,9,5,21,7,14,19,0
 可人,076,3,,4,,5,,,3,,5,,4,,,迷幻/1-1公,21,8,13,3,13,9,11,14,17,12,5
 可人*华丽,077,4,,5,,5,,4,,5,,,5,,,进化,24,0,5,5,24,19,15,14,10,5,14
@@ -123,7 +124,7 @@
 千枫*珍稀,135,5,,5,,5,,,5,3,,,5,,,进化,23,5,10,8,18,13,18,10,15,10,8
 鬼姬,136,3,,,4,,3,,4,,5,5,,和风,,迷幻/3-2公/4-11公,21,21,18,16,0,5,7,9,14,16,9
 鬼姬*华丽,137,4,,2,,,4,,4,,6,5,,和风,,进化/迷幻,21,19,15,13,2,7,10,6,17,14,5
-鬼姬*珍稀,138,5,,,6,6,,3,,,6,,3,和风,,进化,24,12,18,6,12,9,3,24,12,15,15
+鬼姬*珍稀,138,5,,6,,6,,3,,,6,,3,和风,,进化,24,6,12,0,18,15,9,18,18,9,9
 蝴蝶,140,3,,,4,3,,,4,,5,5,,中式古典,,迷幻/2-5公,21,18,21,13,3,8,4,12,17,13,12
 蝴蝶*华丽,141,4,,2,,5,,,5,,5,4,,中式古典,,进化/迷幻,21,14,19,9,7,11,7,10,21,10,9
 雀吟,142,5,,5,,5,,5,,5,,5,,中式古典,,迷幻,25,5,10,10,20,25,10,10,15,0,20
@@ -139,11 +140,12 @@
 匆匆,153,2,,,5,,4,,4,,3,4,,,,成就,20,20,16,17,0,4,8,8,11,16,9
 西域舞娘,154,4,,5,,5,,5,,,2,,5,舞者,,设计图,20,2,7,0,20,15,10,17,12,7,10
 甜甜,155,3,,,2,,6,,5,,2,5,,,,店,20,20,14,18,0,5,11,4,12,15,7
+甜甜*银,156,3,,,2,,5,,4,,5,4,,,,定155,20,20,15,15,0,4,9,7,13,16,6
 活力宝贝,159,3,,,4,,4,,5,,5,4,,,,店/迷幻,22,22,18,17,0,4,9,9,14,18,8
 温雅侍者,160,3,,,2,6,,4,,4,,4,,中性风,,设计图,20,6,12,10,14,18,4,12,10,2,20
 斯文侍者,161,3,,,4,5,,4,,4,,4,,中性风,,定160,21,8,13,12,13,17,4,13,9,4,21
 乖顺侍者,163,3,,,4,5,,4,,,5,4,,中性风,,定160,22,13,18,8,9,13,0,18,14,9,17
-夜华章,164,14,,4,,,4,,4,,4,,4,大小姐,,系统送,20,12,8,8,8,4,16,8,12,16,0
+夜华章,164,5,,4,,,4,,4,,4,,4,大小姐,,系统送,20,12,8,8,8,4,16,8,12,16,0
 鲜柚,165,3,,5,,,3,,5,,4,5,,,,设计图,22,17,14,13,5,10,13,4,19,12,5
 仁德,166,3,,,4,5,,4,,4,,5,,OL,,店,22,9,14,13,13,18,4,13,10,4,22
 爱丽丝,167,4,,,5,,4,,5,,5,,5,,,兑换,24,19,15,14,5,0,14,15,10,24,5
@@ -180,9 +182,9 @@
 诗梦,209,4,,,5,,5,,5,,4,5,,中式现代,,定207,24,24,19,20,0,5,10,9,14,19,10
 花田少女,210,5,,,3,2,,,3,,4,,3,,,系统送,15,10,12,6,5,2,6,12,9,13,5
 倾慕,214,5,,4,,5,,,4,,3,,4,,,vip,20,7,12,4,13,9,12,12,16,11,5
+暖心,215,5,,3,,2,,,3,,3,,3,,,迷,14,6,8,3,8,5,9,8,11,9,2
 暖心*棕,217,4,,,4,4,,,5,,6,,5,,,幻,24,15,19,9,9,4,10,19,15,20,8
 灵幔*金,220,4,,,4,5,,,5,,5,,5,,,幻,24,14,19,9,10,5,10,19,15,19,9
-中学少女*华丽,072,3,,,5,4,,4,,,5,2,,,,进化,20,12,16,7,8,10,0,18,11,10,15
 锦心,226,5,,4,,,4,,4,,4,4,,,,签到,20,16,12,12,4,8,12,4,16,12,4
 武媚娘,227,5,,,5,5,,5,,,5,,5,,,成就,25,10,15,5,15,10,5,25,10,15,15
 圣神皇帝,228,5,,5,,6,,5,,,5,,5,,,vip,26,5,11,0,21,16,10,21,16,10,11
@@ -243,6 +245,7 @@
 未来少女*青,367,2,,4,,,2,,5,,4,5,,,,定365,20,16,14,12,4,9,11,4,18,11,5
 花蕾*金,369,3,,5,,,3,,5,,5,3,,,,定091,21,16,13,11,5,8,13,5,18,13,3
 花蕾*亚麻,370,3,,5,,,3,,5,,5,3,,,,定091,21,16,13,11,5,8,13,5,18,13,3
+花蕾*棕,371,4,,5,,5,,,5,,5,3,,,,定092,23,13,18,8,10,13,10,10,23,10,8
 麦穗*太阳,380,3,,5,,5,,,3,,5,,3,,,店,21,8,13,3,13,10,11,13,18,11,5
 麦穗*歌谣,381,3,,4,,4,,,5,,4,,4,,,定380,21,9,13,5,12,8,13,12,17,13,4
 麦穗*田园,382,3,,4,,5,,4,,,4,,5,,,定380,22,4,9,0,18,13,9,18,13,9,9

raw/levels.csv

@@ -3,7 +3,7 @@
 1-2,简约,可爱,优雅,清纯,保暖,,,,
 ,3,1.5,3,3,1,,,,
 1-3,华丽,成熟,优雅,清纯,清凉,,,,
-,2,1,3,2?,1,,,,
+,2,1,3,2,1,,,,
 1-4,简约,成熟,优雅,性感,保暖,要求ol实则未必,,作曲家,
 ,2,3,2,1,1,,,,
 1-5,华丽,可爱,活泼,性感,清凉,,,,
@@ -26,21 +26,21 @@
 ,1,2,1,2,3,,,,
 2-5,简约,成熟,活泼,清纯,保暖,,,,
 ,2,2,3,1,1,,,,
-2-6,华丽,可爱,优雅,清纯,清凉,,,,
+2-6,华丽,可爱,优雅,清纯,清凉,浴衣,,,
 ,1,3,2,2,1,,,默认粉毛,
-2-7,简约,可爱,活泼,清纯,保暖,,,,
+2-7,简约,可爱,活泼,清纯,保暖,睡衣,,,
 ,1,2,2,1,3,,,,
 2-8,华丽,可爱,优雅,清纯,清凉,,,,
 ,2,2,2,2,1,,,,
-2-9,华丽,成熟,优雅,性感,清凉,,,夜阑珊,
+2-9,华丽,成熟,优雅,性感,清凉,欧式,,夜阑珊,
 ,3,2,2,1,1,,,,
 2-支1,华丽,成熟,优雅,性感,保暖,欧式,,,
 ,3,2,2,1,1,,,,
 2-支2,简约,成熟,优雅,清纯,清凉,中性风,,,
 ,2,2,3,1,1,,,,
 3-1,简约,成熟,优雅,清纯,清凉,,,律政佳人*金,白翩语
 ,2,1,3,2,1,,,,
-3-2,华丽,成熟,活泼,性感,清凉,,,,
+3-2,华丽,成熟,活泼,性感,清凉,摇滚风,,,
 ,2,1,2,2,1,,,,
 3-3,简约,成熟,优雅,清纯,保暖,,,罗织红纱,暮歌*棕
 ,2,3,2,1,1,,,,
@@ -53,7 +53,7 @@
 3-7,华丽,可爱,优雅,清纯,清凉,,,,
 ,2,2,2,1,1,,,,
 3-8,简约,可爱,活泼,清纯,清凉,,,花瓣雨＊粉,
-,2,1,3,1,2?,,,,
+,2,1,3,1,2,,,,
 3-9,简约,成熟,优雅,性感,清凉,,,夜无边,
 ,2,1,2,3,1,,,,
 3-10,华丽,可爱,活泼,清纯,清凉,,,锦心,
@@ -65,7 +65,7 @@
 3-支1,华丽,成熟,优雅,清纯,保暖,,,,
 ,3,2,2,1,1,,,,
 3-支2,华丽,成熟,优雅,性感,清凉,,,夜阑珊,
-,3,1,2？,1,2,,,,
+,3,1,2,1,2,,,,
 4-1,简约,可爱,活泼,清纯,保暖,,,默认粉毛,
 ,3,1,2,1,3,,,,
 4-2,简约,可爱,活泼,清纯,清凉,必须泳装,,红豆吻,
@@ -149,8 +149,8 @@
 6-11,简约,成熟,优雅,清纯,清凉,,,律政佳人*金,白翩语
 ,2,1,3,2,1,,,,
 6-支1,华丽,成熟,优雅,性感,清凉,,,夜阑珊,
-,,,,,,,,,
+,2,1,3,2,1,,,,
 6-支2,华丽,可爱,活泼,清纯,清凉,,,锦心,
-,,,,,,,,,
+,3,2,1,1,2,,,,
 6-支3,华丽,成熟,活泼,性感,清凉,,,,
-,,,,,,,,,
+,2,3,1,1,2,,,,

raw/makeup.csv

@@ -1,8 +1,18 @@
-名称,编号,星级,,华丽,简约,优雅,活泼,成熟,可爱,清纯,性感,清凉,保暖
-信鸽少女,002,5,,5,,5,,5,,,5,5,
-蜜桃甜心,003,5,,4,,4,,,6,6,,6,
-北地英姿,004,5,,,5,5,,,3,5,,5,
-云端淑女,005,5,,,3,3,,,5,6,,5,
-权倾天下,001,5,,4,,4,,4,,,5,,2
-开心派,009,5,,,4,,5,,5,5,,3,
-青琅,010,5,,,4,5,,5,,5,,,3
+名称,编号,星级,,华丽,简约,优雅,活泼,成熟,可爱,性感,清纯,清凉,保暖,,,获取途径,综合得分,"春天/远足/运动等
+（简活可纯凉）","夏日物语
+（简优可纯凉）","海边派对
+（简活可性凉）","宫廷/音乐厅
+(华优熟性暖）","女王大人
+(华优熟性凉）","冬天一把火
+（华活可性暖）","有女/侦探
+（简优熟纯暖）","奇幻童话园
+（华优可纯凉）","圣诞家庭会
+（简活可纯暖）","办公室明星
+（简优熟性凉）"
+信鸽少女,002,5,,5,,5,,5,,5,,5,,,,店,25,10,15,15,17,22,7,15,12,5,25
+蜜桃甜心,003,5,,4,,4,,,6,,6,6,,,,店,25,11,15,5,17,11,9,25,13,17,13
+北地英姿,004,5,,,5,5,,,3,,5,5,,,,店,23,13,8,10,14,9,14,18,7,18,10
+云端淑女,005,5,,,3,3,,,5,,6,5,,,,店,22,13,10,8,14,8,14,19,10,19,8
+权倾天下,001,5,,4,,4,,4,,5,,,2,,,vip,22,10,14,14,13,18,5,13,10,5,22
+开心派,009,5,,,4,,5,,5,,5,3,,,,暂无,24,19,15,14,14,9,23,15,19,24,5
+青琅,010,5,,,4,5,,5,,5,,,3,,,暂无,24,14,10,19,20,25,19,10,15,9,20