server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from ty

Browse Source
This commit is contained in:
aozhiwei 2024-06-28 16:11:16 +08:00
commit eb0a7aace2
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/migrate/bcnftdb.sql
View File

@ -1 +0,0 @@
../bcnftdb.sql

1
sql/migrate/gamedb.sql
View File

@ -1 +0,0 @@
../gamedb.sql

1
sql/migrate/gamedb2006_migrate_240129_01.sql
View File

@ -1 +0,0 @@
../gamedb2006_migrate_240129_01.sql

1
webapp/models/DynData.php
View File

@ -10,6 +10,7 @@ class DynData extends BaseModel {
public static function preload() public static function preload()
{ {
if (is_null(self::$dynData)) { if (is_null(self::$dynData)) {
self::$lastAccountId = myself()->_getAccountId();
self::$dynData = array(); self::$dynData = array();
$rows = SqlHelper::ormSelect( $rows = SqlHelper::ormSelect(
myself()->_getSelfMysql(), myself()->_getSelfMysql(),

5
webapp/services/RoomBattleDataService.php
View File

@ -116,9 +116,12 @@ class RoomBattleDataService extends BaseService {
$member['new_elo'] = $newElo; $member['new_elo'] = $newElo;
} }
if ($this->mapMode == mt\MapMode::GOLD_MODE && $member['move_distance'] <= 2000 ){
error_log("金币模式:消极战斗");
}else{
$this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']); $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
myself()->_addItems($member['reward'], $awardService,$propertyChgService); myself()->_addItems($member['reward'], $awardService,$propertyChgService);
}
$battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']); $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
if ($battleSingleDb){ if ($battleSingleDb){

4
webapp/services/TameBattleDataService.php
View File

@ -561,6 +561,8 @@ class TameBattleDataService extends BaseService {
'dead'=> getXVal($this->battleInfo,'dead', 0), 'dead'=> getXVal($this->battleInfo,'dead', 0),
'skin_id'=> getXVal($this->battleInfo,'skin_id', 0), 'skin_id'=> getXVal($this->battleInfo,'skin_id', 0),
'is_mvp'=> getXVal($this->battleInfo,'is_mvp', 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, 'old_rank'=> $oldRank,
'new_rank'=> $newRank, 'new_rank'=> $newRank,
'old_score'=> $oldScore, 'old_score'=> $oldScore,
@ -691,6 +693,8 @@ class TameBattleDataService extends BaseService {
'dead'=> getXVal($info,'dead', 0), 'dead'=> getXVal($info,'dead', 0),
'skin_id'=> getXVal($info,'skin_id', 0), 'skin_id'=> getXVal($info,'skin_id', 0),
'is_mvp'=> getXVal($info,'is_mvp', 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, 'old_rank'=> $oldRank,
'new_rank'=> $newRank, 'new_rank'=> $newRank,
'old_score'=> $oldScore, 'old_score'=> $oldScore,