update levels and fixed column

seal100x · Aug 1, 2015 · ed48dfa · ed48dfa
1 parent bf49474
commit ed48dfa
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/index.html b/index.html
@@ -49,6 +49,15 @@
       padding: 10px 8px;
       border-bottom: 2px solid #6678b1;
     }
+    th.score {
+      width: 55px;
+    }
+    th.name {
+      width: 100px;
+    }
+    th.category {
+      width: 110px;
+    }
     td
     {
       color: #669;

diff --git a/levels.js b/levels.js
@@ -119,17 +119,17 @@ var levelsRaw = {
   '6-9': [-1, -2, -3, -2, 1],
   '6-10': [-1, 2, -1, 1, -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],
+  '6-支1': [-2, -2, -1, -3, 1],
+  '6-支2': [-1, 2, 2, 1, 3],
+  '6-支3': [-2, -1, 2, -3, 1],
   '7-1': [2, -2.5, -3, -2, 1.5],
   '7-2': [-3, -2, -3, 3, -2],
   '7-3': [3, -2.5, 2, -3, 3],
   '7-4': [-1.25, -2, -2, 1.5, -1],
   '7-5': [3, 2, 3, 2, 2],
   '7-6': [-2, -1, -2, 1.5, 1.5],
   '7-7': [-1.8, -1.8, -1.2, -1.2, 0.6],
-  '7-8': [3, -2, 3, -2, 1],
+  '7-8': [2, -1.34, 2, -1.34, 0.66],
   '7-9': [2, -3, 1.5, 2, -3],
   '7-支1': [2, -3, -3, 2, 2],
   '7-支2': [2, 3, -3, 2, 1.5],
@@ -463,7 +463,7 @@ var levelBonus = {
   '7-5': [],
   '7-6': [specialFactory76A(), specialFactory76B()],
   '7-7': [replaceScoreBonusFactory('SS', "欧式古典"), replaceScoreBonusFactory('SS', "晚礼服")],
-  '7-8': [replaceScoreBonusFactory('B', "中式古典"), replaceScoreBonusFactory('A', "侠客联盟")],
+  '7-8': [replaceScoreBonusFactory('S', "中式古典"), replaceScoreBonusFactory('SS', "侠客联盟")],
   '7-9': [addScoreBonusFactory('A', 1, "冬装")],
   '7-支1': [],
   '7-支2': [],

diff --git a/nikki.js b/nikki.js
@@ -19,10 +19,10 @@ function thead(isShoppingCart, score) {
     ret += "<th>拥有</th>";
   }
   if (score) {
-    ret += "<th>分数</th>";
+    ret += "<th class='score'>分数</th>";
   }
-  return ret + "<th>名称</th>\
-  <th>类别</th>\
+  return ret + "<th class='name'>名称</th>\
+  <th class='category'>类别</th>\
   <th>编号</th>\
   <th>简约</th>\
   <th>华丽</th>\

diff --git a/raw/levels.csv b/raw/levels.csv
@@ -152,11 +152,11 @@
 6-11,简约,成熟,优雅,清纯,清凉,中式古典/中式现代/旗袍/民国服饰,中式古典每一权重加B,律政佳人*金,白翩语,,,
 ,2,1,3,2,1,,,,,,,"'6-11': [2, 1, 3, 2, 1],"
 6-支1,华丽,成熟,优雅,性感,清凉,,,夜阑珊,,,,
-,2,1,3,2,1,,,,,,,"'6-支1': [2, 1, 3, 2, 1],"
+,2,2,1,3,1,,,,,,,"'6-支1': [2, 2, 1, 3, 1],"
 6-支2,华丽,可爱,活泼,清纯,清凉,,,锦心,,,,
-,3,2,1,1,2,,,,,,,"'6-支2': [3, 2, 1, 1, 2],"
+,1,2,2,1,3,,,,,,,"'6-支2': [1, 2, 2, 1, 3],"
 6-支3,华丽,成熟,活泼,性感,清凉,,,,,,,
-,2,3,1,1,2,,,,,,,"'6-支3': [2, 3, 1, 1, 2],"
+,2,1,2,3,1,,,,,,,"'6-支3': [2, 1, 2, 3, 1],"
 7-1,简约,成熟,优雅,性感,清凉,,,,,,,
 ,2,2.5,3,2,1.5,,,,,,,"'7-1': [2, 2.5, 3, 2, 1.5],"
 7-2,华丽,成熟,优雅,清纯,保暖,只有少数几件衣服可以不F,,,,,,
@@ -170,10 +170,10 @@
 7-6,华丽,成熟,优雅,清纯,清凉,,"晚礼服和中式现代，分别按照权重增加：
 B, SS, B, C, C",,,,,
 ,2,1,2,1.5,1.5,,,,,,,"'7-6': [2, 1, 2, 1.5, 1.5],"
-7-7,华丽,成熟,优雅,性感,清凉,1/150,晚礼服无视属性给B，欧式古典无视属性给B，两者叠加,,,,,
+7-7,华丽,成熟,优雅,性感,清凉,1/150,晚礼服无视属性给SS，欧式古典无视属性给SS，两者叠加,,,,,
 ,1.8,1.8,1.2,1.2,0.6,,,,,,,"'7-7': [1.8, 1.8, 1.2, 1.2, 0.6],"
-7-8,简约,成熟,活泼,性感,清凉,,中式古典无视属性给B，侠客联盟无视属性给A，两者叠加,,,,,
-,3,2,3,2,1,,,,,,,"'7-8': [3, 2, 3, 2, 1],"
+7-8,简约,成熟,活泼,性感,清凉,,中式古典无视属性给S，侠客联盟无视属性给SS，两者叠加,,,,,
+,2,1.34,2,1.34,0.66,,,,,,,"'7-8': [2, 1.34, 2, 1.34, 0.66],"
 7-9,简约,成熟,活泼,清纯,保暖,,冬装每一权重加A,,,,,
 ,2,3,1.5,2,3,,,,,,,"'7-9': [2, 3, 1.5, 2, 3],"
 7-支1,简约,成熟,优雅,清纯,清凉,,,,,,,

diff --git a/tmplevels.js b/tmplevels.js
@@ -74,17 +74,17 @@ var levelsRaw = {
   '6-9': [-1, -2, -3, -2, 1],
   '6-10': [-1, 2, -1, 1, -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],
+  '6-支1': [-2, -2, -1, -3, 1],
+  '6-支2': [-1, 2, 2, 1, 3],
+  '6-支3': [-2, -1, 2, -3, 1],
   '7-1': [2, -2.5, -3, -2, 1.5],
   '7-2': [-3, -2, -3, 3, -2],
   '7-3': [3, -2.5, 2, -3, 3],
   '7-4': [-1.25, -2, -2, 1.5, -1],
   '7-5': [3, 2, 3, 2, 2],
   '7-6': [-2, -1, -2, 1.5, 1.5],
   '7-7': [-1.8, -1.8, -1.2, -1.2, 0.6],
-  '7-8': [3, -2, 3, -2, 1],
+  '7-8': [2, -1.34, 2, -1.34, 0.66],
   '7-9': [2, -3, 1.5, 2, -3],
   '7-支1': [2, -3, -3, 2, 2],
   '7-支2': [2, 3, -3, 2, 1.5],