Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refix: include equipped items when counting quantities of held items in the shop #289

Merged
merged 1 commit into from
May 27, 2024

Conversation

liuzhier
Copy link
Contributor

@liuzhier liuzhier commented May 12, 2024

Continue 4176ade. Thanks to @rym1020 for reporting the bug.

很抱歉,上次修复该问题时未进行较全面的测试,导致商店计算现有数量时会把未入队的队员身上的装备也加进去,现已更正。
感谢 rym1020 报告问题。

  • Have you checked to ensure there aren't other open Pull Requests for the same change?

  • Have you added an explanation of what your changes do and why you'd like us to include them?

  • How many dependencies was introduced in this PR? Did the minimal requirement changed, for which platform?

  • Have you written new tests for your changes?

  • Have you successfully run it with your changes locally?

  • Have you tested on following platforms?

    • Win32
    • UWP
    • Linux
    • Android
    • macOS
    • iOS
  • I certify that I have the right and agree to submit my contributions under the terms of GNU General Public License, version 3 (or any later version at the choice of the maintainers of the SDLPAL Project) as published by the Free Software Foundation.

@palxex
Copy link
Member

palxex commented May 13, 2024

请给出测试用例和测试存档

@liuzhier
Copy link
Contributor Author

saves.zip
这个包里有两个存档,场景定位在苏州饰品商贩,这里直接将李逍遥和赵灵儿的“佩带”改为了“玉镯”,林月如的初始“佩带”本就是“玉镯”。两个存档的区别为,存档1队伍3人,存档2队伍1人。

@palxex
Copy link
Member

palxex commented May 15, 2024

就是说这个fix其实只有直接修改存档才会与上一版呈现区别吗?按我理解如果离队脚本书写得当,离队人物身上不应该存在道具。
代码审核完毕,可合并。
编辑:经@PalMusicFan 提醒忘记了未入队成员的初始装备……合并优先级提升。

@PalMusicFan
Copy link
Contributor

关于提交信息的小建议。

首先,提交信息第二行开始开头字母要大写。其次,两个完整句子之间不能用逗号分隔。最后,感谢提交者建议参考之前用过的格式:Thanks to user xxx for reporting the bug.

@liuzhier liuzhier force-pushed the pr_fix_shop_num_equipped_items branch from e8d1b16 to d1540bc Compare May 17, 2024 13:18
@liuzhier
Copy link
Contributor Author

liuzhier commented May 17, 2024

感谢PalMusicFan的建议

WGTM; TBR; PLEASE

@liuzhier liuzhier force-pushed the pr_fix_shop_num_equipped_items branch from d1540bc to 6ab0a4e Compare May 17, 2024 13:46
@PalMusicFan
Copy link
Contributor

建议使用:Thanks to xxx for reporting the bug.

…in the shop

Continue 4176ade. Thanks to @rym1020 for reporting the bug.
@liuzhier liuzhier force-pushed the pr_fix_shop_num_equipped_items branch from 6ab0a4e to b2999fd Compare May 18, 2024 12:39
@palxex palxex merged commit 4a2aa6f into sdlpal:master May 27, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants