1.65 新版台服

增加选项(auto_greet)可打开/关闭自动问好

config_sample.ini

@@ -1,88 +1,72 @@
-[placeholder]
-
 [tasker]
-b = 'fairy_battle'
-f = 'set_card factor|factor_battle'
+e = 'e'
 
 [system]
-server =cn
-loglevel =2
-taskname =b
-tasker_times =50
-try_factor_times =20
-factor_sleep =10
-explore_sleep =2
-fairy_battle_times =20
-fairy_battle_sleep =0,4,6|4,7,4|7,8,2|8,11,2|11,14,1|14,16,2|16,19,0.8|19,21,1.5|21,24,2
-fairy_battle_sleep_factor=1
-delay =2
+server = tw
+loglevel = 1
+taskname = e
+tasker_times = 0
+try_factor_times = 20
+factor_sleep = 10
+explore_sleep = 2
+fairy_battle_times = 10
+fairy_battle_sleep = 0,4,6|4,7,4|7,8,2|8,11,2|11,14,1|14,16,2|16,19,0.8|19,21,1.5|21,24,2
+fairy_battle_sleep_factor = 0.8
+delay = 1
+display_ani = 0
 user-agent = 
-device_token = 
-display_ani=1
-save_traffic=0
-auto_update=1
-enable_plugin=1
+device_token = huiHignkjiuhiuBiu98gUiGuiyuguYfgIUguIGIugugiUGuigYufuYfyuVyuYuyvYU=
+save_traffic = 0
+auto_update = 1
+enable_plugin = 1
 
 [tactic]
-auto_explore =1
-auto_green_tea =0
-auto_red_tea =0
-auto_red_tea_level =1
-strict_bc =0
-auto_sell_card =1
-auto_fp_gacha =1
-auto_build =1
-auto_fairy_rewards =1
-fp_gacha_bulk =1
-sell_card_warning =1
-fairy_final_kill_hp=30000
-display_ani =1
-del_friend_day =5
-greet_words=你好！
-factor_getnew=1
+auto_explore = 1
+auto_green_tea = 0
+auto_red_tea = 0
+auto_red_tea_level = 1
+strict_bc = 0
+auto_sell_card = 1
+auto_fp_gacha = 1
+auto_build = 1
+auto_fairy_rewards = 0
+fp_gacha_bulk = 1
+sell_card_warning = 1
+del_friend_day = 5
+fairy_final_kill_hp = 0
+auto_greet = 1
+greet_words = ¹þ¹þ¹þ
+factor_getnew = 1
 
 [account_tw]
 username = 
 password = 
-userid = 
+user_id = 
 session = 
 
-[carddeck]
-min = 124
-factor = 124,89,8
-
-[fairy]
+[account_cn]
 
-[account_cn2]
-username = 
-password = 
-userid = 
-session = 
+[account_cn]
 
 [account_cn3]
-username = 
-password = 
-userid = 
-session = 
 
-[account_cn]
-username = 
-password = 
-userid = 
-session = 
+[fairy]
 
+[carddeck]min = 124factor = 124,89,8
 [condition]
-fairy_select =fairy.NOT_BATTLED
-explore_floor =floor.NOT_FINNISHED|
-fairy_select_carddeck =fairy.IS_WAKE and (fairy.IS_MINE and (fairy.TIME_LIMIT<1200 and 'full' or 'min') or 'min') or (BC>50 and (fairy.hp<100000 and 'fast' or 'min') or 'min')
-factor =star in [1,2]
-explore_area =area.NOT_FINNISHED and area.name in ['女神的到访','林荫道中漫步的静谧','更衣室','游泳池中的追逐','女舍外','校门口的约会','希望喷泉','蔚蓝的约定','校篮球馆']|area.NOT_FINNISHED and area.IS_EVENT
-select_card_to_sell =card.star in [1,2] and card.lv<=3 and not card.mid in [124,49,8]
+fairy_select = fairy.NOT_BATTLED
+explore_area = not FAIRY_ALIVE and area.NOT_FINNISHED and area.IS_EVENT
+explore_floor = not FAIRY_ALIVE and floor.NOT_FINNISHED
+fairy_select_carddeck = 'min'
+factor = deck_rank<=20
+select_card_to_sell = card.star in [1,2] and card.lv<=3 and not card.mid in [124,49,8]
 factor_limit = BC>20
 
 [record]
-last_set_card = 
-last_set_bc = 
+last_set_card = 0
+last_set_bc = 0
 
 [plugin]
+disabled = bgm
+
 

db/card.tw.txt

