From 234f297ab91c8ff8b68c7fe7dc14001078737429 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 14:36:37 +0800 Subject: [PATCH 1/4] 1 --- doc/_common.py | 1 + webapp/models/Hero.php | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/_common.py b/doc/_common.py index 596c0e3e..cdb31b1b 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -243,6 +243,7 @@ class Hero(object): ['skill_points', '', '技能点'], ['!chip_core', [ChipCore()], '芯片核心加成'], ['!skill_common', [], '通用属性'], + ['offer_reward_state', 0, '是否悬赏中'], ] class LevelingHero(object): diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index d685656a..0626f74b 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -191,6 +191,7 @@ class Hero extends BaseModel { 'chip_ids' => $row['chip_ids'], 'skill_common' => $skill_common, 'skill_points' => $row['skill_points'], + 'offer_reward_state' => 0, ); $dto['ceg_uplimit'] = FormulaService::getHeroPvpDailyCegUpLimit($dto); $dto['raw_pve_ceg_uplimit'] = From 3a271f679ce3f246f347288d0d37b53344ded4d0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 15:19:08 +0800 Subject: [PATCH 2/4] 1 --- webapp/models/Hero.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 19911a46..4f180c6e 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -3,12 +3,14 @@ namespace models; require_once('mt/Hero.php'); +require_once('mt/Chip.php'); require_once('mt/HeroLevelAttr.php'); require_once('mt/HeroQuality.php'); require_once('mt/AttrHelper.php'); require_once('mt/Item.php'); require_once('mt/SkillCommon.php'); require_once('models/HeroSkin.php'); +require_once('models/Chip.php'); require_once('services/NftService.php'); require_once('services/FormulaService.php'); From 1bec2de5e2b994e167d08000a9573ebed5c40bb3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 15:49:48 +0800 Subject: [PATCH 3/4] 1 --- webapp/models/Hero.php | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 4f180c6e..a5a06014 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -3,7 +3,6 @@ namespace models; require_once('mt/Hero.php'); -require_once('mt/Chip.php'); require_once('mt/HeroLevelAttr.php'); require_once('mt/HeroQuality.php'); require_once('mt/AttrHelper.php'); From 39c57c3f2562a33fecc62755addbad7d5b1140c2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Sep 2022 15:59:12 +0800 Subject: [PATCH 4/4] 1 --- doc/_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_common.py b/doc/_common.py index cdb31b1b..0c35bc3f 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -375,7 +375,7 @@ class Mission(object): ['mission_id', 0, '任务id'], ['current', 0, '任务进度-当前'], ['target', 0, '任务进度-目标'], - ['state', 0, '任务状态 0:可领取 1:已领取 2:未完成(不可领取)'], + ['state', 0, '任务状态 0:任务已完成-可领取奖励 1:可接任务(send) 2:任务进行中-未完成(不可领取)'], ['show_progress', 0, '是否显示任务进度'], ['objects!', [