|
@@ -89,11 +89,14 @@ class StoreProc {
|
|
|
my_Assert(CommUtil::isPropertyExists($yanling, $yanlingUid), ErrCode::hero_yanling_errorYanling);
|
|
|
my_Assert(CommUtil::isPropertyExists($user->store->items,$gemId) && $user->store->items->$gemId >0, ErrCode::store_itemno_err);
|
|
|
|
|
|
- StoreProc::removeItemFromStore($user->store, $gemId);
|
|
|
+
|
|
|
if(!StlUtil::dictHasProperty($yanling->$yanlingUid,"gemId")){//临时
|
|
|
$yanling->$yanlingUid->gemId = 0;
|
|
|
}
|
|
|
|
|
|
+ my_Assert($yanling->$yanlingUid->gemId==0, ErrCode::store_YanLingHaveGem);
|
|
|
+
|
|
|
+ StoreProc::removeItemFromStore($user->store, $gemId);
|
|
|
$yanling->$yanlingUid->gemId = $gemId;
|
|
|
|
|
|
$user->store->yanling = $yanling;
|
|
@@ -141,7 +144,7 @@ class StoreProc {
|
|
|
|
|
|
$mo = GameConfig::gem_formula_getItem($gemId);
|
|
|
my_Assert($mo != null, ErrCode::err_const_no); #
|
|
|
- my_Assert($mo->levellimit >= $user->Gem->level, ErrCode::store_GemComplose_ResearchLevelLimit); #
|
|
|
+ my_Assert($mo->levellimit <= $user->Gem->level, ErrCode::store_GemComplose_ResearchLevelLimit); #
|
|
|
$itemId = $mo->drawItem;
|
|
|
if($itemId != ""){
|
|
|
my_Assert(StlUtil::dictHasProperty($user->store->items,$itemId) && $user->store->items->$itemId>0 , ErrCode::store_GemComploseTuZhiNotEnough); #
|
|
@@ -164,7 +167,9 @@ class StoreProc {
|
|
|
|
|
|
//扣除配方金币 宝石
|
|
|
$user->base(true)->Consume_Gold($mo->composeGold);
|
|
|
- StoreProc::removeItemFromStore($user->store, $gList[0],$gList[1]);
|
|
|
+ StoreProc::removeItemFromStore($user->store, $gList[0],$gList[1]);
|
|
|
+ $goodsStr = $gemId.',1';
|
|
|
+ StoreProc::AddMultiItemInStore($goodsStr);
|
|
|
req()->userInfo->game = $user;
|
|
|
|
|
|
UserProc::updateUserInfo(); # 回写玩家数据
|