friend card

Author: liyonghelpme

root.py

@@ -8,8 +8,8 @@
 from tgext.admin.tgadminconfig import TGAdminConfig
 from tgext.admin.controller import AdminController
 from repoze.what import predicates
-from sqlalchemy.exc import InvalidRequestError
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exceptions import InvalidRequestError
+from sqlalchemy.exceptions import IntegrityError
 from sqlalchemy.sql import or_, and_, desc
 from stchong.lib.base import BaseController
 from stchong.model import mc,DBSession,wartaskbonus, taskbonus,metadata,operationalData,businessWrite,businessRead,warMap,Map,visitFriend,Ally,Victories,Gift,Occupation,Battle,News,Friend,Datesurprise,Datevisit,FriendRequest,Card,Caebuy,Papayafriend,Rank,logfile
@@ -1413,7 +1413,6 @@ def foodlost(self,uid):
                 ds.monfood = 1
             elif ds.monfood == 1:
                 ds.monfood = 2
-                fo=user.food
                 monlist = user.monsterlist
                 monlist = monlist.split(';')
                 length = len(monlist)
@@ -2282,6 +2281,7 @@ def getfriend(self,userid,otherid,user_kind):#对外接口，用户userid 访问
                 cardlist.append(ca.fortunecard)
                 cardlist.append(ca.popcard)
                 cardlist.append(ca.warcard)
+                cardlist.append(ca.friendcard)
             except:
                 cardlist=[]
             if visit.visited==0:#not visited
@@ -2938,6 +2938,8 @@ def changecard(self,userid,cardnum,type):
                 card.popcard=cardnum
             elif cardtype==3:
                 card.warcard=cardnum
+            elif cardtype==4:
+                card.friendcard=cardnum
             return dict(id=1,card=card)
         except InvalidRequestError:
             return dict(id=0)
@@ -3012,6 +3014,7 @@ def logsign(self,papayaid,user_kind,md5):# 对外接口，登陆注册login if s
                 cardlist.append(card.fortunecard)
                 cardlist.append(card.popcard)
                 cardlist.append(card.warcard)
+                cardlist.append(card.friendcard)
             except:
                 card=None
             #######卡片数量列表
@@ -5923,10 +5926,8 @@ def getfriendall(self,user_id,friend_num,type):#type=0 normal;type=1 leiji
                     return dict(id=0, reason="cae or card invalid")
             else:#cae=10 
                 temp_cae = u.cae - 10
-                if temp_cae >=0 or card.friendcar == 5:
+                if temp_cae >=0:
                     flag = 1
-                    if card.friendcard == 5:
-                        temp_cae = temp_cae + 10
                     for f in notvisited: 
                         cornadd += 100 + bonus + 5*k
                         k += 1