From 5f99a2d0827e0b00b1631f41e439ff568505140e Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Fri, 21 Apr 2023 18:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=81=93=E5=85=B7=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/User.py                                | 12 ++++++++++++
 webapp/controller/UserController.class.php | 15 +++++++++++++++
 webapp/services/FormulaService.php         |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/doc/User.py b/doc/User.py
index bd72ce5c..757ba360 100644
--- a/doc/User.py
+++ b/doc/User.py
@@ -165,5 +165,17 @@ class User(object):
                     _common.RspHead(),
                     ['property_chg', _common.PropertyChg(), '属性变更'],
                 ]
+            },{
+                'name': 'getFreeItemList',
+                'desc': '获取免费英雄和武器列表',
+                'group': 'User',
+                'url': 'webapp/index.php?c=User&a=getFreeItemList',
+                'params': [
+                    _common.ReqHead(),
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['!data', [], '列表'],
+                ]
             },
         ]
diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 3188e2da..a42a0478 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -707,6 +707,21 @@ class UserController extends BaseAuthedController {
         ]);
     }
 
+    public function getFreeItemList(){
+        $data = array();
+        $heroParam = mt\Parameter::getListValue('free_hero_list');
+        $gunParam = mt\Parameter::getListValue('free_weapon_list');
+        if ($heroParam){
+            $data['hero'] = $heroParam;
+        }
+        if ($gunParam){
+            $data['gun'] = $gunParam;
+        }
+        $this->_rspData([
+            'data'=>$data
+        ]);
+    }
+
     public function selectFreeItem(){
         $hero_id = getReqVal('hero_id', '');
         $gun_id = getReqVal('gun_id', '');
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 425d3311..162684dd 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -358,7 +358,7 @@ class FormulaService extends BaseService {
 //                       ROUND(1-($weaponTopX*100/10-1)/9,2) * 0.02;
 
         //表现分=f(个人存活时间排名TopX/4)*50%+f(队伍排名TopY)*50%      f(TopX) = ROUND(1-(X-1)/9,2)
-        $expreScore = (ROUND(1-($ranked-1)/9,2)/4)*0.5+ROUND(1-($teamRank-1)/9,2)*0.5;
+        $expreScore = (ROUND(1-($ranked/4-1)/9,2))*0.5+ROUND(1-($teamRank-1)/9,2)*0.5;
 
         //不同段位的及格分 = ROUND(1-(大段位排名-1)/(MAX(10)-1),2)
         $topRanking = mt\Rank::getRankById($userDb['rank'])?mt\Rank::getRankById($userDb['rank'])['rank_order']:0;    //**************  rankRank 参数表获取 ************