@@ -306,6 +306,7 @@
 393,擄獲型摩根最終形態,5,14,跟其他魔女相同，通過密探奮不顧身的行動得到了毛髮。從中抽取因子後經複製製造而出。\n\n同一因子的交配的干擾結果，使得水準達不到原型的程度。但因為能夠進行實戰而被派往戰場。\n由憎恨亞瑟的魔女所製造出，但複製體卻意外地很天真……？,WinterDestruction,術水／冰牙豪雨,{}
 394,異界型 結,5,27,發現於傳說能通往異世界的祠堂中的因子製造出的騎士。\n天然呆，積極向上、擁有拳系能力的第88號鶺鴒。為了葦牙，帶著愛進行著嵩天之戰。,BearKnuckle,八十八＝熊拳,最初攻擊時\n攻擊力上升100%
 395,異界型甜甜圈貓,5,22,發現於傳說能通往異世界的祠堂中的因子製造出的騎士。\n變異體的貓。充滿了謎題的那個洞也許是看透一切的異界之門。\n處於食物鏈的下級。,ZeroSweetSlide,天輪果斬＃０,HP在30%以下時\n回復卡片HP70%
+397,異界型小黑,5,15,發現於傳說能通往異世界的祠堂中的因子製造出的騎士。\n與人類訂下契約的上位神靈女孩。有些不諳世事、但到了戰鬥之時，通過同步能夠發揮出強大的能力。,MegaEXE,超越技＝滅牙得救世,HP在30%以下時\n攻擊力上升70%
 398,異界型雫,5,25,發現於傳說能通往異世界的祠堂中的因子製造出的騎士。\n是悄悄建於坡道上的當鋪的女子高中生店長。通過能夠與物體對話的能力，將人們的內心聯繫在一起。,HeartFul,術心／物質念話,戰鬥勝利後一定機率\nSUPER中幅提升
 399,第一型莫德雷德魔劍侵蝕,6,17,憎恨亞瑟的魔女摩高斯潛入亞瑟們的宮殿卡美洛，有意往『湖』的製造計畫中混入的異物。\n\n結合了所有亞瑟的因子和魔女摩高斯的因子的不規則騎士、通過搜索體內的亞瑟因子，能夠正確地『創造』出所有亞瑟的弱點。\n一開始就被迫背負著背叛卡美洛的命運、但亞瑟們因為『可以當做卡美洛因力量而暴走時的安全裝置』，而作為夥伴接受了他。,DragonKillerClarent,王政終焉＃９９,{}
 404,極限突破切爾莉,6,99,在「斷絕時代」以輔助妖精為生的妖精中的一種。曾被認為在「斷絕時代」滅絕了，但近年確認到了生存。有著與生俱來的顏色，好像相應地能力也有所不同，但詳細情況並不明瞭。極限突破切爾莉似乎可以將極限突破的界限通過某種形式進行破壞，然而詳細情況不明。,0,無,{}
@@ -598,4 +599,5 @@
 1079,白雪,5,22,從『斷絕時代』就高山上生存的妖精，喜歡下雪，喜歡打雪仗，更喜歡假扮成人類所堆的雪人對小孩子惡作劇。討厭會發出熱源的東西，一感受到就會馬上逃走。但融化到無法變身雪人的狀態，則會失去理智攻擊他人。,聖誕白雪的氣息,Error 12mas25,攻擊力上升200%
 1080,聖誕型艾菲,6,20,對人非常關愛的少女，相信自己是神的後代，在聖誕期間目標是帶給人們溫暖與祝福，所以固定會在街頭進行免費擁抱關懷人群的活動，希望可以使這個紛爭不斷的世界，淨化人心。,Free Hug,溫暖擁抱#1225,HP在45%以下時\n回復卡片HP240%
 1081,聖誕型哈薇,5,18,從聖誕樹中取出的因子所製作出的妖精騎士。喜歡待在爐火邊聽著亞瑟們所傳授的故事，也相信自己將能在名為『歷史』的這本書上面寫上自己的優良事蹟。,Christmas Tree Girl,術援/溫暖爐光,攻擊回數越多\n攻擊力提升(大)
