Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

doc/AAGameLog.py

@@ -13,7 +13,7 @@ class AAGameLog(object):
                     _common.ReqHead(),
                     ['gameid', '', '游戏id'],
                     ['channel', '', '渠道编号'],
-                    ['event_name', '', '事件名']
+                    ['event_name', '', '事件名'],
                     ['account_id', '', '账号Id'],
                     ['session_id', '', '会话id'],
                     ['localuuid', '', '本地唯一Id'],

doc/AAGameMail.py

@@ -11,12 +11,12 @@ class AAGameMail(object):
                 'url': 'https://gamemail-test.kingsome.cn/webapp/index.php?c=Mail&a=getMailList',
                 'params': [
                     _common.ReqHead(),
-                    ['acount_id', '', '账号id'],
+                    ['account_id', '', '账号id'],
                     ['session_id', '', '会话id'],
                 ],
                 'response': [
                     _common.RspHead(),
-                    ['!maillist', common.MFGameMail(), '邮件列表'],
+                    ['!maillist', [_common.MFGameMail()], '邮件列表'],
                 ]
             },
             {
@@ -26,7 +26,7 @@ class AAGameMail(object):
                 'url': 'https://gamemail-test.kingsome.cn/webapp/index.php?c=Mail&a=markMail',
                 'params': [
                     _common.ReqHead(),
-                    ['acount_id', '', '账号id'],
+                    ['account_id', '', '账号id'],
                     ['session_id', '', '会话id'],
                     ['mail_ids', '', '邮件id列表以","分割'],
                     ['flag', '', '标志位 read:已读'],
@@ -42,7 +42,7 @@ class AAGameMail(object):
                 'url': 'https://gamemail-test.kingsome.cn/webapp/index.php?c=Mail&a=getAttachment',
                 'params': [
                     _common.ReqHead(),
-                    ['acount_id', '', '账号id'],
+                    ['account_id', '', '账号id'],
                     ['session_id', '', '会话id'],
                     ['mail_ids', '', '邮件id列表以","分割'],
                 ],
@@ -51,7 +51,7 @@ class AAGameMail(object):
                     ['!attachments', [
                         ['itemid', 0, '道具id'],
                         ['itemnum', 0, '道具数量'],
-                    ]],
+                    ], ''],
                 ]
             },
             {
@@ -61,7 +61,7 @@ class AAGameMail(object):
                 'url': 'https://gamemail-test.kingsome.cn/webapp/index.php?c=Mail&a=deleteMails',
                 'params': [
                     _common.ReqHead(),
-                    ['acount_id', '', '账号id'],
+                    ['account_id', '', '账号id'],
                     ['session_id', '', '会话id'],
                     ['mail_ids', '', '邮件id列表以","分割'],
                 ],

doc/AALogin.py

@@ -51,7 +51,7 @@ class AALogin(object):
                     ['env', '', 'dev:开发环境 test:测试环境 banshu:版署 其它：正式环境'],
                     ['is_guest', 0, '是否游客登录'],
                     ['pkg_name', '', '只有oppo, vivo需要传'],
-                    ['poly_sdk_channel', '聚合类sdk channel(当poly\_sdk\_channel不为空时服务器忽略channel参数)'],
+                    ['poly_sdk_channel', '', '聚合类sdk channel(当poly\_sdk\_channel不为空时服务器忽略channel参数)'],
                     ['poly_sdk_subchannel', '', '聚合类sdk 子channel(quicksdk时对应channelCode)'],
                     ['type', 0, '只有channel为6516时才有意义(默认0)，0:原生登录 1:market登录'],
                 ],

doc/AAStat.py

@@ -0,0 +1,21 @@
+import _common
+
+class AAStat(object):
+
+    def __init__(self):
+        self.apis = [
+            {
+                'name': 'updateSession',
+                'desc': '短链接游戏心跳更新',
+                'group': '!AAStat',
+                'url': 'https://stat-test.kingsome.cn/webapp/index.php?c=Stat&a=updateSession',
+                'params': [
+                    _common.ReqHead(),
+                    ['account_id', '', '账号id'],
+                    ['session_id', '', '会话id'],
+                ],
+                'response': [
+                    _common.RspHead(),
+                ]
+            },
+        ]

doc/_common.py

@@ -1640,6 +1640,13 @@ class MFRoomReportTeam(object):
             ['!members', [TeamReportMember()], '成员数据'],
         ]
 
+class MFAttachment(object):
+
+    def __init__(self):
+        self.fields = [
+            ['itemid', 0, '道具id'],
+            ['itemnum', 0, '道具数量'],
+        ]
 
 class MFGameMail(object):
 
@@ -1651,10 +1658,5 @@ class MFGameMail(object):
             ['flags', 0, '邮件标志 1<<0:已读'],
             ['sendtime', 0, '发送时间'],
             ['expiretime', 0, '过期时间'],
-            ['!attachments', [
+            ['!attachments', [MFAttachment()], ''],
-                [
-                    ['itemid', 0, '道具id'],
-                    ['itemnum', 0, '道具数量'],
-                ]
-            ], '成员数据'],
         ]