Procházet zdrojové kódy

fixed: 悬赏任务,进入道具背包.

王刚 před 3 roky
rodič
revize
62be0883eb

+ 11 - 11
Gameserver/Amfphp/process/StoreProc.php

@@ -123,8 +123,8 @@ class StoreProc {
         }
         }
 
 
         $user->store->equipment->$uid = $equipVo;
         $user->store->equipment->$uid = $equipVo;
-        
-        UserProc::CollectUserBaseParam(req()->cmd, 2,$user->baseInfo->gold, $totalGold, $user->baseInfo->gold-$totalGold,"");
+
+        UserProc::CollectUserBaseParam(req()->cmd, 2, $user->baseInfo->gold, $totalGold, $user->baseInfo->gold - $totalGold, "");
         $user->baseInfo->gold -= $totalGold;
         $user->baseInfo->gold -= $totalGold;
         req()->userInfo->game = $user;
         req()->userInfo->game = $user;
         req()->userInfo->game->store->items = $myPacketItems;                    # 更新背包数据
         req()->userInfo->game->store->items = $myPacketItems;                    # 更新背包数据
@@ -199,7 +199,7 @@ class StoreProc {
             StoreProc::removeItemFromStore($user->store, $list[0], $list[1]);
             StoreProc::removeItemFromStore($user->store, $list[0], $list[1]);
         }
         }
 
 
-        UserProc::CollectUserBaseParam(req()->cmd, 2,$user->baseInfo->gold , $mo->gold, $user->baseInfo->gold - $mo->gold,"");
+        UserProc::CollectUserBaseParam(req()->cmd, 2, $user->baseInfo->gold, $mo->gold, $user->baseInfo->gold - $mo->gold, "");
         $user->baseInfo->gold -= $mo->gold;
         $user->baseInfo->gold -= $mo->gold;
         $equipment->$uid->starLevel += 1;
         $equipment->$uid->starLevel += 1;
 
 
@@ -456,7 +456,7 @@ class StoreProc {
      * @deprecated since version 0
      * @deprecated since version 0
      * @return type
      * @return type
      */
      */
-    public static function AddMultiItemInStore($goodsStr, $src = 1,$mask = 0) {
+    public static function AddMultiItemInStore($goodsStr, $src = 1, $mask = 0) {
         $user = req()->userInfo->game;
         $user = req()->userInfo->game;
         $ary = explode(";", $goodsStr);
         $ary = explode(";", $goodsStr);
         foreach ($ary as $value) {
         foreach ($ary as $value) {
@@ -472,11 +472,11 @@ class StoreProc {
                     break;
                     break;
                 case META_GOLD_ITEMID:                                          # 金币
                 case META_GOLD_ITEMID:                                          # 金币
 //                    Data_UserGame::Add_Gold($user->baseInfo, $num);
 //                    Data_UserGame::Add_Gold($user->baseInfo, $num);
-                    $user->base()->Add_Gold($num,$mask);                              # 增加金币                                    
+                    $user->base()->Add_Gold($num, $mask);                              # 增加金币
                     break;
                     break;
                 case META_CASH_ITEMID:                                          # 钻石
                 case META_CASH_ITEMID:                                          # 钻石
 //                    Data_UserGame::Add_Cash($user->baseInfo, $num);
 //                    Data_UserGame::Add_Cash($user->baseInfo, $num);
-                    $user->base()->Add_Cash($num,$mask);                              # 增加钻石
+                    $user->base()->Add_Cash($num, $mask);                              # 增加钻石
                     break;
                     break;
                 case META_tili_ITEMID:                                          # 体力
                 case META_tili_ITEMID:                                          # 体力
 //                    Data_UserGame::Add_tili($num);
 //                    Data_UserGame::Add_tili($num);
@@ -583,15 +583,15 @@ class StoreProc {
      * [6401]向包裹中添加物品
      * [6401]向包裹中添加物品
      */
      */
     public static function AddItemInStore() {
     public static function AddItemInStore() {
-        list($rwdStr,$mask) = req()->paras;//mask = 1:表示战斗中掉落
+        list($rwdStr, $mask) = req()->paras; //mask = 1:表示战斗中掉落
         $user = req()->userInfo->game;
         $user = req()->userInfo->game;
-        
-        if($mask == 1){
-            $err = self::AddMultiItemInStore($rwdStr,1,1);
+
+        if ($mask == 1) {
+            $err = self::AddMultiItemInStore($rwdStr, 1, 1);
         } else {
         } else {
             $err = self::AddMultiItemInStore($rwdStr);
             $err = self::AddMultiItemInStore($rwdStr);
         }
         }
-        
+
         my_Assert(ErrCode::ok == $err, $err);
         my_Assert(ErrCode::ok == $err, $err);
         UserProc::updateUserInfo();
         UserProc::updateUserInfo();
         return Resp::ok(array(
         return Resp::ok(array(

+ 2 - 1
Gameserver/Amfphp/process/TaskProc.php

@@ -121,7 +121,8 @@ class TaskProc {
                 break;
                 break;
         }
         }
 
 
-        $cid = StoreProc::PutTaskCardInStore($typeId);                          # 添加任务卡到背包
+//        $cid = StoreProc::PutTaskCardInStore($typeId);                          # 添加任务卡到背包
+        StoreProc::PutOverlyingItemInStore($typeId, $num);                      # 直接进包裹items
         $userInfo->taskCardShop->selled[] = $typeId;                            # 添加售罄记录
         $userInfo->taskCardShop->selled[] = $typeId;                            # 添加售罄记录
         UserProc::updateUserInfo();
         UserProc::updateUserInfo();