From bcf3462c1450973b28995469b63b8606a5854bfc Mon Sep 17 00:00:00 2001 From: hujiabin Date: Tue, 28 Feb 2023 15:12:49 +0800 Subject: [PATCH] 1 --- webapp/models/Chip.php | 2 -- webapp/models/Gun.php | 14 ++++---------- webapp/models/Hero.php | 28 +++++----------------------- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/webapp/models/Chip.php b/webapp/models/Chip.php index 80f4275f..8b121f10 100644 --- a/webapp/models/Chip.php +++ b/webapp/models/Chip.php @@ -141,7 +141,6 @@ class Chip extends BaseModel 'rand_attr' => json_encode($randAttr), 'chip_grade' => 1, 'chip_type' => $itemMeta['sub_type'], - 'labour' => 0, 'activate' => 1, 'modifytime' => myself()->_getNowTime() ); @@ -244,7 +243,6 @@ class Chip extends BaseModel 'rand_attr' => json_encode($randAttr), 'chip_grade' => 1, 'chip_type' => $itemMeta['sub_type'], - 'labour' => 0, 'activate' => 1, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime() diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php index 9c2d4d25..d77afb50 100644 --- a/webapp/models/Gun.php +++ b/webapp/models/Gun.php @@ -224,7 +224,6 @@ class Gun extends BaseModel { 'lock_type' => self::NO_LOCK, 'unlock_time' => 0, 'unlock_trade_time' => 0, - 'labour' => 0, 'activate' => 1, 'modifytime' => myself()->_getNowTime() ); @@ -273,7 +272,6 @@ class Gun extends BaseModel { $todayMissionGetCeg = 0; } $gunLucky = \services\FormulaService::Weapon_Advanced_Lucky_Value($row['quality']); - $chipIds = ChipPlugin::getInlayChip($row['token_id']); $dto = array( 'idx' => $row['idx'], 'token_id' => $row['token_id'], @@ -301,16 +299,13 @@ class Gun extends BaseModel { 'unlock_lefttime' => max(0, $unlockTime - myself()->_getNowTime()), 'unlock_trade_time' => $row['unlock_trade_time'], - 'chip_ids' => $chipIds, - 'chip_strength_sum' => strval(Chip::getChipMaxStrength($row['chip_ids'],2)), //计算ceg上限所需参数 'offer_reward_state' => 0, - 'labour' => $row['labour'], 'tags' => $row['tags'], ); - $dto['durability_max'] = strval(round(FormulaService::Weapon_NFT_Maximum_Durability($dto['quality'],$dto['lucky']),3)); - $dto['pvp_ceg_uplimit'] = strval( round(FormulaService::getWeaponPvpDailyCegUpLimit($dto),2) ); - $dto['pve_ceg_uplimit'] = strval( round(FormulaService::getWeaponPveDailyCegUpLimit($dto),2) ); - $dto['mission_ceg_uplimit'] = strval( round(FormulaService::getWeaponMissionDailyCegUpLimit($dto),2) ); +// $dto['durability_max'] = strval(round(FormulaService::Weapon_NFT_Maximum_Durability($dto['quality'],$dto['lucky']),3)); +// $dto['pvp_ceg_uplimit'] = strval( round(FormulaService::getWeaponPvpDailyCegUpLimit($dto),2) ); +// $dto['pve_ceg_uplimit'] = strval( round(FormulaService::getWeaponPveDailyCegUpLimit($dto),2) ); +// $dto['mission_ceg_uplimit'] = strval( round(FormulaService::getWeaponMissionDailyCegUpLimit($dto),2) ); $nft_address = ''; if ($row['token_id']){ @@ -369,7 +364,6 @@ class Gun extends BaseModel { 'lock_type' => self::NO_LOCK, 'unlock_time' => 0, 'unlock_trade_time' => 0, - 'labour' => 0, 'activate' => 1, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime() diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 1fac48ca..dfc99aaf 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -210,8 +210,6 @@ class Hero extends BaseModel { 'lock_type' => self::NO_LOCK, 'unlock_time' => 0, 'unlock_trade_time' => 0, - 'skill_points' => 0, - 'labour' => 0, 'activate' => 1, 'modifytime' => myself()->_getNowTime() ); @@ -266,15 +264,6 @@ class Hero extends BaseModel { } $attrPro = self::mergeAttrPro($baseAttr,$attrPro1,$attrPro2); } - $skill_common = explode("|",$row['skill_common']); - $attr_skill = []; - foreach ($skill_common as $val){ - $item = mt\SkillCommon::getAttrBySkillCommon($val); - if ($item){ - array_push($attr_skill,$item); - } - } - $chipIds = ChipPlugin::getInlayChip($row['token_id']); $heroLucky = \services\FormulaService::Hero_Advanced_Lucky_Value($row['quality']); $dto = array( 'idx' => $row['idx'], @@ -290,7 +279,7 @@ class Hero extends BaseModel { 'skill_lv2' => $row['skill_lv2'], 'attr_base' => $baseAttr, 'attr_pro' => $attrPro, - 'attr_skill' => $attr_skill, + 'try_count' => $row['try_count'], 'lock_type' => $lockType, 'unlock_time' => $unlockTime, @@ -305,18 +294,13 @@ class Hero extends BaseModel { 'unlock_trade_time' => $row['unlock_trade_time'], 'advanced_count' => $row['advanced_count'], 'lucky' => $heroLucky, - 'chip_ids' => $chipIds, - 'chip_strength_sum' => strval(Chip::getChipMaxStrength($row['chip_ids'],1)), //计算ceg上限所需参数 - 'skill_common' => $skill_common, - 'skill_points' => $row['skill_points'], 'offer_reward_state' => 0, - 'labour' => $row['labour'], 'tags' => $row['tags'], ); - $dto['hero_tili_max'] = strval(round(FormulaService::Hero_NFT_Maximum_Physical_Strength($dto['quality'],$dto['lucky']),3)); - $dto['pvp_ceg_uplimit'] =strval( round(FormulaService::getHeroPvpDailyCegUpLimit($dto),2) ); - $dto['pve_ceg_uplimit'] = strval( round(FormulaService::getHeroPveDailyCegUpLimit($dto),2) ); - $dto['mission_ceg_uplimit'] = strval( round(FormulaService::getHeroMissionDailyCegUpLimit($dto),2) ); +// $dto['hero_tili_max'] = strval(round(FormulaService::Hero_NFT_Maximum_Physical_Strength($dto['quality'],$dto['lucky']),3)); +// $dto['pvp_ceg_uplimit'] =strval( round(FormulaService::getHeroPvpDailyCegUpLimit($dto),2) ); +// $dto['pve_ceg_uplimit'] = strval( round(FormulaService::getHeroPveDailyCegUpLimit($dto),2) ); +// $dto['mission_ceg_uplimit'] = strval( round(FormulaService::getHeroMissionDailyCegUpLimit($dto),2) ); $nft_address = ''; if ($row['token_id']){ @@ -372,8 +356,6 @@ class Hero extends BaseModel { 'lock_type' => self::NO_LOCK, 'unlock_time' => 0, 'unlock_trade_time' => 0, - 'skill_points' => 0, - 'labour' => 0, 'activate' => 1, 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime()