From c358b5cee37798927c9692f5daae2a57b7162a66 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 30 May 2022 12:10:37 +0800
Subject: [PATCH] 1

---
 webapp/controller/BattleController.class.php | 4 ++--
 webapp/services/FormulaService.php           | 4 ++--
 webapp/services/NftService.php               | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index 907e8036..5d63067f 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -75,7 +75,7 @@ class BattleController extends BaseAuthedController {
                                                     $member['hero_uniid']);
                     if ($heroDb) {
                         $info['is_valid_battle'] = 1;
-                        $info['hero_dto'] = json_encode(Hero::toDto($heroDb));
+                        $info['hero_dto'] = Hero::toDto($heroDb);
                     } else {
                         $info['errcode'] = 51;
                         $info['errmsg'] = 'paramater error';
@@ -86,7 +86,7 @@ class BattleController extends BaseAuthedController {
                         $gunDb = Gun::findByAccountId($member['account_id'],
                                                       $member['weapon_uuid' . $i]);
                         if ($gunDb) {
-                            $info['weapon_dto' . $i] = json_encode(Gun::toDto($gunDb));
+                            $info['weapon_dto' . $i] = Gun::toDto($gunDb);
                         }
                     }
                 }
diff --git a/webapp/services/FormulaService.php b/webapp/services/FormulaService.php
index 69064084..968010e9 100644
--- a/webapp/services/FormulaService.php
+++ b/webapp/services/FormulaService.php
@@ -74,7 +74,7 @@ class FormulaService extends BaseService {
              (
                  (0.5 * $rankedTopX * $meta['ranked_topx']) +
                  (0.25 * $killsTopX * $meta['kills_topx']) +
-                 (0.15 * $killsTopX * $meta['hero_topx']) +
+                 (0.15 * $heroTopX * $meta['hero_topx']) +
                  (0.5 * $weaponTopX * $meta['weapon_topx']) +
                  (0.5 * $survivalTopX * $meta['survival_topx'])
              );
@@ -148,7 +148,7 @@ class FormulaService extends BaseService {
              (
                  (0.5 * $rankedTopX * $meta['ranked_topx']) +
                  (0.25 * $killsTopX * $meta['kills_topx']) +
-                 (0.15 * $killsTopX * $meta['hero_topx']) +
+                 (0.15 * $heroTopX * $meta['hero_topx']) +
                  (0.5 * $weaponTopX * $meta['weapon_topx']) +
                  (0.5 * $survivalTopX * $meta['survival_topx'])
              );
diff --git a/webapp/services/NftService.php b/webapp/services/NftService.php
index 05d56bd9..e46d47fa 100644
--- a/webapp/services/NftService.php
+++ b/webapp/services/NftService.php
@@ -54,9 +54,9 @@ class NftService extends BaseService {
     private static function internalIsOwner($openId, $name, $tokenId)
     {
         self::loadNft($openId, $name);
-        $nftHash = getXVal(self::$userData[$openid], $name . 'Hash', array());
-        $nftDB = getXVal($nftHash, $tokenId);
-        return $nftDb && $nftDB['owner_address'] == $openId;
+        $nftHash = getXVal(self::$userData[$openId], $name . 'Hash', array());
+        $nftDb = getXVal($nftHash, $tokenId);
+        return $nftDb && $nftDb['owner_address'] == $openId;
     }
 
     private static function loadNft($openId, $name)