diff --git a/sql/migrate/bcnftdb.sql b/sql/migrate/bcnftdb.sql deleted file mode 120000 index 82e907ca..00000000 --- a/sql/migrate/bcnftdb.sql +++ /dev/null @@ -1 +0,0 @@ -../bcnftdb.sql \ No newline at end of file diff --git a/sql/migrate/gamedb.sql b/sql/migrate/gamedb.sql deleted file mode 120000 index e3faeb33..00000000 --- a/sql/migrate/gamedb.sql +++ /dev/null @@ -1 +0,0 @@ -../gamedb.sql \ No newline at end of file diff --git a/sql/migrate/gamedb2006_migrate_240129_01.sql b/sql/migrate/gamedb2006_migrate_240129_01.sql deleted file mode 120000 index e27ab0d2..00000000 --- a/sql/migrate/gamedb2006_migrate_240129_01.sql +++ /dev/null @@ -1 +0,0 @@ -../gamedb2006_migrate_240129_01.sql \ No newline at end of file diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php index d54e626e..09699b7d 100644 --- a/webapp/models/DynData.php +++ b/webapp/models/DynData.php @@ -10,6 +10,7 @@ class DynData extends BaseModel { public static function preload() { if (is_null(self::$dynData)) { + self::$lastAccountId = myself()->_getAccountId(); self::$dynData = array(); $rows = SqlHelper::ormSelect( myself()->_getSelfMysql(), diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index b1010598..96016ba3 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -116,9 +116,12 @@ class RoomBattleDataService extends BaseService { $member['new_elo'] = $newElo; } - - $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']); - myself()->_addItems($member['reward'], $awardService,$propertyChgService); + if ($this->mapMode == mt\MapMode::GOLD_MODE && $member['move_distance'] <= 2000 ){ + error_log("金币模式:消极战斗"); + }else{ + $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']); + myself()->_addItems($member['reward'], $awardService,$propertyChgService); + } $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']); if ($battleSingleDb){ diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php index 80fcc3f4..25382523 100644 --- a/webapp/services/TameBattleDataService.php +++ b/webapp/services/TameBattleDataService.php @@ -561,6 +561,8 @@ class TameBattleDataService extends BaseService { 'dead'=> getXVal($this->battleInfo,'dead', 0), 'skin_id'=> getXVal($this->battleInfo,'skin_id', 0), 'is_mvp'=> getXVal($this->battleInfo,'is_mvp', 0), + 'damage_out'=> getXVal($this->battleInfo,'damage_out', 0), + 'move_distance'=> getXVal($this->battleInfo,'move_distance', 0), 'old_rank'=> $oldRank, 'new_rank'=> $newRank, 'old_score'=> $oldScore, @@ -691,6 +693,8 @@ class TameBattleDataService extends BaseService { 'dead'=> getXVal($info,'dead', 0), 'skin_id'=> getXVal($info,'skin_id', 0), 'is_mvp'=> getXVal($info,'is_mvp', 0), + 'damage_out'=> getXVal($info,'damage_out', 0), + 'move_distance'=> getXVal($info,'move_distance', 0), 'old_rank'=> $oldRank, 'new_rank'=> $newRank, 'old_score'=> $oldScore,