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:19:08 +08:00
parent c264b23a56
commit 2aee5806cb
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,13 @@
require_once('mt/GunTalentGrow.php'); require_once('mt/GunTalentGrow.php');
require_once('mt/GunTalent.php'); require_once('mt/GunTalent.php');
require_once('mt/Parameter.php'); require_once('mt/Parameter.php');
require_once('mt/AttrHelper.php');
require_once('models/GunSkin.php'); require_once('models/GunSkin.php');
require_once('models/GunTalent.php'); require_once('models/GunTalent.php');
require_once('models/User.php'); require_once('models/User.php');
require_once('models/Gun.php'); require_once('models/Gun.php');
require_once('models/Bag.php');
require_once('services/PropertyChgService.php'); require_once('services/PropertyChgService.php');
@ -16,6 +18,7 @@ use models\GunSkin;
use models\GunTalent; use models\GunTalent;
use models\User; use models\User;
use models\Gun; use models\Gun;
use models\Bag;
class GunController extends BaseAuthedController { class GunController extends BaseAuthedController {
@ -175,6 +178,7 @@ class GunController extends BaseAuthedController {
return; return;
} }
$baseAttrs = mt\Item::getBaseAttrs($itemMeta); $baseAttrs = mt\Item::getBaseAttrs($itemMeta);
$baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
$attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array()); $attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array());
$ret = mt\GunLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs); $ret = mt\GunLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs);
if (!$ret) { if (!$ret) {
@ -274,6 +278,7 @@ class GunController extends BaseAuthedController {
return; return;
} }
$baseAttrs = mt\Item::getBaseAttrs($itemMeta); $baseAttrs = mt\Item::getBaseAttrs($itemMeta);
$baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
$attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array()); $attrs = emptyReplace(json_decode($gunDb['rand_attr'], true), array());
{ {
$obtainAttrs = mt\GunQuality::getRandAttr($nextQualityMeta); $obtainAttrs = mt\GunQuality::getRandAttr($nextQualityMeta);

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

@ -9,6 +9,7 @@ require_once('mt/AttrHelper.php');
require_once('mt/Parameter.php'); require_once('mt/Parameter.php');
require_once('models/Hero.php'); require_once('models/Hero.php');
require_once('models/Bag.php');
require_once('models/HeroSkin.php'); require_once('models/HeroSkin.php');
require_once('services/AwardService.php'); require_once('services/AwardService.php');
@ -16,6 +17,7 @@ require_once('services/PropertyChgService.php');
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
use models\Hero; use models\Hero;
use models\Bag;
use models\HeroSkin; use models\HeroSkin;
class HeroController extends BaseAuthedController { class HeroController extends BaseAuthedController {
@ -162,6 +164,7 @@ class HeroController extends BaseAuthedController {
return; return;
} }
$baseAttrs = mt\Hero::getHeroAttr($heroMeta); $baseAttrs = mt\Hero::getHeroAttr($heroMeta);
$baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
$attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array()); $attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array());
$ret = mt\HeroLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs); $ret = mt\HeroLevel::addRandAttr($nextLevelMeta, $baseAttrs, $attrs);
if (!$ret) { if (!$ret) {
@ -261,6 +264,7 @@ class HeroController extends BaseAuthedController {
return; return;
} }
$baseAttrs = mt\Hero::getHeroAttr($heroMeta); $baseAttrs = mt\Hero::getHeroAttr($heroMeta);
$baseAttrs = mt\AttrHelper::mergeAttr($baseAttrs, Bag::getAttrs());
$attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array()); $attrs = emptyReplace(json_decode($heroDb['rand_attr'], true), array());
{ {
$obtainAttrs = mt\HeroQuality::getRandAttr($nextQualityMeta); $obtainAttrs = mt\HeroQuality::getRandAttr($nextQualityMeta);

12
webapp/models/Bag.php
View File

@ -4,6 +4,7 @@ namespace models;
require_once('mt/Item.php'); require_once('mt/Item.php');
require_once('mt/ChipQuality.php'); require_once('mt/ChipQuality.php');
require_once('mt/AttrHelper.php');
use mt; use mt;
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
@ -70,6 +71,17 @@ class Bag extends BaseModel {
return $itemList; return $itemList;
} }
public static function getAttrs()
{
$items = self::all();
$attrs = array();
foreach ($items as $item) {
$dbAttrs = emptyReplace(json_decode($row['rand_attr'], true), array());
mt\mergeAttr($attrs, $dbAttrs);
}
return $attrs;
}
public static function getItemCount($itemId) public static function getItemCount($itemId)
{ {
$itemDb = self::find($itemId); $itemDb = self::find($itemId);