From bbbf779bb8889c255a81dc8517dfa7e375154df7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 18 Jan 2021 10:44:47 +0800
Subject: [PATCH] 1

---
 sql/gamedb.sql                                 |  1 -
 webapp/controller/ActivityController.class.php | 18 ++++++++++--------
 webapp/metatable/drop.php                      |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sql/gamedb.sql b/sql/gamedb.sql
index d93d2d9..25eb932 100644
--- a/sql/gamedb.sql
+++ b/sql/gamedb.sql
@@ -428,5 +428,4 @@ CREATE TABLE `draw` (
   PRIMARY KEY (`idx`),
   UNIQUE KEY `accountid_drawid` (`accountid`, `id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-
 -- Dump completed on 2015-08-19 18:51:22
diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php
index 7f0b857..4268ca1 100644
--- a/webapp/controller/ActivityController.class.php
+++ b/webapp/controller/ActivityController.class.php
@@ -1300,14 +1300,16 @@ class ActivityController extends BaseAuthedController {
         }
         $all_item_list = array();
         $addreward = new classes\AddReward();
-        foreach ($item_list as $item) {
-            $items = $addreward->addReward($item['item_id'], $item['item_num'], $account_id, $item['time'], 0);
-            foreach($items as $i) {
-                array_push($all_item_list, array(
-                    'item_id' => $i['item_id'],
-                    'item_num' => $i['item_num'],
-                    'time' => $i['time'],
-                ));
+        if (is_array($item_list)) {
+            foreach ($item_list as $item) {
+                $items = $addreward->addReward($item['item_id'], $item['item_num'], $account_id, $item['time'], 0);
+                foreach($items as $i) {
+                    array_push($all_item_list, array(
+                        'item_id' => $i['item_id'],
+                        'item_num' => $i['item_num'],
+                        'time' => $i['time'],
+                    ));
+                }
             }
         }
         $coin_num = $addreward->getCoinNum($account_id);
diff --git a/webapp/metatable/drop.php b/webapp/metatable/drop.php
index 3d38379..e052123 100644
--- a/webapp/metatable/drop.php
+++ b/webapp/metatable/drop.php
@@ -87,10 +87,11 @@ function getDropInfo($d, $item_list) {
         }
         $item_id = $item_id_array[$keys][0];
         $item_num = $item_num_array[$keys][0];
+        $item_time = $time_array[$keys][0];
         array_push($item_list, array(
             'item_id' => $item_id,
             'item_num' => $item_num,
-            'time' => $time_array[$i][0],
+            'time' => $item_time,
         ));
     }
     return $item_list;