From 36a59e335f5bb76eb14599ee4d2484189a8dd1d8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 09:49:30 +0800 Subject: [PATCH 1/8] 1 --- doc/AAMarket.py | 5 +++-- doc/_common.py | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/AAMarket.py b/doc/AAMarket.py index f773417d..eaf9c40b 100644 --- a/doc/AAMarket.py +++ b/doc/AAMarket.py @@ -10,7 +10,7 @@ class AAMarket(object): 'desc': '获取上架出售的NFTs(瀑布流式api) jwtheader为可选参数', 'group': '!AAMarket', 'url': 'https://market-test.kingsome.cn/api/market/product/list/:net_id', - 'headers': _common.JwtHeader, + 'headers': _common.MaybeJwtHeader, 'is_json_params': True, 'request_params': [ [':net_id', 0, '链id'], @@ -295,13 +295,14 @@ class AAMarket(object): 'name': '/api/user/:account_address', 'desc': '获取用户信息', 'group': '!AAMarket', + 'headers': _common.MaybeJwtHeader, 'url': 'https://market-test.kingsome.cn/api/user/:account_address', 'params': [ ], 'response': [ _common.RspHead(), ['nickname', '', '昵称'], - ['email', '', 'email'], + ['email', '', 'email(因为隐私问题jwt关联的地址和:account_address相等时才返回email)'], ['contribution_point', 0, '贡献点'], ['gold', '', '金币数'], ['diamond', '', '钻石数'], diff --git a/doc/_common.py b/doc/_common.py index 411fdea1..3a1592a3 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -26,6 +26,10 @@ JwtHeader = [ 'Authorization Bearer {JwtToken}' ] +MaybeJwtHeader = [ + 'Authorization Bearer {JwtToken} 可选参数' +] + LoginRequired = 'login required' class Union(object): From 9924a0016fbf36fb2dd41a5b11e05d05c0533f5a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 10:56:31 +0800 Subject: [PATCH 2/8] 1 --- webapp/controller/BigwheelController.class.php | 1 + webapp/events/Bigwheel.php | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/webapp/controller/BigwheelController.class.php b/webapp/controller/BigwheelController.class.php index f2571f0e..4914714e 100644 --- a/webapp/controller/BigwheelController.class.php +++ b/webapp/controller/BigwheelController.class.php @@ -280,6 +280,7 @@ class BigwheelController extends BaseAuthedController { ) )); } + myself()->_fireEvent('Bigwheel', 'onWinPrize', $grid1, $grid2, $drop1, $drop2); $this->sendNotify($drop1[0]['item_id']); $this->sendNotify($drop2[0]['item_id']); } diff --git a/webapp/events/Bigwheel.php b/webapp/events/Bigwheel.php index be0cb50f..472da36c 100644 --- a/webapp/events/Bigwheel.php +++ b/webapp/events/Bigwheel.php @@ -5,12 +5,8 @@ namespace events; class Bigwheel { - public static function onWinBigPrize($data) + public static function onWinPrize($grid1, $grid2, $drop1, $drop2) { - //触发(调用)对应对该事件感兴趣的模块 - //myself()->_callServiceStatic('A', 'f1', $battleData); - //myself()->_callServiceStatic('B', 'f1', $battleData); - echo json_encode($data); } } From 8b9773308c80fa250f53404d99b3e5f1b22d664a Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 7 Aug 2024 10:59:06 +0800 Subject: [PATCH 3/8] 1 --- webapp/controller/HashRateController.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/controller/HashRateController.class.php b/webapp/controller/HashRateController.class.php index 4d58df40..eb16f2dc 100644 --- a/webapp/controller/HashRateController.class.php +++ b/webapp/controller/HashRateController.class.php @@ -132,12 +132,12 @@ class HashRateController extends BaseAuthedController $rewardNum = $reward[0]['item_num']; HashRate::add($taskMeta['id'],$currentPeriod['id']); HashRate::rewardAdd($currentPeriod['id'],$rewardNum); - //刷新任务 - $refreshTimes = myself()->_getDailyV(TN_HASH_DAILY_REFRESH_TIMES,0); - $refreshTimesMax = \mt\Parameter::getVal('economy_account_compute_refresh_max',5); - if ($taskMeta['is_refresh'] == \mt\AchievementsPower::REFRESH_STATE && $refreshTimes < $refreshTimesMax){ - $this->hashRateService->refreshHashRateTask($taskMeta,$currentPeriod['id']); - } +// //刷新任务 +// $refreshTimes = myself()->_getDailyV(TN_HASH_DAILY_REFRESH_TIMES,0); +// $refreshTimesMax = \mt\Parameter::getVal('economy_account_compute_refresh_max',5); +// if ($taskMeta['is_refresh'] == \mt\AchievementsPower::REFRESH_STATE && $refreshTimes < $refreshTimesMax){ +// $this->hashRateService->refreshHashRateTask($taskMeta,$currentPeriod['id']); +// } $this->_rspData(array( 'award' => $reward, )); From 38b715e7a3d821bdb01f3d70cc04fe1f19bc4beb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 11:27:41 +0800 Subject: [PATCH 4/8] 1 --- .../controller/BigwheelController.class.php | 45 ------------- webapp/events/Bigwheel.php | 5 ++ webapp/services/BigwheelService.php | 65 +++++++++++++++++++ 3 files changed, 70 insertions(+), 45 deletions(-) create mode 100644 webapp/services/BigwheelService.php diff --git a/webapp/controller/BigwheelController.class.php b/webapp/controller/BigwheelController.class.php index 4914714e..d9240ed9 100644 --- a/webapp/controller/BigwheelController.class.php +++ b/webapp/controller/BigwheelController.class.php @@ -281,8 +281,6 @@ class BigwheelController extends BaseAuthedController { )); } myself()->_fireEvent('Bigwheel', 'onWinPrize', $grid1, $grid2, $drop1, $drop2); - $this->sendNotify($drop1[0]['item_id']); - $this->sendNotify($drop2[0]['item_id']); } public function buyS() @@ -438,47 +436,4 @@ class BigwheelController extends BaseAuthedController { return $priceInfo; } - private function sendNotify($itemId) - { - $itemMeta = myself()->_callMtStatic('Item', 'get', $itemId); - if (empty($itemMeta)) { - return; - } - $elements = array(); - array_push($elements, array( - 'ele_type' => 2, - 'color' => '#ffffff', - 'lang_key' => 'Marquee_rewards_get_1', - 'lang_params' => array(), - )); - array_push($elements, array( - 'ele_type' => 1, - //'color' => '#', - 'text' => myself()->_getUserInfo(array('name'))['name'], - )); - array_push($elements, array( - 'ele_type' => 2, - 'color' => '#ffffff', - 'lang_key' => 'Marquee_rewards_get_2', - 'lang_params' => array(), - )); - array_push($elements, array( - 'ele_type' => 2, - 'color' => '#ff3f3f', - 'lang_key' => $itemMeta['name'], - 'lang_params' => array(), - )); - array_push($elements, array( - 'ele_type' => 2, - 'color' => '#ffffff', - 'lang_key' => 'Marquee_rewards_get_3', - 'lang_params' => array(), - )); - error_log(json_encode($elements)); - $content = myself()->_callServiceStatic('NoticeService', 'buildCustom', $elements); - $loop = 1; - $interval = 1; - myself()->_callServiceStatic('NoticeService', 'send', $content, $loop, $interval); - } - } diff --git a/webapp/events/Bigwheel.php b/webapp/events/Bigwheel.php index 472da36c..798917a4 100644 --- a/webapp/events/Bigwheel.php +++ b/webapp/events/Bigwheel.php @@ -7,6 +7,11 @@ class Bigwheel public static function onWinPrize($grid1, $grid2, $drop1, $drop2) { + myself()->_callServiceStatic('BigwheelService', 'onWinPrize', + $grid1, + $grid2, + $drop1, + $drop2); } } diff --git a/webapp/services/BigwheelService.php b/webapp/services/BigwheelService.php new file mode 100644 index 00000000..36803964 --- /dev/null +++ b/webapp/services/BigwheelService.php @@ -0,0 +1,65 @@ +_callMtStatic('Item', 'get', $itemId); + if (empty($itemMeta)) { + return; + } + $elements = array(); + array_push($elements, array( + 'ele_type' => 2, + 'color' => '#ffffff', + 'lang_key' => 'Marquee_rewards_get_1', + 'lang_params' => array(), + )); + array_push($elements, array( + 'ele_type' => 1, + //'color' => '#', + 'text' => myself()->_getUserInfo(array('name'))['name'], + )); + array_push($elements, array( + 'ele_type' => 2, + 'color' => '#ffffff', + 'lang_key' => 'Marquee_rewards_get_2', + 'lang_params' => array(), + )); + array_push($elements, array( + 'ele_type' => 2, + 'color' => '#ff3f3f', + 'lang_key' => $itemMeta['name'], + 'lang_params' => array(), + )); + array_push($elements, array( + 'ele_type' => 2, + 'color' => '#ffffff', + 'lang_key' => 'Marquee_rewards_get_3', + 'lang_params' => array(), + )); + error_log(json_encode($elements)); + $content = myself()->_callServiceStatic('NoticeService', 'buildCustom', $elements); + $loop = 1; + $interval = 1; + myself()->_callServiceStatic('NoticeService', 'send', $content, $loop, $interval); + } + +} From 116ce9962b0e2007cf8be6ff4b2be6b4b54dccff Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 11:57:11 +0800 Subject: [PATCH 5/8] 1 --- webapp/controller/BigwheelController.class.php | 14 +++++++++++--- webapp/events/Bigwheel.php | 8 ++------ webapp/services/BigwheelService.php | 4 +++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/webapp/controller/BigwheelController.class.php b/webapp/controller/BigwheelController.class.php index d9240ed9..a3331247 100644 --- a/webapp/controller/BigwheelController.class.php +++ b/webapp/controller/BigwheelController.class.php @@ -67,11 +67,11 @@ class BigwheelController extends BaseAuthedController { } $priceInfo = $this->getPriceInfo($data['drawed_times']); if (empty($priceInfo)) { - myself()->_rspErr(500, 'server internal error'); + myself()->_rspErr(500, 'server internal error1'); return; } if ($priceInfo['cost_item_id'] != V_ITEM_DIAMOND) { - myself()->_rspErr(500, 'server internal error'); + myself()->_rspErr(500, 'server internal error2'); return; } $costItemNum = 0; @@ -280,7 +280,15 @@ class BigwheelController extends BaseAuthedController { ) )); } - myself()->_fireEvent('Bigwheel', 'onWinPrize', $grid1, $grid2, $drop1, $drop2); + myself()->_fireEvent('Bigwheel', 'onWinPrize', + array( + 'grid' => $grid1, + 'drop' => $drop1 + ), + array( + 'grid' => $grid2, + 'drop' => $drop2 + )); } public function buyS() diff --git a/webapp/events/Bigwheel.php b/webapp/events/Bigwheel.php index 798917a4..4a63dca0 100644 --- a/webapp/events/Bigwheel.php +++ b/webapp/events/Bigwheel.php @@ -5,13 +5,9 @@ namespace events; class Bigwheel { - public static function onWinPrize($grid1, $grid2, $drop1, $drop2) + public static function onWinPrize($grid1, $grid2) { - myself()->_callServiceStatic('BigwheelService', 'onWinPrize', - $grid1, - $grid2, - $drop1, - $drop2); + myself()->_callServiceStatic('BigwheelService', 'onWinPrize', $grid1, $grid2); } } diff --git a/webapp/services/BigwheelService.php b/webapp/services/BigwheelService.php index 36803964..51429155 100644 --- a/webapp/services/BigwheelService.php +++ b/webapp/services/BigwheelService.php @@ -4,10 +4,12 @@ namespace services; require_once('mt/Bigwheel.php'); +use mt; + class BigwheelService extends BaseService { - public static function onWinPrize($grid1, $grid2, $drop1, $drop2) + public static function onWinPrize($grid1, $grid2) { $grids = array($grid1, $grid2); foreach ($grids as $grid) { From 668c2f54c4014a44a2183d75d8026cc5610765ec Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Aug 2024 13:25:21 +0800 Subject: [PATCH 6/8] 1 --- webapp/controller/BigwheelController.class.php | 4 ++-- webapp/services/BigwheelService.php | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/webapp/controller/BigwheelController.class.php b/webapp/controller/BigwheelController.class.php index a3331247..bf6d5f28 100644 --- a/webapp/controller/BigwheelController.class.php +++ b/webapp/controller/BigwheelController.class.php @@ -282,11 +282,11 @@ class BigwheelController extends BaseAuthedController { } myself()->_fireEvent('Bigwheel', 'onWinPrize', array( - 'grid' => $grid1, + 'info' => $grid1, 'drop' => $drop1 ), array( - 'grid' => $grid2, + 'info' => $grid2, 'drop' => $drop2 )); } diff --git a/webapp/services/BigwheelService.php b/webapp/services/BigwheelService.php index 51429155..7f7bdded 100644 --- a/webapp/services/BigwheelService.php +++ b/webapp/services/BigwheelService.php @@ -13,10 +13,9 @@ class BigwheelService extends BaseService { $grids = array($grid1, $grid2); foreach ($grids as $grid) { - $gridMeta = mt\Bigwheel::get($grid['grid_id']); - if ($grid['grid_state'] == 1 && $gridMeta['is_grand_reward']) { - self::sendNotify($drop1[0]['item_id']); - self::sendNotify($drop2[0]['item_id']); + $gridMeta = mt\Bigwheel::get($grid['info']['grid_id']); + if ($grid['info']['grid_state'] == 1 && $gridMeta['is_grand_reward']) { + self::sendNotify($grid['drop'][0]['item_id']); } } } From 95a512d44c843fd86ffdb80a7898ec224458e15d Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 7 Aug 2024 14:40:30 +0800 Subject: [PATCH 7/8] 1 --- webapp/models/HashRate.php | 12 +++++++++++- webapp/mt/BattleRandAttribute.php | 13 +++++++------ webapp/services/HashRateService.php | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/webapp/models/HashRate.php b/webapp/models/HashRate.php index f038ae92..1ed8d793 100644 --- a/webapp/models/HashRate.php +++ b/webapp/models/HashRate.php @@ -3,6 +3,9 @@ namespace models; +require_once('mt/AchievementsPower.php'); + +use mt\AchievementsPower; use phpcommon\SqlHelper; class HashRate extends BaseModel { @@ -32,6 +35,7 @@ class HashRate extends BaseModel } public static function getCount($period){ + $count = 0; $rows = SqlHelper::ormSelect( myself()->_getSelfMysql(), 't_hash_rate', @@ -40,7 +44,13 @@ class HashRate extends BaseModel 'period' => $period, ) ); - return count($rows); + foreach ($rows as $row){ + $hashMeta = AchievementsPower::find($row['task_id']); + if ($hashMeta['task_type'] != AchievementsPower::TYPE5){ + $count += 1; + } + } + return $count; } diff --git a/webapp/mt/BattleRandAttribute.php b/webapp/mt/BattleRandAttribute.php index d8d79ae7..14f4602a 100644 --- a/webapp/mt/BattleRandAttribute.php +++ b/webapp/mt/BattleRandAttribute.php @@ -39,12 +39,13 @@ class BattleRandAttribute { $strs = explode('|', $randMeta['attributeRange']); foreach ($strs as $str){ $attrStr = explode(':', $str); - $rnd = rand($attrStr[1]*100000 , $attrStr[2]*100000) / 100000; -// $val = $attrStr[1] + ($attrStr[2] - $attrStr[1]) * $rnd; - array_push($attrArray,array( - "attr_id" => $attrStr[0], - "val" => $rnd, - )); + if (count($attrStr) == 3){ + $rnd = rand($attrStr[1]*100000 , $attrStr[2]*100000) / 100000; + array_push($attrArray,array( + "attr_id" => $attrStr[0], + "val" => $rnd, + )); + } } return $attrArray; } diff --git a/webapp/services/HashRateService.php b/webapp/services/HashRateService.php index 4c849017..c3743b6f 100644 --- a/webapp/services/HashRateService.php +++ b/webapp/services/HashRateService.php @@ -344,7 +344,8 @@ class HashRateService extends BaseService private function randHashRateTaskList($type){ $metas = AchievementsPower::getListByType($type); $this->hashRateTask['task'.$type] = array(); - foreach (array_rand($metas, 4) as $key) { + $count = count($metas) >= 4 ? 4 : count($metas) ; + foreach (array_rand($metas, $count) as $key) { $meta = $metas[$key]; if (count($this->hashRateTask['task'.$type]) >= 4) { From 6e8e92b2fc119981879a1f9e7509186645a2fabe Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Wed, 7 Aug 2024 14:42:56 +0800 Subject: [PATCH 8/8] 1 --- webapp/events/Upgrade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/events/Upgrade.php b/webapp/events/Upgrade.php index 4d2adf87..bda08725 100644 --- a/webapp/events/Upgrade.php +++ b/webapp/events/Upgrade.php @@ -6,12 +6,12 @@ namespace events; class Upgrade { - public static function onHeroUpgrade($params){ - myself()->_callServiceStatic('HashRateService', 'onUpLvHero', $params); + public static function onHeroUpgrade(){ + myself()->_callServiceStatic('HashRateService', 'onUpLvHero'); } - public static function onChipUpgrade($params){ - myself()->_callServiceStatic('HashRateService', 'onUpLvChip', $params); + public static function onChipUpgrade(){ + myself()->_callServiceStatic('HashRateService', 'onUpLvChip'); }