From 388487cee2bd76c226c9fd0138be0bea6a35251e Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 7 Dec 2021 11:42:41 +0800
Subject: [PATCH] 1

---
 doc/Mission.py                             | 20 ++++++++++++++++++--
 doc/_common.py                             |  3 +++
 webapp/controller/UserController.class.php |  5 +++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/doc/Mission.py b/doc/Mission.py
index ccbf3f0..54b1614 100644
--- a/doc/Mission.py
+++ b/doc/Mission.py
@@ -13,11 +13,12 @@ class Mission(object):
                 'url': 'webapp/index.php?c=Mission&a=missionList',
                 'params': [
                     _common.ReqHead(),
-                    ['type', 0, '任务类型'],
+                    ['type', 0, '任务类型(!!!注意这里的类型和任务表里的任务不是一回事) 1:每日任务 2:赛季周任务'],
                 ],
                 'response': [
                     _common.RspHead(),
-                    ['!mission_list', [_common.Mission()], '任务列表'],
+                    ['!mission_list1', [_common.Mission()], '任务列表1'],
+                    ['!mission_list2', [_common.Mission()], '任务列表2'],
                 ]
             },
             {
@@ -36,4 +37,19 @@ class Mission(object):
                     ['mission_chg', _common.Mission(), '任务的最新信息(可能为null客户端需要做容错处理)'],
                 ]
             },
+            {
+                'name': 'commitAll',
+                'desc': '提交所有任务(全部领取)',
+                'group': 'Mission',
+                'url': 'webapp/index.php?c=Mission&a=commitAll',
+                'params': [
+                    _common.ReqHead(),
+                    ['types', [0], '任务类型数组'],
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['award', _common.Award(), '奖励信息'],
+                    ['property_chg', _common.PropertyChg(), '属性变更'],
+                ]
+            },
         ]
diff --git a/doc/_common.py b/doc/_common.py
index f4cedb2..88405a0 100644
--- a/doc/_common.py
+++ b/doc/_common.py
@@ -44,6 +44,7 @@ class UserInfo(object):
             ['head_frame', 0, '头像框id'],
             ['level', 0, '等级'],
             ['exp', 0, '经验'],
+            ['max_exp', 0, '经验(上限)'],
             ['gold', 0, '金币'],
             ['diamond', 0, '钻石'],
             ['hero_id', 0, '当前使用的英雄ID'],
@@ -63,6 +64,7 @@ class UserDetailInfo(object):
             ['head_frame', 0, '头像框id'],
             ['level', 0, '等级'],
             ['exp', 0, '经验'],
+            ['max_exp', 0, '经验(上限)'],
             ['gold', 0, '金币'],
             ['diamond', 0, '钻石'],
             ['hero_id', 0, '当前使用的英雄ID'],
@@ -216,6 +218,7 @@ class Mission(object):
             ['current', 0, '任务进度-当前'],
             ['target', 0, '任务进度-目标'],
             ['state', 0, '任务状态 0:可领取 1:已领取 2:未完成(不可领取)'],
+            ['show_progress', 0, '是否显示任务进度'],
         ]
 
 class SeasonCardGiftPackage(object):
diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index ee2d5b0..19f7c7b 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -97,6 +97,11 @@ class UserController extends BaseAuthedController {
 
     public function active()
     {
+        $name = getReqVal('name', '');
+        $nameSign = getReqVal('name_sign', '');
+        $sex = getReqVal('sex', 0);
+        $headId = getReqVal('head_id', 0);
+        $headFrame = getReqVal('head_frame', 0);
     }
 
     public function update()