diff --git a/webapp/models/NftActive.php b/webapp/models/NftActive.php index 3845cb41..4973fe51 100644 --- a/webapp/models/NftActive.php +++ b/webapp/models/NftActive.php @@ -11,10 +11,12 @@ class NftActive extends BaseModel if ($data['token_id']){ $where = array( 'token_id' =>$data['token_id'], + 'daytime' =>myself()->_getDaySeconds(myself()->_getNowTime()), ); }else{ $where = array( 'uniid' =>$data['uniid'], + 'daytime' =>myself()->_getDaySeconds(myself()->_getNowTime()), ); } diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index 5d70d059..51600f59 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -148,7 +148,7 @@ class BattleDataService extends BaseService { } //录入战斗记录 - $this->saveBattleHistory(); +// $this->saveBattleHistory(); switch ($matchMode) { case self::MATCH_MODE_PVP: @@ -849,7 +849,7 @@ class BattleDataService extends BaseService { 'new_weaponPvpCeg1' => $weaponPvpCeg1, 'new_weaponPvpCeg2' => $weaponPvpCeg2, ))); - $gold = $heroPvpCeg + $weaponPvpCeg1 + $weaponPvpCeg2;print_r($heroPvpCeg); + $gold = $heroPvpCeg + $weaponPvpCeg1 + $weaponPvpCeg2; if ($heroPvpCeg>0){ $this->_addNftActive($this->heroDto,1); } @@ -1016,6 +1016,16 @@ class BattleDataService extends BaseService { 'new_weaponPveCeg2' => $weaponPveCeg2, ))); $gold = $heroPveCeg + $weaponPveCeg1 + $weaponPveCeg2; + if ($heroPveCeg>0){ + $this->_addNftActive($this->heroDto,1); + } + if ($weaponPveCeg1>0){ + $this->_addNftActive($this->weapon1Dto,2); + } + if ($weaponPveCeg2>0){ + + $this->_addNftActive($this->weapon2Dto,2); + } if ($gold > 0) { myself()->_addVirtualItem(V_ITEM_GOLD, $gold); }