Opt: add emotion control for GemsFarming #3649
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Air111
force-pushed
the
gems_farming_emotion
branch
3 times, most recently
from
abc91da
to
845feee
Compare
Air111
force-pushed
the
gems_farming_emotion
branch
2 times, most recently
from
d112f3d
to
4742357
Compare
Air111
commented
Apr 23, 2024
| scanner = ShipScanner(level=(max_level, max_level), emotion=(10, 150), | ||
| fleet=self.fleet_to_attack, status='free') | ||
| scanner = ShipScanner(level=(max_level, max_level), emotion=(self.emotion_lower_bound, 150), | ||
| fleet=[0, self.fleet_to_attack], status='free') |
There was a problem hiding this comment.
这里这么改是为了将两次scan减少为一次，不知道是否有必要
| @@ -174,6 +261,10 @@ def _ship_change_confirm(self, button): | |||
| self.dock_sort_method_dsc_set() | |||
| self.dock_select_confirm(check_button=page_fleet.check_button) | |||
|
|
|||
| @property | |||
| def emotion_lower_bound(self): | |||
| return 3 + EMOTION_LIMIT + self.campaign._map_battle * 2 | |||
There was a problem hiding this comment.
这里+3是为了防止心情计算值比显示值低，导致更换过程不换船之后再打一把又换，浪费时间
我测下来心情计算值相比显示值（或者说真实值？）的差别在[-2, 2]内，理论应该是[-3, 2]，因为我观察到有一次reduce的更新是118-119-117，而显示值是118（118-116-118）
| @@ -20,6 +24,79 @@ | |||
| from module.ui.page import page_fleet | |||
|
|
|||
| SIM_VALUE = 0.92 | |||
| EMOTION_LIMIT = 4 | |||
There was a problem hiding this comment.
+2是处理像2-4这种经常需要多打一战的情况
|
有个问题，心情每六分钟更新一次是解包得到的还是观察得到的？我有时候观察到后宅的心情在57，03，09而不是54，00， 06更新，不知道是因为显示有误还是什么原因？ |
LmeSzinc
reviewed
May 18, 2024
module/campaign/gems_farming.py
Outdated
Comment on lines
51
to
55
| class GemsEmotion(Emotion): | ||
|
|
||
| def __init__(self, config, fleet_index): | ||
| self.config = config | ||
| self.fleet_index = fleet_index - 1 |
There was a problem hiding this comment.
起码要重载这几个：
FleetEmotion.update：（1级后排）不放后宅心情介于119-150的计算Emotion.check_reduce：不delay task，且ScriptEnd在CampaignRun.run中被捕获Emotion.wait：计算错了导致红脸不要等待直接撤退
There was a problem hiding this comment.
@LmeSzinc 这里不重载Emotion.check_reduce的话要怎么捕获呢，CampaignRun.run已经把ScriptError的错误给catch走了
Comment on lines
-355
to
+429
| ship = self.get_common_rarity_dd() | ||
| if ship: | ||
| self._ship_change_confirm(max(ship, key=lambda s: s.emotion).button) | ||
| ships = self.get_common_rarity_dd() | ||
| if ships: | ||
| ship = max(ships, key=lambda s: s.emotion) | ||
| self._new_emotion_value = min(ship.emotion, self._new_emotion_value) | ||
| self._ship_change_confirm(ship.button) |
There was a problem hiding this comment.
我想了一下，可能还是前后排都换完再写比较好（原本实现也存在问题）。考虑这样的情况：后排更换成功但前排更换失败，任务将会推迟，再次进行时不会先换船而是直接出击，应使用旧的心情值
Air111
force-pushed
the
gems_farming_emotion
branch
2 times, most recently
from
327c53e
to
6f29e9e
Compare
|
如何隐藏选项又不被覆盖又不使用
|
Air111
force-pushed
the
gems_farming_emotion
branch
from
6f29e9e
to
501dcd4
Compare
Air111
force-pushed
the
gems_farming_emotion
branch
from
501dcd4
to
8d993a8
Compare
Air111
force-pushed
the
gems_farming_emotion
branch
from
8d993a8
to
d1b488e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
给紧急委托加上心情控制，减少因红脸弹窗导致的撤退。在GUI上不会新增任何选项。
补充：#3610