Enhance battle and room systems with new features#46
Merged
chiimagnus merged 29 commits intomainfrom Feb 10, 2026
Merged
Conversation
- Added new animation kinds: block, turnStart, turnEnd, and energyPulse to BattleAnimationQueue. - Updated AnimationJob structure to include additional properties for cardId, playedCardContext, amount, blocked, entityId, turn, and energy. - Enhanced BattleAnimationSystem to handle new animation kinds and improved rendering logic for hand and enemy states. - Introduced FloatingTextFactory for displaying floating text effects for damage, block, and neutral events. - Updated BattleHUDPanel to display turn banners and energy information with animations. - Modified RunSession to track played card contexts and manage event sequences effectively. - Refactored BattlePresentationEvent to include playedCardContext for better event handling.
…ate management - Implemented EventRoomPanel to handle event interactions and display options. - Created RestRoomPanel for resting and upgrading cards, including UI for player health and actions. - Developed ShopRoomPanel for purchasing cards, relics, and consumables, with inventory management. - Introduced EventRoomState and ShopRoomState to manage the state of event and shop rooms. - Enhanced RunSession to support new room types and their functionalities, including event handling and shop interactions.
This reverts commit 8f873ba.
This reverts commit 97f7fba.
- 修改 BattleEvent 结构，新增 targetEntityId 字段 - 更新 BattleEngine，emit 事件时传递目标实体 ID - 调整 BattleAnimationQueue 和 BattleAnimationSystem，确保动画反馈基于目标实体 ID - 更新相关测试用例，确保新字段的正确性
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Implement a series of enhancements to the battle system, including new animation types, improved event handling, and a refined shop interface. Introduce new room panels for events, rest, and shops, along with state management for better gameplay experience. Update documentation to reflect these changes and ensure clarity on business rules and acceptance criteria.