扫荡解算修正,gem入库接口名字修改

Gameserver/App/process/FightProc.php

@@ -78,20 +78,22 @@ class FightProc {
 
         ctx()->gates->fightSweepNum += 1;
         ctx()->baseInfo->Consume_tili($costTili);
-        $prizeArr = array();
+        //$prizeArr = array();
 
         $wavesArr = GameConfig::waves_getItemArray($passGateId);
         $count = count($wavesArr);
         $wavesMo = $wavesArr[$count - 1];
 
-        ctx()->baseInfo->Add_Gold($wavesMo->rewardGold);
-        $gold = $wavesMo->rewardGold;
-        $prizeArr[] = "1," . $gold;
-        ctx()->baseInfo->Add_Gold($gold);
+        ctx()->baseInfo->Add_Gold($wavesMo->rewardGold);       
+        StoreProc::AddMultiItemInStore($wavesMo->rewardGold);
+        //$gold = $wavesMo->rewardGold;
+        //$prizeArr[] = "1," . $gold;
+        //ctx()->baseInfo->Add_Gold($gold);
 
-        $exp = $wavesMo->rewardExp;
-        $prizeArr[] = "4," . $exp;
-        ctx()->baseInfo->Add_Exp($exp);
+        StoreProc::AddMultiItemInStore($wavesMo->rewardExp);
+        //$exp = $wavesMo->rewardExp;
+        //$prizeArr[] = "4," . $exp;
+        //ctx()->baseInfo->Add_Exp($exp);
         if ($wavesMo->rewardTuZhi != null) {
             $tuzhi = explode('-', $wavesMo->rewardTuZhi);
             $n = rand($tuzhi[0], $tuzhi[1]);
@@ -120,10 +122,11 @@ class FightProc {
                 $qual = $list[0];
                 foreach ($dic as $key => $gemMo) {
                     if ($gemMo->qual == $qual && $gemMo->position == $posId) {
-                        $prizeArr[] = $gemMo->typeId . ',' . $list[1];
+                        $gemStr = $gemMo->typeId . ',' . $list[1];
 
                         SystemProc::GetGem_GreaterOrangeQual_SweepMainGateIndex(req()->zoneid, ctx()->baseInfo->name, Ins_GateInfo::gateNum($passGateId), $gateName, $gemMo->typeId);
-                        StoreProc::PutGemInStore($gemMo->typeId, $list[1]);
+                        //StoreProc::PutGemInStore($gemMo->typeId, $list[1]);
+                        StoreProc::AddMultiItemInStore($gemStr);
                         break;
                     }
                 }
@@ -135,7 +138,7 @@ class FightProc {
         $ret = array(
             'tili' => ctx()->baseInfo->tili,
             'fightSweepNum' => ctx()->gates->fightSweepNum,
-            'prizeArr' => $prizeArr,
+            //'prizeArr' => $prizeArr,
             'store' => ctx()->store,
             'task' => ctx()->task,
             'reward' => StoreProc::$reward,

Gameserver/App/process/ShopProc.php

@@ -281,7 +281,7 @@ class ShopProc {
                         }
                         
                         $resultArr[] = $gem->uid;
-                        StoreProc::PutGemInStore2($gem);
+                        StoreProc::PutGemInStore($gem);
                     }
                 }
 

Gameserver/App/process/StoreProc.php

@@ -404,7 +404,7 @@ class StoreProc {
                         if ($index % $composeNum == 0) {
                             $res += 1;
                             $composeGem = self::initGem($gemConf->typeId);
-                            self::PutGemInStore2($composeGem);
+                            self::PutGemInStore($composeGem);
                             $composeArr[] = $composeGem; //临时放这
                         }
 
@@ -780,7 +780,7 @@ class StoreProc {
                     for ($i = 0; $i < $num; $i++) {
                         $gem = self::initGem($itemId);
                         self::$reward_Gem[] = $gem->uid;
-                        self::PutGemInStore2($gem);
+                        self::PutGemInStore($gem);
                     }
                                                          
                     break;
@@ -901,7 +901,7 @@ class StoreProc {
     /**
      * 新宝石入库
      */
-    public static function PutGemInStore($id, $num = 1) {             
+    public static function PutGemIdInStore($id, $num = 1) {             
         for ($i = 0; $i < $num; $i++) {
             $gem = self::initGem($id);
             $length = $gem->uid;         
@@ -909,7 +909,7 @@ class StoreProc {
         }              
     }
 
-    public static function PutGemInStore2($gem, $num = 1) {
+    public static function PutGemInStore($gem, $num = 1) {
         for ($i = 0; $i < $num; $i++) {
             $length = $gem->uid;
             ctx()->store->gemStore->$length = $gem;