|
@@ -637,15 +637,15 @@ class StoreProc {
|
|
|
* @return type
|
|
|
*/
|
|
|
public static function AddMultiItemInStore($goodsStr, $src = 1, $mask = 0) {
|
|
|
- $user = req()->userInfo->game;
|
|
|
- $ary = explode(";", $goodsStr);
|
|
|
- //$unlockNum = $user->privateState->expandNum * 5;
|
|
|
- //$n = self::countStoreNum();
|
|
|
+ $user = req()->userInfo->game;
|
|
|
+ $ary = explode(";", $goodsStr);
|
|
|
+ //$unlockNum = $user->privateState->expandNum * 5;
|
|
|
+ //$n = self::countStoreNum();
|
|
|
foreach ($ary as $value) {
|
|
|
$val = explode(",", $value);
|
|
|
$cid = "";
|
|
|
my_Assert(count($val) > 1, "解析奖励字符串出错");
|
|
|
-
|
|
|
+
|
|
|
list( $itemId, $num) = $val; # ID, 数量
|
|
|
$smItem = GameConfig::item_base_getItem($itemId); # 道具mo
|
|
|
switch ($smItem->subType) { # 根据类型分别添加到容器中
|
|
@@ -684,12 +684,14 @@ class StoreProc {
|
|
|
$cid = StoreProc::PutEquipInStore($itemId);
|
|
|
}
|
|
|
CornerSignEventProc::OnBag_new_Weapon();
|
|
|
+ CornerSignEventProc::OnRoleWeapon();
|
|
|
break;
|
|
|
case 401: # 言灵
|
|
|
for ($n = 0; $n < $num; $n++) {
|
|
|
$cid = StoreProc::PutYanLingInStore($itemId);
|
|
|
}
|
|
|
CornerSignEventProc::OnBag_new_Yanling();
|
|
|
+ CornerSignEventProc::OnRoleYanling();
|
|
|
break;
|
|
|
case 501: # 限购礼包
|
|
|
$itemMO = GameConfig::item_package_getItem($itemId);
|
|
@@ -772,29 +774,29 @@ class StoreProc {
|
|
|
//$num += count((array)$user->store->items);
|
|
|
$itemNum = 0;
|
|
|
foreach ($itemDic as $key => $num) {
|
|
|
- if($num == 0){
|
|
|
+ if ($num == 0) {
|
|
|
continue;
|
|
|
}
|
|
|
-
|
|
|
- if($num > 99999){
|
|
|
+
|
|
|
+ if ($num > 99999) {
|
|
|
$itemNum += 2;
|
|
|
} else {
|
|
|
$itemNum += 1;
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
//var_dump($num);
|
|
|
//var_dump('-----------------');
|
|
|
-
|
|
|
- $itemNum += count((array)$user->store->equipment);
|
|
|
+
|
|
|
+ $itemNum += count((array) $user->store->equipment);
|
|
|
//var_dump($num);
|
|
|
//var_dump('-----------------');
|
|
|
- $itemNum += count((array)$user->store->yanling);
|
|
|
+ $itemNum += count((array) $user->store->yanling);
|
|
|
//var_dump($itemNum);
|
|
|
return $itemNum;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
+ /**
|
|
|
* [6401]向包裹中添加物品
|
|
|
*/
|
|
|
public static function AddItemInStore() {
|
|
@@ -821,14 +823,14 @@ class StoreProc {
|
|
|
* 将装备放入背包
|
|
|
* @param type $itemId
|
|
|
*/
|
|
|
- static function PutEquipInStore($itemId) {
|
|
|
+ static function PutEquipInStore($itemId) {
|
|
|
$privateState = req()->userInfo->game->privateState;
|
|
|
- $unlockNum = $privateState->expandNum * 5;
|
|
|
+ $unlockNum = $privateState->expandNum * 5;
|
|
|
//var_dump("wuqi==============");
|
|
|
- $n = self::countStoreNum();
|
|
|
+ $n = self::countStoreNum();
|
|
|
$initNum = GameConfig::globalsettings()->Item_Packet_InitNum_New;
|
|
|
- my_Assert($n<$unlockNum+$initNum, "背包容量不够请扩容");
|
|
|
-
|
|
|
+ my_Assert($n < $unlockNum + $initNum, "背包容量不够请扩容");
|
|
|
+
|
|
|
if (!CommUtil::isPropertyExists($privateState, "currentId")) { // 如果仓库中已经有这种元素,则其数目+1
|
|
|
req()->userInfo->game->privateState->currentId = 1;
|
|
|
}
|
|
@@ -851,12 +853,12 @@ class StoreProc {
|
|
|
static function PutYanLingInStore($itemId) {
|
|
|
//my_Assert(count((array) req()->userInfo->game->store->yanling) < 100, ErrCode::store_yanling_bagfull);
|
|
|
$privateState = req()->userInfo->game->privateState;
|
|
|
- $unlockNum = $privateState->expandNum * 5;
|
|
|
+ $unlockNum = $privateState->expandNum * 5;
|
|
|
//var_dump("yanling==============");
|
|
|
- $n = self::countStoreNum();
|
|
|
+ $n = self::countStoreNum();
|
|
|
$initNum = GameConfig::globalsettings()->Item_Packet_InitNum_New;
|
|
|
- my_Assert($n<$unlockNum+$initNum, "背包容量不够请扩容");
|
|
|
-
|
|
|
+ my_Assert($n < $unlockNum + $initNum, "背包容量不够请扩容");
|
|
|
+
|
|
|
if (!CommUtil::isPropertyExists($privateState, "currentId")) { # 如果仓库中已经有这种元素,则其数目+1
|
|
|
req()->userInfo->game->privateState->currentId = 1;
|
|
|
}
|
|
@@ -877,11 +879,11 @@ class StoreProc {
|
|
|
*/
|
|
|
static function PutTaskCardInStore($itemId) {
|
|
|
$privateState = req()->userInfo->game->privateState;
|
|
|
- $unlockNum = $privateState->expandNum * 5;
|
|
|
+ $unlockNum = $privateState->expandNum * 5;
|
|
|
//var_dump("task==============");
|
|
|
- //$n = self::countStoreNum();
|
|
|
- //my_Assert($n<$unlockNum+50, "背包容量不够请扩容");
|
|
|
-
|
|
|
+ //$n = self::countStoreNum();
|
|
|
+ //my_Assert($n<$unlockNum+50, "背包容量不够请扩容");
|
|
|
+
|
|
|
if (!CommUtil::isPropertyExists($privateState, "currentId")) { # 如果仓库中已经有这种元素,则其数目+1
|
|
|
req()->userInfo->game->privateState->currentId = 1;
|
|
|
}
|
|
@@ -928,18 +930,17 @@ class StoreProc {
|
|
|
*/
|
|
|
static function PutOverlyingItemInStore($itemId, $num = 1) {
|
|
|
//var_dump("item==============".$itemId);
|
|
|
- $unlockNum = req()->userInfo->game->privateState->expandNum * 5;
|
|
|
- $n = self::countStoreNum();
|
|
|
+ $unlockNum = req()->userInfo->game->privateState->expandNum * 5;
|
|
|
+ $n = self::countStoreNum();
|
|
|
$initNum = GameConfig::globalsettings()->Item_Packet_InitNum_New;
|
|
|
- my_Assert($n < $unlockNum+$initNum, "背包容量不够请扩容");
|
|
|
-
|
|
|
+ my_Assert($n < $unlockNum + $initNum, "背包容量不够请扩容");
|
|
|
+
|
|
|
$items = req()->userInfo->game->store->items; # dic: itemid=>number
|
|
|
if (CommUtil::isPropertyExists($items, $itemId)) { # 如果仓库中已经有这种元素,则其数目+=num
|
|
|
$items->$itemId += $num;
|
|
|
} else { # 如果仓库中没有这种元素,则其数目置为num
|
|
|
$items->$itemId = $num;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|