宠物回村长度bug修复

Gameserver/App/process/StoreProc.php

@@ -72,27 +72,27 @@ class StoreProc {
             case CmdCode::store_pet_compose:                                    # 6425 宠物合成    
                 return PetProc::Pet_Compose();
             case CmdCode::store_pet_onekeyCompose:                              # 6426 宠物一键合成    
-                return PetProc::Pet_OnekeyCompose();              
+                return PetProc::Pet_OnekeyCompose();
             case CmdCode::store_pet_downGradingLevel:                           # 6427 宠物降级
-                return PetProc::Pet_DownGradingLevel();              
+                return PetProc::Pet_DownGradingLevel();
             case CmdCode::store_pet_downGradingQual:                            # 6428 宠物降品   
                 return PetProc::Pet_DownGradingQual();
             case CmdCode::store_pet_breedEgg:                                   # 6429 孵化宠物
-                return PetProc::Pet_BreedEgg();               
+                return PetProc::Pet_BreedEgg();
             case CmdCode::store_pet_fastBreedEgg:                               # 6430 加速孵化宠物
-                return PetProc::Pet_FastBreedEgg();    
+                return PetProc::Pet_FastBreedEgg();
             case CmdCode::store_pet_receiveBreedPet:                            # 6431 正常孵化完成点击领取
-                return PetProc::Pet_ReceiveBreedPet();    
+                return PetProc::Pet_ReceiveBreedPet();
             case CmdCode::store_pet_unlockBreedLocation:                        # 6432 解锁孵化位置
-                return PetProc::Pet_UnlockBreedLocation();                
+                return PetProc::Pet_UnlockBreedLocation();
             case CmdCode::store_pet_areaLevelUpgrade:                           # 6433 区域等级升级
-                return PetProc::Pet_UnlockBreedLocation();         
+                return PetProc::Pet_UnlockBreedLocation();
             case CmdCode::store_pet_replaceDispatchPet:                         # 6434 点击宠物 更换派遣宠物  废弃
                 return PetProc::ReplaceDispatchPet();
             case CmdCode::store_pet_removeDispatchPet:                          # 6435 删除全部派遣宠物
                 return PetProc::RemoveDispatchPet();
             case CmdCode::store_pet_receiveReward:                              # 6436 领取探索奖励
-                return PetProc::Pet_ReceiveReward();    
+                return PetProc::Pet_ReceiveReward();
             case CmdCode::store_pet_dispatchPet:                                # 6437 点击派遣宠物
                 return PetProc::DispatchPet();
             case CmdCode::store_pet_resetDispatchPet:                           # 6438 某区域的派遣宠物信息    
@@ -103,7 +103,7 @@ class StoreProc {
                 Err(ErrCode::cmd_err);
         }
     }
-    
+
     /**
      * 6420 降品
      */
@@ -159,7 +159,7 @@ class StoreProc {
         }
     }
 
-    public static function ComposeMaterial($posId, $qual,$type = 901) {
+    public static function ComposeMaterial($posId, $qual, $type = 901) {
         $itemDic = GameConfig::item();
         foreach ($itemDic as $typeId => $mo) {
             if ($mo->itemType == $type && $typeId % 100 == $posId && floor($typeId / 100) % 100 == $qual) {
@@ -386,8 +386,7 @@ class StoreProc {
                 self::equipLevelUp_Material_Recovery($newEquip->mo()->rarity, $newEquip->qual, $newEquip->mo()->position, $newEquip->level); # 回收材料
                 $newEquip->level = 1;
                 $equipDic->$uid = $newEquip;
-                
-                
+
                 $composeEquip[] = $uid;                                         # 添加合成记录
                 foreach ($composeArr as $val) {                                 # 回收消耗的装备中所含材料
                     self::equipLevelUp_Material_Recovery($val->mo()->rarity, $val->qual, $val->mo()->position, $val->level); # 回收材料
@@ -557,7 +556,7 @@ class StoreProc {
         $posId = $ins_equip->mo()->position;
         ctx()->store(true)->equipLocation->$posId = $uid;
         FightProc::Ranking_FightPower();
-        
+
         GuideProc::GateFight_Guide_Trigger();
         UserProc::updateUserInfo();
         return Resp::ok(array());
@@ -575,7 +574,7 @@ class StoreProc {
         $ins_equip = new Ins_Equip($equipDic->$uid);
         $posId = $ins_equip->mo()->position;
         StlUtil::dictRemove(ctx()->store(true)->equipLocation, $posId);
-              
+
         FightProc::Ranking_FightPower();
         UserProc::updateUserInfo();
         return Resp::ok(array());
@@ -1163,7 +1162,7 @@ class StoreProc {
     public static function AddItemInStore() {
         list($rwdStr) = req()->paras; //mask = 1:表示战斗中掉落
         $user = ctx();
-            
+
         $err = self::AddMultiItemInStore($rwdStr);
 
         my_Assert(ErrCode::ok == $err, $err);
@@ -1261,6 +1260,11 @@ class StoreProc {
                         self::$reward_equip[] = $uid;
                     }
                     break;
+                case 102:
+                    $pet = self::initPet($itemId);                  
+                    $uid = $pet->uid;
+                    ctx()->store(true)->pet->$uid = $pet;                   
+                    break;
                 case 701://道具宝箱
                     for ($i = 0; $i < $num; $i++) {
                         self::DistributeItemsBox($itemId);
@@ -1273,10 +1277,11 @@ class StoreProc {
             }
         }
     }
-    
+
     public static function initPet($typeId, $uid = 0) {
-        if ($uid == 0) {
-            $uid = ctx()->store->petUid+1;
+        if ($uid == 0) {           
+            ctx()->store->petUid += 1;
+            $uid = ctx()->store->petUid;
         }
         $ins_Pet = new Ins_Pet();
         $ins_Pet->uid = $uid;