Merge branch 'hjb' into yd
This commit is contained in:
commit
19994c4a36
@ -226,6 +226,7 @@ class HeroController extends BaseAuthedController {
|
|||||||
'wealth_attr' => json_encode($attribute),
|
'wealth_attr' => json_encode($attribute),
|
||||||
);
|
);
|
||||||
if ($heroDb['quality'] == 1){
|
if ($heroDb['quality'] == 1){
|
||||||
|
$fieldsKv['gold_times'] = 0;
|
||||||
$this->_incDailyV(TN_DAILY_TIER_N_HERO_TIMES, 0,1);
|
$this->_incDailyV(TN_DAILY_TIER_N_HERO_TIMES, 0,1);
|
||||||
}
|
}
|
||||||
if ($heroDb['quality'] + 1 > 4){
|
if ($heroDb['quality'] + 1 > 4){
|
||||||
|
@ -37,7 +37,7 @@ class MissionController extends BaseAuthedController {
|
|||||||
public function _handlePre()
|
public function _handlePre()
|
||||||
{
|
{
|
||||||
parent::_handlePre();
|
parent::_handlePre();
|
||||||
die;
|
|
||||||
DynData::preload();
|
DynData::preload();
|
||||||
// $this->currRankSeasonMeta = mt\RankSeason::getCurrentSeason();
|
// $this->currRankSeasonMeta = mt\RankSeason::getCurrentSeason();
|
||||||
// if (!$this->currRankSeasonMeta) {
|
// if (!$this->currRankSeasonMeta) {
|
||||||
|
@ -196,7 +196,7 @@ class RoomBattleDataService extends BaseService {
|
|||||||
$gold = $this->_hashRateBoost($userDb,$gold,$hashRateValue);
|
$gold = $this->_hashRateBoost($userDb,$gold,$hashRateValue);
|
||||||
//Vip加成金币获得
|
//Vip加成金币获得
|
||||||
$rightVal = myself()->_getVipRightsVal(mt\StakingVip::GAIN_GOLD);
|
$rightVal = myself()->_getVipRightsVal(mt\StakingVip::GAIN_GOLD);
|
||||||
if ($rightVal > 0){
|
if ($gold > 0 && $rightVal > 0){
|
||||||
$gold += $rightVal;
|
$gold += $rightVal;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
@ -315,7 +315,9 @@ class RoomBattleDataService extends BaseService {
|
|||||||
}
|
}
|
||||||
if ($gold > 0){
|
if ($gold > 0){
|
||||||
Hero::incDailyV($heroDb['idx'],1);
|
Hero::incDailyV($heroDb['idx'],1);
|
||||||
|
if ($heroDb['quality'] > 1){
|
||||||
myself()->_incDailyV(TN_DAILY_GOLD_MODE_BATTLE_TIMES,0,1);
|
myself()->_incDailyV(TN_DAILY_GOLD_MODE_BATTLE_TIMES,0,1);
|
||||||
|
}
|
||||||
$coefficientArr = explode(";",$rewardMeta['goldParam']);
|
$coefficientArr = explode(";",$rewardMeta['goldParam']);
|
||||||
$coefficient = isset($coefficientArr[$teamRank-1]) ? $coefficientArr[$teamRank-1] : 0;
|
$coefficient = isset($coefficientArr[$teamRank-1]) ? $coefficientArr[$teamRank-1] : 0;
|
||||||
$gold = $gold * $coefficient * ($battleScore / $teamScoreAvg);
|
$gold = $gold * $coefficient * ($battleScore / $teamScoreAvg);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user