From 9703df53584ff8587c1b03269a50609cdaa1d79f Mon Sep 17 00:00:00 2001
From: yangduo <yangduo@kingsome.cn>
Date: Tue, 1 Apr 2025 23:03:58 +0800
Subject: [PATCH] fix

---
 webapp/controller/HangController.class.php | 4 ++--
 webapp/controller/PassController.class.php | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/webapp/controller/HangController.class.php b/webapp/controller/HangController.class.php
index a2ede8e..bc3d1db 100644
--- a/webapp/controller/HangController.class.php
+++ b/webapp/controller/HangController.class.php
@@ -469,8 +469,8 @@ class HangController{
             'daily_first_login' => $rowuser['daily_first_login'] + 1,
             'game_times' => $rowuser['game_times'],
             'min_rank_score' => $min_rank_score,
-            'passport_reward' => $passport_reward,
-        ), JSON_FORCE_OBJECT);
+            'passport_reward' => count($passport_reward) > 0 ? $passport_reward : (object)array(),
+        ));
     }
 }
 ?>
diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php
index cc11a16..d8a98c5 100644
--- a/webapp/controller/PassController.class.php
+++ b/webapp/controller/PassController.class.php
@@ -80,7 +80,7 @@ class PassController{
         $open_time = 0;
         $end_time = 0;
         $sea_reward = array();
-        $passport_reward = (object)array();
+        $passport_reward = array();
         $rank_status = 0;
         $season_meta_table = require('../res/season@season.php');
         for ($i = 1; $i <= count($season_meta_table); $i++) {
@@ -122,6 +122,7 @@ class PassController{
                             foreach($passportawardinfo as $key => $status) {
                                 if (!array_key_exists($key, $passportaward)) {
                                     $passportaward[$key] = $this->getExplode($season_meta_table[$i][$key]);
+                                    $passport_reward[$key] = array();
                                 }
 
                                 $passport_reward[$key][] = array(
@@ -224,7 +225,7 @@ class PassController{
             'week' => $week_reward,
             'seareward' => $sea_reward,
             'min_rank_score' => $min_rank_score,
-            'passport_reward' => $passport_reward,
+            'passport_reward' => count($passport_reward) > 0 ? $passport_reward : (object)array(),
         ));
     }
 
@@ -382,7 +383,7 @@ class PassController{
             return;
         }
 
-        $item_multiply = $this->getExplode($$season_meta_table[$number][$name]);
+        $item_multiply = $this->getExplode($season_meta_table[$number][$name]);
         $items = $item_multiply[$passid - 1];
 
         $reward = array();