-1082,聖誕型蒂妮,5,16,擁有奇妙口袋的聖誕少女，見到每個人都會送禮物給他們。從神秘的口袋中掏出許多不同的禮物，會依照每個人內心的需求給最真實接近的禮物。,Xmas Present,聖誕夜=無盡禮物,「劍術之城」越多\n攻擊力提升(大)
+1082,聖誕型蒂妮,5,16,擁有奇妙口袋的聖誕少女，見到每個人都會送禮物給他們。從神秘的口袋中掏出許多不同的禮物，會依照每個人內心的需求給最真實接近的禮物。,Xmas Present,聖誕夜=無盡禮物,「劍術之城」越多\n攻擊力提升(大)
+1083,鳳仙,5,22,遠東傳說中的狐狸精幻化的人型，雖然是魅惑的狐狸精後代，但是意外純情，對於自己心愛的人會一心一意的呵護。對於覬覦自己心愛的人會使盡全力驅趕，但總是沒什麼效果。,Pure Heart,術援/純情獻心,「妖精」在3枚以上\n回復卡片HP120%

db/revision.txt

@@ -1,4 +1,4 @@
 cn,218,218
-tw,199,168
+tw,200,168
 kr,225,167
 jp,0,0

maclient.py

@@ -30,7 +30,7 @@
 import maclient_smart
 import maclient_plugin
 
-__version__ = 1.64
+__version__ = 1.65
 # CONSTS:
 EXPLORE_BATTLE, NORMAL_BATTLE, TAIL_BATTLE, WAKE_BATTLE = 0, 1, 2, 3
 GACHA_FRIENNSHIP_POINT, GACHAgacha_TICKET, GACHA_11 = 1, 2, 4
@@ -164,6 +164,7 @@ def load_config(self):
         self.cfg_strict_bc = self._read_config('tactic', 'strict_bc') == '1'
         self.cfg_fairy_final_kill_hp = int(self._read_config('tactic', 'fairy_final_kill_hp') or '20000')
         self.cfg_save_traffic = not self._read_config('system', 'save_traffic') == '0'
+        self.cfg_auto_greet = (self._read_config('tactic', 'auto_greet') or '1') == '1'
         self.cfg_greet_words = self._read_config('tactic', 'greet_words') or (
             self.loc == 'tw' and random.choice(['大家好.', '問好']) or random.choice(['你好！', '你好！请多指教！']))
         self.cfg_factor_getnew = not self._read_config('tactic', 'factor_getnew') == '0'
@@ -1471,7 +1472,7 @@ def fairy_floor(f = fairy):
             if not need_tail:
                 fairy_floor()
              # 如果是醒妖则问好
-            if bt_type == WAKE_BATTLE:
+            if bt_type == WAKE_BATTLE and self.cfg_auto_greet:
                 self.like()
 
     @plugin.func_hook

maclient_cli.py

@@ -155,7 +155,7 @@ def read_proxy(work = 0):
                     '\n| 分割多个，空格分隔命令与参数\n'
                     '插件的附加命令:%s\n'
                     '以t:开头可执行任务\n'
-                    'http://www.yooooo.us/2013/maclient' % ','.join(maclient1.plugin.extra_cmd.keys())))
+                    'http://yooooo.us/2013/maclient' % ','.join(maclient1.plugin.extra_cmd.keys())))
             elif ch == '------':
                 print(du8('此功能暂停使用'))
                 continue

maclient_smart.py

@@ -6,7 +6,7 @@
 import time
 import math
 import itertools
-__version__ = '1.1-build20131226'
+__version__ = '1.1-build20140103'
 # server specified configutaions
 max_card_count_cn = max_card_count_kr = max_card_count_tw = max_card_count_jp = 250
 max_fp_cn = max_fp_kr = 50000

maclient_update.py

@@ -50,7 +50,7 @@ def check_revision(loc, rev_tuple):
 def update_master(loc, need_update, poster):
     new_rev = [None, None]
     if need_update[0]:
-        a, b = poster.post('masterdata/card/update', postdata = '%s&revision=0' % poster.cookie, noencrypt = loc=='tw')
+        a, b = poster.post('masterdata/card/update', postdata = '%s&revision=0' % poster.cookie)
         resp = XML2Dict().fromstring(b.replace('&', '--').replace('--#', '&#')).response  # 不替换会解析出错摔
         cards = resp.body.master_data.master_card_data.card
         strs = []
@@ -71,7 +71,7 @@ def update_master(loc, need_update, poster):
         new_rev[0] = resp.header.revision.card_rev
         save_revision(loc, cardrev = new_rev[0])
     if need_update[1]:
-        a, b = poster.post('masterdata/item/update', postdata = '%s&revision=0' % poster.cookie, noencrypt = loc=='tw')
+        a, b = poster.post('masterdata/item/update', postdata = '%s&revision=0' % poster.cookie)
         resp = XML2Dict().fromstring(b).response
         itmes = resp.body.master_data.master_item_data.item_info
         strs = []