From 357b3e1c8c1ccf864c88bb534148cd5f3f9704b9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 26 Apr 2024 16:32:19 +0800 Subject: [PATCH 1/7] 1 --- sql/migrate/bcnftdb.sql | 1 - sql/migrate/gamedb.sql | 1 - sql/migrate/gamedb2006_migrate_240129_01.sql | 1 - 3 files changed, 3 deletions(-) delete mode 120000 sql/migrate/bcnftdb.sql delete mode 120000 sql/migrate/gamedb.sql delete mode 120000 sql/migrate/gamedb2006_migrate_240129_01.sql 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 From a917702284fe6f237e9eb211487838104e490738 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 17 May 2024 10:37:35 +0800 Subject: [PATCH 2/7] 1 --- webapp/models/DynData.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php index 6284f532..4ffbf986 100644 --- a/webapp/models/DynData.php +++ b/webapp/models/DynData.php @@ -237,6 +237,7 @@ class DynData extends BaseModel { private static function internalGetV($x, $y, $defVal = 0) { + self::checkLastUser(); $key = self::calcKey($x, $y); if (!is_null(self::$dynData)) { if (isset(self::$dynData[$key])) { @@ -270,6 +271,18 @@ class DynData extends BaseModel { } } + private static function checkLastUser() + { + if (!empty(self::$lastAccountId)) { + if (self::$lastAccountId != myself()->_getAccountId()) { + self::$lastAccountId = myself()->_getAccountId(); + self::$dynData = null; + self::$hitCount = 0; + } + } + } + + private static $lastAccountId = ''; private static $dynData = null; private static $hitCount = 0; From bb222476b1084645521b48ca8202b29d4a037498 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 17 May 2024 12:34:06 +0800 Subject: [PATCH 3/7] 1 --- webapp/models/DynData.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/models/DynData.php b/webapp/models/DynData.php index 4ffbf986..ae8db556 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(), From 6308dd69a024b0c2155e862c77cd1f06107a7caf Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 22 May 2024 14:46:08 +0800 Subject: [PATCH 4/7] 1 --- webapp/services/RoomBattleDataService.php | 12 ++++++++---- webapp/services/TameBattleDataService.php | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index 482b739e..dd7d8a55 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -113,10 +113,14 @@ 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 || $member['damage_out'] <= 500) ){ + 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){ $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array()); diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php index c726aef4..5ed0c8ad 100644 --- a/webapp/services/TameBattleDataService.php +++ b/webapp/services/TameBattleDataService.php @@ -691,6 +691,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, From 8a5ee488b09f99ffc71289e3f2eb31be71f958dd Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 22 May 2024 15:08:32 +0800 Subject: [PATCH 5/7] 1 --- webapp/services/RoomBattleDataService.php | 2 +- webapp/services/TameBattleDataService.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index dd7d8a55..81f4cd63 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -120,7 +120,7 @@ class RoomBattleDataService extends BaseService { $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']); myself()->_addItems($member['reward'], $awardService,$propertyChgService); } - + $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']); if ($battleSingleDb){ $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array()); diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php index 5ed0c8ad..2ca06aec 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, From 08b6c9fd6a488c4694fe575ec0d7e10017852009 Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 22 May 2024 17:54:08 +0800 Subject: [PATCH 6/7] 1 --- webapp/services/RoomBattleDataService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index 81f4cd63..8adbcbb7 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -114,7 +114,7 @@ class RoomBattleDataService extends BaseService { } if ($this->mapMode == mt\MapMode::GOLD_MODE && - ($member['move_distance'] <= 2000 || $member['damage_out'] <= 500) ){ + ($member['move_distance'] <= 4000 || $member['damage_out'] <= 500) ){ error_log("金币模式:消极战斗"); }else{ $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']); From c2949f17fc6c91d73804c46bb55e146e08a3fbb1 Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Thu, 23 May 2024 14:22:00 +0800 Subject: [PATCH 7/7] 1 --- webapp/services/RoomBattleDataService.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index 8adbcbb7..80f8717c 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -113,8 +113,7 @@ class RoomBattleDataService extends BaseService { $member['new_elo'] = $newElo; } - if ($this->mapMode == mt\MapMode::GOLD_MODE && - ($member['move_distance'] <= 4000 || $member['damage_out'] <= 500) ){ + if ($this->mapMode == mt\MapMode::GOLD_MODE && $member['move_distance'] <= 2000 ){ error_log("金币模式:消极战斗"); }else{ $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);