Merge branch 'develop'

kokkoro/config_example/modules/priconne.py

@@ -85,7 +85,7 @@ class arena:
         "up_prob":  14,
         "s3_prob":  50,
         "s2_prob": 180,
-        "up": [ "真阳(游侠)", "拉比林斯达" ],
+        "up": [ "凛(NGs)", "怜(万圣节)" ],
         "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高",
         "star3": [
             "杏奈","真步","璃乃","初音","霞","伊绪",
@@ -94,7 +94,7 @@ class arena:
             "亚里莎","安","古蕾娅", "空花(大江户)", "妮诺(大江户)",
             "克萝依", "碧(插班生)", "美美(万圣节)", "露娜",
             "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿",
-            "リン(レンジャー)", "マヒル(レンジャー)", "璃乃(奇境)", "祈梨"
+            "铃(游侠)", "真阳(游侠)", "璃乃(奇幻)"
         ],
         "other_normal_star3": [  ],
         "star2": [
@@ -112,17 +112,18 @@ class arena:
         "up_prob":   7,
 	    "s3_prob":  25,
         "s2_prob": 180,
-        "up": [ "真阳(游侠)" ],
+        "up": [ "凛(NGs)" ],
         "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高",
         "star3": [
             "杏奈","真步","璃乃","初音","霞","伊绪",
             "咲恋","望","妮诺","秋乃","镜华","智","真琴",
             "伊莉亚","纯","静流","莫妮卡","流夏","吉塔",
             "亚里莎","安","古蕾娅", "空花(大江户)", "妮诺(大江户)",
             "克萝依", "碧(插班生)", "美美(万圣节)", "露娜",
-            "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿"
+            "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿",
+            "铃(游侠)", "真阳(游侠)", "璃乃(奇幻)", "祈梨"
         ],
-        "other_normal_star3": [ "リン(レンジャー)", "マヒル(レンジャー)", "璃乃(奇境)", "祈梨"],
+        "other_normal_star3": [ ],
         "star2": [
             "茉莉","茜里","宫子","雪","七七香","美里",
             "铃奈","香织","美美","绫音","铃","惠理子",
@@ -138,7 +139,7 @@ class arena:
         "up_prob":   7,
         "s3_prob":  25,
         "s2_prob": 180,
-        "up": [ "拉比林斯达" ],
+        "up": [ "怜(万圣节)" ],
         "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高",
         "star3": [
             "杏奈","真步","璃乃","初音","霞","伊绪",
@@ -147,7 +148,7 @@ class arena:
             "亚里莎","安","古蕾娅", "空花(大江户)", "妮诺(大江户)",
             "克萝依", "碧(插班生)", "美美(万圣节)", "露娜",
             "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿",
-            "リン(レンジャー)", "マヒル(レンジャー)", "璃乃(奇境)", "祈梨",
+            "铃(游侠)", "真阳(游侠)", "璃乃(奇幻)", "祈梨",
             "七七香(夏日)"
         ],
         "other_normal_star3": [  ],
@@ -163,27 +164,27 @@ class arena:
         ]
     },
     "BL": {
-        "up_prob":   7,
+        "up_prob":  14,
         "s3_prob":  25,
         "s2_prob": 180,
-        "up": [ "凯留(夏日)" ],
+        "up": [ "环奈" ],
         "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高",
         "star3": [
             "杏奈","璃乃","初音","伊绪",
             "望","妮诺","秋乃", "亚里莎",
             "静流","莫妮卡","吉塔", "纯", "镜华",
-            "伊莉亚", "真步", "咲恋", "真琴"
+            "伊莉亚", "真步", "咲恋", "真琴", "智"
         ],
         "other_normal_star3": [
-            "霞", "智", "纯", "流夏", "安", "古蕾娅","空花(大江户)", "妮诺(大江户)",
+            "霞", "流夏", "安", "古蕾娅","空花(大江户)", "妮诺(大江户)",
             "克萝依", "碧(插班生)", "美美(万圣节)", "露娜",
             "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿"
         ],
         "star2": [
             "茜里","宫子","雪","铃",
             "铃奈","香织","美美","绫音","惠理子",
             "真阳","栞","千歌","空花","珠希","美冬",
-            "深月", "美里", "纺希", "忍"
+            "深月", "美里", "纺希", "忍", "茉莉"
         ],
         "star1" : [
             "日和","怜","禊","胡桃","依里","铃莓",