Merge branch 'dev'

COMMANDS.md

@@ -53,7 +53,7 @@ auto_set/as
 	auto_set line:2 bc:max notest #选出两排不限BC的最大攻击卡组，并保存
 	auto_set aim:defeat line:1 bc:cur fairy:30,263215 notest #选出一排能打死Lv30剩余hp263215的普妖的卡组，并保存
 	auto_set aim:max_dmg line:1 bc:cur incl:124 #选出当前BC下一排最大攻击输出卡组，包括小狼女，不保存
-    
+
 ###因子战
 
 factor_battle/fcb
@@ -62,14 +62,13 @@ factor_battle/fcb
     factor_battle lake:7 #选择湖7
     factor_battle lake:7 50 #选择湖7 且在BC<50时退出
 
-
 ###秘境探索
 
 explore/e
 
     explore #根据condition自动选择秘境
     explore area.name=='學校教室'
-    
+
 筛选条件语法与condition中的auto_explore相同
 
 
@@ -118,7 +117,7 @@ gacha/g
     gacha 1 #绊转蛋
     gacha 2 #转蛋券转蛋
     gacha 4 #11连转蛋
-    
+
 ###分配点数
 
 point/p

cross_platform.py

@@ -24,6 +24,11 @@
         convhans = chans.toTW
     elif LOCALE == 'zh_HK':
         convhans = chans.toHK
+if PYTHON3:
+    import imp
+    reload = imp.reload
+    xrange = range
+
 
 getPATH0 = (not EXEBUNDLE or IRONPYTHON) and \
      (PYTHON3 and \
@@ -36,16 +41,16 @@
     (lambda str:str) or \
     (lambda str:convhans(str).decode('utf-8'))
 
-_convstr = (sys.platform.startswith('cli') or PYTHON3 or NICE_TERM)and \
+safestr = (sys.platform.startswith('cli') or PYTHON3 or NICE_TERM)and \
         (lambda str: str) or \
         (lambda str: str.decode('utf-8').encode(locale.getdefaultlocale()[1] or 'utf-8', 'replace'))
 
-du8 = lambda x: _convstr(raw_du8(x))
+du8 = lambda x: safestr(raw_du8(x))
 
 raw_inputd = PYTHON3 and \
         (lambda s:input(s)) \
     or \
-        (lambda s:raw_input(du8(s).encode(CODEPAGE or 'utf-8')).decode(CODEPAGE or 'utf-8').encode('utf-8'))
+        (lambda s:raw_input(raw_du8(s).encode(CODEPAGE or 'utf-8')).decode(CODEPAGE or 'utf-8').encode('utf-8'))
 
 # from goagent.appcfg
 def _win_getpass(prompt='Password:', stream=None):

db/boss.cn.txt

@@ -301,9 +301,16 @@
 30198,觉醒的艾洛索尔,35972
 30199,玛姆,18878
 30200,觉醒的玛姆,32586
-30201,蒂瓦,18878
-30202,觉醒的蒂瓦,32586
+30201,法佐琳,18878
+30202,觉醒的法佐琳,32586
 30203,魔王玉藻前,55200
 30204,觉醒的魔王玉藻前,184000
 30205,魔王斯普璃姆,55200
 30206,觉醒的魔王斯普璃姆,184000
+30207,小布丁,19927
+30208,觉醒的小布丁,33856
+30209,波波,19927
+30210,觉醒的波波,33856
+30211,塞拉利斯,22080
+30212,觉醒的塞拉利斯,38088
+30213,暴走的塞拉利斯,62192

db/boss.jp.txt

@@ -528,6 +528,12 @@
 4347,覚醒 蛇巳,75000
 4348,ピギーナ,30600
 4349,覚醒ピギーナ,79560
+4350,ティアドロップ,26000
+4351,覚醒ティアドロップ,68000
+4352,マカロニ,28500
+4353,覚醒マカロニ,73000
+4354,ポティナラ,23500
+4355,覚醒ポティナラ,63000
 9000,ルセーブ,22448
 9001,ルセーブ,22448
 9002,ルセーブ,22448

db/boss.kr.txt

@@ -55,6 +55,11 @@
 1012,모드레드 마검침식,2000000
 1013,고백의 그녀,1
 1014,최종병기 벨리타,9999999
+1015,데이지,2700000
+1016,스즈란,3300000
+1017,사쿠라,2700000
+1018,라일락,1800000
+1019,재스민,2000000
 1100,멀린,17664
 1101,멀린,25944
 1102,멀린,34224
@@ -147,6 +152,10 @@
 2102,각성 샤비,69589
 2103,레비,43277
 2104,각성 레비,80702
+2105,멜트,32586
+2106,각성 멜트,75900
+2107,라벤더,46423
+2108,각성 라벤더,85008
 3000,아서 - 마법의 파-,167440
 3001,아서 -기교의 장-,189520
 3002,아서 -검술의 성-,167440
@@ -379,3 +388,7 @@
 60150,각성 비형랑,46920
 60151,석탈해,20332
 60152,각성 석탈해,33433
+60153,메리골드,18842
+60154,각성 메리골드,51226
+60155,로즈,20958
+60156,각성 로즈,37260

db/boss.my.txt

@@ -0,0 +1 @@
+

db/boss.sg.txt

@@ -109,8 +109,14 @@
 3054,Puca,381984
 3055,Shellycoat,384744
 3056,Morgan,407376
+3057,Morgan Le Fay,9999999
+3058,Morgan Le Fay,412896
 3059,Morgan,407376
+3060,Morgan Le Fay,9999999
+3061,Morgan Le Fay,412896
 3062,Morgan,407376
+3063,Morgan Le Fay,9999999
+3064,Morgan Le Fay,412896
 3065,Mordred Final Form 1,188784
 3066,Rience Soldier,386400
 3067,Rience Soldier,392840
@@ -134,3 +140,7 @@
 60014,Arousal Dryad,17002
 60015,Elena,8537
 60016,Arousal Elena,17002
+60017,Patjwi,8537
+60018,Arousal Patjwi,17002
+60019,Kongjwi,8537
+60020,Arousal Kongjwi,17002

db/boss.tw.txt

@@ -404,6 +404,15 @@
 60118,覺醒希爾奇,16229
 60119,塔爾威斯提格,26165
 60120,覺醒塔爾威斯提格,18842
+60121,茹瑟法,17664
+60122,覺醒茹瑟法,12806
+60123,修凱爾,16983
+60124,覺醒修凱爾,15732
+60125,比莉特,79120
+60126,霰雨．比莉特,55200
+60127,覺醒．比莉特,46920
+60128,葛羅莉雅．鷹,26496
+60129,戰鬥．葛羅莉雅．鷹,19430
 81001,杉郎丸,4048
 81002,鋼鐵杉郎丸,14168
 81003,玉藻前,39744