修正一些(●´ω｀●)φ 问题

maclient.py

@@ -1496,8 +1496,8 @@ def fairy_floor(f = fairy):
             # 回到妖精界面; 尾刀时是否回妖精界面由尾刀决定，父过程此处跳过
             if not need_tail:
                 fairy_floor()
-             # 如果是醒妖则问好
-            if bt_type == WAKE_BATTLE and self.cfg_auto_greet:
+             # 如果是醒妖且不是公会妖则问好
+            if bt_type == WAKE_BATTLE and not fairy.race_type in GUILD_RACE_TYPE and self.cfg_auto_greet :
                 self.like()
 
     @plugin.func_hook

maclient_player.py

@@ -166,10 +166,10 @@ def update(self, carddict):
         # print self.cid('124')
 
     def _found_card_by_value(self, key, value):
-        res = []
-        for i in self.cards:
-            if i[key] == value:
-                res.append(i)
+        res = [c for c in self.cards if c[key] == value]
+        # for i in self.cards:
+        #     if i[key] == value:
+        #         res.append(i)
         return res
 
     def sid(self, sid):

plugins/carddeck_edit.py

@@ -9,7 +9,7 @@
 # start meta
 __plugin_name__ = 'scratch carddeck from REAL client'
 __author = 'fffonion'
-__version__ = 0.2
+__version__ = 0.3
 hooks = {}
 extra_cmd = {'scratch_carddeck':'scratch_carddeck', 'scc':'scratch_carddeck','check_debug':'check_debug','cd':'check_debug',
 'read_decks':'read_decks','rd':'read_decks'}
@@ -34,6 +34,13 @@ def do(*args):
         poster=plugin_vals['poster']
         pcard=plugin_vals['player'].card
         cf=plugin_vals['cf']
+        def write_config(sec, key, val):
+            if not cf.has_section(sec):
+                cf.add_section(sec)
+            cf.set(sec, key, val)
+            f = open(plugin_vals['configfile'], "w")
+            cf.write(f)
+            f.flush()
         list_option=cf.options
         for i in range(1,4,1):
             print(du8('卡组%d:'%i))
@@ -53,7 +60,7 @@ def do(*args):
                 name = decks[int(inp) - 1]
             else:
                 name = inp
-            write_config('carddeck', name, C)
+            write_config('carddeck', name, ','.join(C))
             print(du8('保存到了%s' % name))
         #poster.post('roundtable/edit', postdata = 'move=1&deck_id=1')
     return do