From 1a5077ca4403728b538744ff4e4f32e93c5c304f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 21 Aug 2020 16:07:06 +0800
Subject: [PATCH] 1

---
 webapp/controller/AdditemController.class.php | 47 ++++++++++---------
 webapp/controller/EquipController.class.php   |  9 ++--
 .../controller/GameOverController.class.php   |  2 +-
 webapp/controller/RoleController.class.php    |  2 +
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/webapp/controller/AdditemController.class.php b/webapp/controller/AdditemController.class.php
index 9cc2fa4..a4603a7 100644
--- a/webapp/controller/AdditemController.class.php
+++ b/webapp/controller/AdditemController.class.php
@@ -94,26 +94,30 @@ class AdditemController{
         $status = 1;
         $active_time = 0;
         if ($item_id != 0){
-            if ($it['type'] == 10 || $it['type'] == 11) {
-                $item_num = $row['num'] + $item_num;
+            if ($it['type'] == 12) {
+                $this->addEquip($item_id, $item_num, $time, $accountid);
             } else {
-                $item_num = 1;
-            }
-            $ret = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, active_time, create_time, modify_time, num) ' .
-                                     ' VALUES(:account_id, :id, 0, :status, :active_time, :create_time, :modify_time, :num) ' .
-                                    ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, active_time=:active_time, modify_time=:modify_time, num=:num;',
-                                     array(
-                                         ':account_id' => $accountid,
-                                         ':id' => $item_id,
-                                         ':active_time' => $active_time,
-                                         ':status' => $status,
-                                         ':create_time' => time(),
-                                         ':modify_time' => time(),
-                                         ':num' => $item_num
-                                     ));
-            if(!$ret){
-                die();
-                return;
+                if ($it['type'] == 10 || $it['type'] == 11) {
+                    $item_num = $row['num'] + $item_num;
+                } else {
+                    $item_num = 1;
+                }
+                $ret = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, active_time, create_time, modify_time, num) ' .
+                                         ' VALUES(:account_id, :id, 0, :status, :active_time, :create_time, :modify_time, :num) ' .
+                                         ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, active_time=:active_time, modify_time=:modify_time, num=:num;',
+                                         array(
+                                             ':account_id' => $accountid,
+                                             ':id' => $item_id,
+                                             ':active_time' => $active_time,
+                                             ':status' => $status,
+                                             ':create_time' => time(),
+                                             ':modify_time' => time(),
+                                             ':num' => $item_num
+                                         ));
+                if(!$ret){
+                    die();
+                    return;
+                }
             }
         }
 
@@ -237,10 +241,9 @@ class AdditemController{
     }
 
 
-    public function addEquip()
+    protected function addEquip($id, $num, $time, $accountid)
     {
-        $accountid=$_REQUEST['account_id'];
-        $item_id = $_REQUEST['id'];
+        $item_id = $id;
         $conn = $this->getMysql($accountid);
         if(!$conn){
             phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php
index f22fa4b..dd12418 100644
--- a/webapp/controller/EquipController.class.php
+++ b/webapp/controller/EquipController.class.php
@@ -125,7 +125,7 @@ class EquipController{
             }
             $ret1 = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, num, active_time, create_time, modify_time) ' .
                                       ' VALUES(:account_id, :id, 0, :status, 200, :active_time, :create_time, :modify_time) ' .
-                                      ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=1, active_time=:active_time, modify_time=:modify_time;',
+                                      ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=200, active_time=:active_time, modify_time=:modify_time;',
                                       array(
                                           ':account_id' => $account_id,
                                           ':id' => 18006,
@@ -598,11 +598,12 @@ class EquipController{
         $active_time = $row['active_time'];
         if ($active_time + $sub_time <= time()) {
             $active_time = 0;
+            $sub_time  = 0;
             $flag = 1;
         }
-        if ($sub_time == 0) {
-            $flag = 1;
-        }
+        // if ($sub_time == 0) {
+        //     $flag = 1;
+        // }
         $retEquip = $conn->execScript('UPDATE equip SET active_time=:active_time, sub_time=:sub_time, modify_time=:modify_time ' .
                                       ' WHERE accountid=:accountid AND id=:id;',
                                       array(
diff --git a/webapp/controller/GameOverController.class.php b/webapp/controller/GameOverController.class.php
index f82f4f6..5801e68 100644
--- a/webapp/controller/GameOverController.class.php
+++ b/webapp/controller/GameOverController.class.php
@@ -164,7 +164,7 @@ class GameOverController{
         }
         //道具物品
         $first_list = array();
-        if (phpcommon\extractChannel($account_id) == 6000 || phpcommon\extractChannel($account_id) == 6001) {
+        if (phpcommon\extractChannel($account_id) == 6001) {
             array_push($first_list, array(
                 'item_id' => 18006,
                 'item_num' => $num,
diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php
index e1c6402..4b751fb 100644
--- a/webapp/controller/RoleController.class.php
+++ b/webapp/controller/RoleController.class.php
@@ -262,6 +262,8 @@ class RoleController{
                 'act_video_status' => 0,
                 'act_ad_status' => 0,
                 'biogame_times' => 0,
+                'coin_nums' => 10000,
+                'diamond_times' => 0,
             ));
         } else {
             if ($avatar_url != '') {