|
|
@@ -360,6 +360,10 @@ class PetProc {
|
|
|
ctx()->store()->pet->$uid = $newPet;
|
|
|
}
|
|
|
|
|
|
+ $ins_breed->eggId = 0;
|
|
|
+ $ins_breed->endTs = 0;
|
|
|
+ ctx()->store()->breedEggLocation->$slotId = $ins_breed;
|
|
|
+
|
|
|
UserProc::updateUserInfo();
|
|
|
return Resp::ok(array(
|
|
|
'cash' => ctx()->baseInfo->cash,
|
|
|
@@ -388,23 +392,25 @@ class PetProc {
|
|
|
my_Assert(ctx()->baseInfo->cash >= $costNum*$cash_one, ErrCode::notenough_cash_msg);
|
|
|
ctx()->base()->Consume_Cash($costNum*$cash_one);
|
|
|
|
|
|
- StoreProc::AddMultiItemInStore($ins_breed->mo()->reward);
|
|
|
+ $ins_breed->endTs = 0;
|
|
|
+ ctx()->store()->breedEggLocation->$slotId = $ins_breed;
|
|
|
+ //StoreProc::AddMultiItemInStore($ins_breed->mo()->reward);
|
|
|
|
|
|
//随机一个灵宠
|
|
|
- $str = explode(';', $ins_breed->mo()->per);
|
|
|
- $newPet = self::RandObtainPet($str);
|
|
|
+ //$str = explode(';', $ins_breed->mo()->per);
|
|
|
+ //$newPet = self::RandObtainPet($str);
|
|
|
|
|
|
- $uid = 0;
|
|
|
- if($newPet != null){
|
|
|
- $uid = $newPet->uid;
|
|
|
- ctx()->store()->pet->$uid = $newPet;
|
|
|
- }
|
|
|
+// $uid = 0;
|
|
|
+// if($newPet != null){
|
|
|
+// $uid = $newPet->uid;
|
|
|
+// ctx()->store()->pet->$uid = $newPet;
|
|
|
+// }
|
|
|
|
|
|
UserProc::updateUserInfo();
|
|
|
return Resp::ok(array(
|
|
|
'cash' => ctx()->baseInfo->cash,
|
|
|
'store' => ctx()->store,
|
|
|
- 'newPetUid'=>$uid,
|
|
|
+ //'newPetUid'=>$uid,
|
|
|
));
|
|
|
}
|
|
|
|
|
|
@@ -464,7 +470,7 @@ class PetProc {
|
|
|
my_Assert(StlUtil::dictHasProperty(ctx()->store->items, $eggId), ErrCode::user_store_NoItem);
|
|
|
$mo = GameConfig::item_getItem($eggId);
|
|
|
my_Assert($mo != null, ErrCode::err_const_no);
|
|
|
- my_Assert($mo->itemType == 103, ErrCode::user_store_NoItem);
|
|
|
+ my_Assert($mo->itemType == 105, ErrCode::user_store_NoItem);
|
|
|
|
|
|
$ins_breed = new Ins_BreedEggSlot(ctx()->store()->breedEggLocation->$slotId);
|
|
|
my_Assert($ins_breed->eggId == 0 && $ins_breed->unlock == 1, ErrCode::user_store_NoBreedSlot);
|
cyzhao