战斗结算返回值修改,背包回存宝石接口修改

Gameserver/App/process/FightProc.php

@@ -502,8 +502,10 @@ class FightProc {
                     if ($r <= ($l + $item['p'])) {
                         $gemId = $item['q'] * 100000 + rand(1, 6) * 1000;
                         SystemProc::GetGem_GreaterOrangeQual_MainGate(req()->zoneid, ctx()->baseInfo->name, Ins_GateInfo::gateNum($gateId), $gateMo->gateName, $gemId); //广播
-                        StoreProc::PutGemInStore($gemId);                       # 发放宝石并退出本次投色子
-                        $pickups .= ";$gemId,1";
+                        //StoreProc::PutGemInStore($gemId);                       # 发放宝石并退出本次投色子
+                        //$pickups .= ";$gemId,1";                     
+                        StoreProc::AddMultiItemInStore("$gemId,1");
+                        
                         break;
                     }
                     $l += $item['p'];                                             # 累计到下一段
@@ -527,7 +529,10 @@ class FightProc {
             'baseInfo' => ctx()->base(),
             'gold' => $gold + $waveMo->rewardGold,
             'exp' => $waveMo->rewardExp,
-            'rewardStr' => $pickups
+            //'rewardStr' => $pickups
+            'reward'=> StoreProc::$reward,
+            'reward_Gem'=> StoreProc::$reward_Gem,
+            
         );
         return Resp::ok($ret);
     }

Gameserver/App/process/StoreProc.php

@@ -767,12 +767,13 @@ class StoreProc {
                         self::checkEquipUpgradeTip();
                     }
                     break;
-                case 201://宝石                      
-                    $gemUidArr = self::PutGemInStore($itemId, $num);
-                    if(count($gemUidArr) > 0){                      
-                        self::$reward_Gem = array_merge(self::$reward_Gem,$gemUidArr);                       
+                case 201://宝石           
+                    for ($i = 0; $i < $num; $i++) {
+                        $gem = self::initGem($itemId);
+                        self::$reward_Gem[] = $gem->uid;
+                        self::PutGemInStore2($gem);
                     }
-                    
+                                                         
                     break;
                 case 701://道具宝箱
                     for ($i = 0; $i < $num; $i++) {
@@ -891,17 +892,12 @@ class StoreProc {
     /**
      * 新宝石入库
      */
-    public static function PutGemInStore($id, $num = 1) {
-        $gemUIdArr = array();
-        
+    public static function PutGemInStore($id, $num = 1) {             
         for ($i = 0; $i < $num; $i++) {
             $gem = self::initGem($id);
-            $length = $gem->uid;
-            $gemUIdArr[] = $length;
+            $length = $gem->uid;         
             ctx()->store->gemStore->$length = $gem;
-        }
-        
-        return $gemUIdArr;
+        }              
     }
 
     public static function PutGemInStore2($gem, $num = 1) {