server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-01-13 16:40:27 +08:00
parent 2aee5806cb
commit cb954f34a7
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/controller/BagController.class.php
View File

@ -28,8 +28,13 @@ class BagController extends BaseAuthedController {
public function itemList()
{
$itemList = Bag::all();
$itemDtoList = array();
foreach ($itemList as $item) {
array_push($itemDtoList, Bag::toDto($item));
}
$this->_rspData(array(
'item_list' => Bag::all(),
'item_list' => $itemDtoList,
));
}

4
webapp/controller/GunController.class.php
View File

@ -154,7 +154,7 @@ class GunController extends BaseAuthedController {
)
);
}
Break;
break;
case V_ITEM_DIAMOND:
{
$costItems = array(
@ -178,7 +178,7 @@ class GunController extends BaseAuthedController {
return;
}
$baseAttrs = mt\Item::getBaseAttrs($itemMeta);
$baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
$attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array());
$ret = mt\GunLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs);
if (!$ret) {

6
webapp/models/Bag.php
View File

@ -64,7 +64,7 @@ class Bag extends BaseModel {
),
function ($row) use(&$itemList) {
if ($row['item_num'] > 0) {
array_push($itemList, Bag::toDto($row));
array_push($itemList, $row);
}
}
);
@ -76,8 +76,8 @@ class Bag extends BaseModel {
$items = self::all();
$attrs = array();
foreach ($items as $item) {
$dbAttrs = emptyReplace(json_decode($row['rand_attr'], true), array());
mt\mergeAttr($attrs, $dbAttrs);
$dbAttrs = emptyReplace(json_decode($item['rand_attr'], true), array());
mt\AttrHelper::mergeAttr($attrs, $dbAttrs);
}
return $attrs;
}

2
webapp/mt/GunLevel.php
View File

@ -20,7 +20,7 @@ class GunLevel {
return getXVal(self::$qualityLevelHash, $quality . '_' . $level, null);
}
public static function addRandAttr($levelMeta, $baseAttrs, &$attrs)
public static function addRandAttr($levelMeta, $baseAttrs, &$dbAttrs)
{
$nums = explode(':', $levelMeta['rand_attrs_num']);
$num = rand($nums[0], $nums[1]);