horoli/game
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
horoli
2025-12-05 16:48:00 +09:00
parent d3fd9680c2
commit d7cd938403
17 changed files with 1137 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/game/config/animation_config.dart
+34
View File
@@ -0,0 +1,34 @@
import 'package:flutter/material.dart';
import '../enums.dart';
class AnimationConfig {
// Durations
static const Duration floatingTextDuration = Duration(milliseconds: 1000);
static const Duration floatingEffectDuration = Duration(milliseconds: 800);
static const Duration fadeDuration = Duration(milliseconds: 200);
// Attack Animations
static const Duration attackSafe = Duration(milliseconds: 200);
static const Duration attackNormal = Duration(milliseconds: 400);
static const Duration attackRiskyTotal = Duration(milliseconds: 1100);
static const Duration attackRiskyScale = Duration(milliseconds: 600);
static const Duration attackRiskyDash = Duration(milliseconds: 500);
// Curves
static const Curve floatingTextCurve = Curves.easeOut;
static const Curve floatingEffectScaleCurve = Curves.elasticOut;
static const Curve attackSafeCurve = Curves.elasticIn;
static const Curve attackNormalCurve = Curves.easeOutQuad;
static const Curve attackRiskyDashCurve = Curves.easeInExpo;
static Duration getAttackDuration(RiskLevel risk) {
switch (risk) {
case RiskLevel.safe:
return attackSafe;
case RiskLevel.normal:
return attackNormal;
case RiskLevel.risky:
return attackRiskyTotal;
}
}
}
lib/game/config/battle_config.dart
+64
View File
@@ -0,0 +1,64 @@
import 'package:flutter/material.dart';
import '../enums.dart';
class BattleConfig {
// Icons
static const IconData attackIcon = Icons.flash_on;
static const IconData defendIcon = Icons.shield;
// Colors
static const Color riskyColor = Colors.redAccent;
static const Color normalColor = Colors.orangeAccent;
static const Color safeColor = Colors.grey;
static const Color defendRiskyColor = Colors.deepPurpleAccent;
static const Color defendNormalColor = Colors.blueAccent;
static const Color defendSafeColor = Colors.greenAccent;
// Sizes
static const double sizeRisky = 80.0; // User increased this in previous edit
static const double sizeNormal = 60.0;
static const double sizeSafe = 40.0;
static IconData getIcon(ActionType type) {
switch (type) {
case ActionType.attack:
return attackIcon;
case ActionType.defend:
return defendIcon;
}
}
static Color getColor(ActionType type, RiskLevel risk) {
if (type == ActionType.attack) {
switch (risk) {
case RiskLevel.risky:
return riskyColor;
case RiskLevel.normal:
return normalColor;
case RiskLevel.safe:
return safeColor;
}
} else {
switch (risk) {
case RiskLevel.risky:
return defendRiskyColor;
case RiskLevel.normal:
return defendNormalColor;
case RiskLevel.safe:
return defendSafeColor;
}
}
}
static double getSize(RiskLevel risk) {
switch (risk) {
case RiskLevel.risky:
return sizeRisky;
case RiskLevel.normal:
return sizeNormal;
case RiskLevel.safe:
return sizeSafe;
}
}
}
lib/game/config/theme_config.dart
+36
View File
@@ -0,0 +1,36 @@
import 'package:flutter/material.dart';
class ThemeConfig {
// Stat Colors
static const Color statHpColor = Colors.red;
static const Color statHpPlayerColor = Colors.green;
static const Color statHpEnemyColor = Colors.red;
static const Color statAtkColor = Colors.blueAccent;
static const Color statDefColor =
Colors.green; // Or Blue depending on context
static const Color statLuckColor = Colors.green;
static const Color statGoldColor = Colors.amber;
// UI Colors
static const Color textColorWhite = Colors.white;
static const Color textColorGrey = Colors.grey;
static const Color cardBgColor = Colors.black54;
static const Color inventoryCardBg = Color(
0xFF455A64,
); // Colors.blueGrey[700]
static const Color equipmentCardBg = Color(
0xFF546E7A,
); // Colors.blueGrey[600]
static const Color emptySlotBg = Color(0xFF424242); // Colors.grey[800]
// Feedback Colors
static const Color damageTextDefault = Colors.red;
static const Color healText = Colors.green;
static const Color missText = Colors.grey;
static const Color failedText = Colors.redAccent;
static const Color feedbackShadow = Colors.black;
// Status Effect Colors
static const Color effectBg = Colors.deepOrange;
static const Color effectText = Colors.white;
}
lib/game/data/item_table.dart
+3 -3
View File
@@ -42,9 +42,9 @@ class ItemTemplate {
id: json['id'],
name: json['name'],
description: json['description'],
atkBonus: json['atkBonus'] ?? 0,
hpBonus: json['hpBonus'] ?? 0,
armorBonus: json['armorBonus'] ?? 0,
atkBonus: json['atkBonus'] ?? json['baseAtk'] ?? 0,
hpBonus: json['hpBonus'] ?? json['baseHp'] ?? 0,
armorBonus: json['armorBonus'] ?? json['baseArmor'] ?? 0,
slot: EquipmentSlot.values.firstWhere((e) => e.name == json['slot']),
effects: effectsList,
price: json['price'] ?? 10,
lib/game/model/effect_event.dart
+2
View File
@@ -3,12 +3,14 @@ import '../enums.dart';
enum EffectTarget { player, enemy }
class EffectEvent {
final String id;
final ActionType type; // attack, defend
final RiskLevel risk;
final EffectTarget target; // 이펙트가 표시될 위치의 대상
final BattleFeedbackType? feedbackType; // 새로운 피드백 타입
EffectEvent({
required this.id,
required this.type,
required this.risk,
required this.target,
lib/providers/battle_provider.dart
+32 -1
View File
@@ -243,7 +243,7 @@ class BattleProvider with ChangeNotifier {
/// Handle player's action choice
void playerAction(ActionType type, RiskLevel risk) {
Future<void> playerAction(ActionType type, RiskLevel risk) async {
if (!isPlayerTurn || player.isDead || enemy.isDead || showRewardPopup)
return;
@@ -303,8 +303,12 @@ class BattleProvider with ChangeNotifier {
if (type == ActionType.attack) {
int damage = (player.totalAtk * efficiency).toInt();
final eventId =
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString();
_effectEventController.sink.add(
EffectEvent(
id: eventId,
type: ActionType.attack,
risk: risk,
target: EffectTarget.enemy,
@@ -312,6 +316,15 @@ class BattleProvider with ChangeNotifier {
),
);
// Animation Delays to sync with Impact
if (risk == RiskLevel.safe) {
await Future.delayed(const Duration(milliseconds: 500));
} else if (risk == RiskLevel.normal) {
await Future.delayed(const Duration(milliseconds: 400));
} else if (risk == RiskLevel.risky) {
await Future.delayed(const Duration(milliseconds: 1100));
}
int damageToHp = 0;
if (enemy.armor > 0) {
if (enemy.armor >= damage) {
@@ -339,6 +352,9 @@ class BattleProvider with ChangeNotifier {
} else {
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: ActionType.defend,
risk: risk,
target: EffectTarget.player,
@@ -355,6 +371,9 @@ class BattleProvider with ChangeNotifier {
_addLog("Player's attack missed!");
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: type,
risk: risk,
target: EffectTarget.enemy, // 공격 실패는 적 위치에 MISS
@@ -365,6 +384,9 @@ class BattleProvider with ChangeNotifier {
_addLog("Player's defense failed!");
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: type,
risk: risk,
target: EffectTarget.player, // 방어 실패는 내 위치에 FAILED
@@ -429,6 +451,9 @@ class BattleProvider with ChangeNotifier {
if (intent.isSuccess) {
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: ActionType.attack,
risk: intent.risk,
target: EffectTarget.player,
@@ -465,6 +490,9 @@ class BattleProvider with ChangeNotifier {
_addLog("Enemy's ${intent.risk.name} attack missed!");
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: ActionType.attack, // 적의 공격이므로 ActionType.attack
risk: intent.risk,
target: EffectTarget.player, // 플레이어가 회피했으므로 플레이어 위치에 이펙트
@@ -777,6 +805,9 @@ class BattleProvider with ChangeNotifier {
_addLog("Enemy prepares defense! (+$armor Armor)");
_effectEventController.sink.add(
EffectEvent(
id:
DateTime.now().millisecondsSinceEpoch.toString() +
Random().nextInt(1000).toString(),
type: ActionType.defend,
risk: risk,
target: EffectTarget.enemy,
lib/screens/battle_screen.dart
+372 -305
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/battle_provider.dart';
@@ -13,7 +14,11 @@ import '../widgets/battle/character_status_card.dart';
import '../widgets/battle/battle_log_overlay.dart';
import '../widgets/battle/floating_battle_texts.dart';
import '../widgets/battle/stage_ui.dart';
import '../widgets/battle/shake_widget.dart';
import '../widgets/battle/battle_animation_widget.dart';
import '../widgets/battle/explosion_widget.dart';
import 'main_menu_screen.dart';
import '../game/config/battle_config.dart';
class BattleScreen extends StatefulWidget {
const BattleScreen({super.key});
@@ -31,7 +36,13 @@ class _BattleScreenState extends State<BattleScreen> {
final GlobalKey _playerKey = GlobalKey();
final GlobalKey _enemyKey = GlobalKey();
final GlobalKey _stackKey = GlobalKey();
final GlobalKey<ShakeWidgetState> _shakeKey = GlobalKey<ShakeWidgetState>();
final GlobalKey<BattleAnimationWidgetState> _playerAnimKey =
GlobalKey<BattleAnimationWidgetState>();
final GlobalKey<ExplosionWidgetState> _explosionKey =
GlobalKey<ExplosionWidgetState>();
bool _showLogs = true;
bool _isPlayerAttacking = false; // Player Attack Animation State
@override
void initState() {
@@ -104,7 +115,17 @@ class _BattleScreenState extends State<BattleScreen> {
});
}
final Set<String> _processedEffectIds = {};
void _addFloatingEffect(EffectEvent event) {
if (_processedEffectIds.contains(event.id)) {
return;
}
_processedEffectIds.add(event.id);
if (_processedEffectIds.length > 20) {
_processedEffectIds.remove(_processedEffectIds.first);
}
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
@@ -130,40 +151,78 @@ class _BattleScreenState extends State<BattleScreen> {
position +
Offset(renderBox.size.width / 2 - 30, renderBox.size.height / 2 - 30);
// feedbackType이 존재하면 해당 텍스트를 표시하고 기존 이펙트 아이콘은 건너뜜
if (event.feedbackType != null) {
String feedbackText;
Color feedbackColor;
switch (event.feedbackType) {
case BattleFeedbackType.miss:
feedbackText = "MISS";
feedbackColor = Colors.grey;
break;
case BattleFeedbackType.failed:
feedbackText = "FAILED";
feedbackColor = Colors.redAccent;
break;
default:
feedbackText = ""; // Should not happen with current enums
feedbackColor = Colors.white;
// 0. Prepare Effect Function
void showEffect() {
if (!mounted) return;
// feedbackType이 존재하면 해당 텍스트를 표시하고 기존 이펙트 아이콘은 건너뜜
if (event.feedbackType != null) {
String feedbackText;
Color feedbackColor;
switch (event.feedbackType) {
case BattleFeedbackType.miss:
feedbackText = "MISS";
feedbackColor = Colors.grey;
break;
case BattleFeedbackType.failed:
feedbackText = "FAILED";
feedbackColor = Colors.redAccent;
break;
default:
feedbackText = ""; // Should not happen with current enums
feedbackColor = Colors.white;
}
final String id = UniqueKey().toString();
setState(() {
_floatingFeedbackTexts.add(
FeedbackTextData(
id: id,
widget: Positioned(
left: position.dx,
top: position.dy,
child: FloatingFeedbackText(
key: ValueKey(id),
feedback: feedbackText,
color: feedbackColor,
onRemove: () {
if (mounted) {
setState(() {
_floatingFeedbackTexts.removeWhere((e) => e.id == id);
});
}
},
),
),
),
);
});
return; // feedbackType이 있으면 아이콘 이펙트는 표시하지 않음
}
// Use BattleConfig for Icon, Color, and Size
IconData icon = BattleConfig.getIcon(event.type);
Color color = BattleConfig.getColor(event.type, event.risk);
double size = BattleConfig.getSize(event.risk);
final String id = UniqueKey().toString();
setState(() {
_floatingFeedbackTexts.add(
FeedbackTextData(
_floatingEffects.add(
FloatingEffectData(
id: id,
widget: Positioned(
left: position.dx,
top: position.dy,
child: FloatingFeedbackText(
child: FloatingEffect(
key: ValueKey(id),
feedback: feedbackText,
color: feedbackColor,
icon: icon,
color: color,
size: size,
onRemove: () {
if (mounted) {
setState(() {
_floatingFeedbackTexts.removeWhere((e) => e.id == id);
_floatingEffects.removeWhere((e) => e.id == id);
});
}
},
@@ -172,67 +231,63 @@ class _BattleScreenState extends State<BattleScreen> {
),
);
});
return; // feedbackType이 있으면 아이콘 이펙트는 표시하지 않음
}
IconData icon;
Color color;
double size;
// 1. Attack Animation Trigger (All Risk Levels)
if (event.type == ActionType.attack &&
event.target == EffectTarget.enemy &&
event.feedbackType == null) {
// Calculate target position (Enemy) relative to Player
final RenderBox? playerBox =
_playerKey.currentContext?.findRenderObject() as RenderBox?;
final RenderBox? enemyBox =
_enemyKey.currentContext?.findRenderObject() as RenderBox?;
if (event.type == ActionType.attack) {
if (event.risk == RiskLevel.risky) {
icon = Icons.whatshot;
color = Colors.redAccent;
size = 60.0;
} else if (event.risk == RiskLevel.normal) {
icon = Icons.flash_on;
color = Colors.orangeAccent;
size = 40.0;
} else {
icon = Icons.close;
color = Colors.grey;
size = 30.0;
if (playerBox != null && enemyBox != null) {
final playerPos = playerBox.localToGlobal(Offset.zero);
final enemyPos = enemyBox.localToGlobal(Offset.zero);
final offset = enemyPos - playerPos;
// Start Animation: Hide Stats
setState(() {
_isPlayerAttacking = true;
});
_playerAnimKey.currentState
?.animateAttack(offset, () {
showEffect(); // Show Effect at Impact!
// Shake and Explosion ONLY for Risky
if (event.risk == RiskLevel.risky) {
_shakeKey.currentState?.shake();
RenderBox? stackBox =
_stackKey.currentContext?.findRenderObject()
as RenderBox?;
if (stackBox != null) {
Offset localEnemyPos = stackBox.globalToLocal(enemyPos);
// Center of the enemy card roughly
localEnemyPos += Offset(
enemyBox.size.width / 2,
enemyBox.size.height / 2,
);
_explosionKey.currentState?.explode(localEnemyPos);
}
}
}, event.risk)
.then((_) {
// End Animation: Show Stats
if (mounted) {
setState(() {
_isPlayerAttacking = false;
});
}
});
}
} else {
icon = Icons.shield;
if (event.risk == RiskLevel.risky) {
color = Colors.deepPurpleAccent;
size = 60.0;
} else if (event.risk == RiskLevel.normal) {
color = Colors.blueAccent;
size = 40.0;
} else {
color = Colors.greenAccent;
size = 30.0;
}
// Not a player attack, show immediately
showEffect();
}
final String id = UniqueKey().toString();
setState(() {
_floatingEffects.add(
FloatingEffectData(
id: id,
widget: Positioned(
left: position.dx,
top: position.dy,
child: FloatingEffect(
key: ValueKey(id),
icon: icon,
color: color,
size: size,
onRemove: () {
if (mounted) {
setState(() {
_floatingEffects.removeWhere((e) => e.id == id);
});
}
},
),
),
),
);
});
});
}
@@ -330,254 +385,265 @@ class _BattleScreenState extends State<BattleScreen> {
return RestUI(battleProvider: battleProvider);
}
return Stack(
key: _stackKey,
children: [
// 1. Background (Black)
Container(color: Colors.black87),
return ShakeWidget(
key: _shakeKey,
child: Stack(
key: _stackKey,
children: [
// 1. Background (Black)
Container(color: Colors.black87),
// 2. Battle Content (Top Bar + Characters)
Column(
children: [
// Top Bar
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Stage ${battleProvider.stage}",
style: const TextStyle(
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
// 2. Battle Content (Top Bar + Characters)
Column(
children: [
// Top Bar
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Stage ${battleProvider.stage}",
style: const TextStyle(
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
),
),
),
Flexible(
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Turn ${battleProvider.turnCount}",
style: const TextStyle(
color: Colors.white,
fontSize: 18,
Flexible(
child: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Turn ${battleProvider.turnCount}",
style: const TextStyle(
color: Colors.white,
fontSize: 18,
),
),
),
),
],
),
),
// Battle Area (Characters) - Expanded to fill available space
Expanded(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Stack(
children: [
// Enemy (Top Right)
Positioned(
top: 0,
right: 0,
child: CharacterStatusCard(
character: battleProvider.enemy,
isPlayer: false,
isTurn: !battleProvider.isPlayerTurn,
key: _enemyKey,
),
),
// Player (Bottom Left)
Positioned(
bottom: 80, // Space for FABs
left: 0,
child: CharacterStatusCard(
character: battleProvider.player,
isPlayer: true,
isTurn: battleProvider.isPlayerTurn,
key: _playerKey,
animationKey: _playerAnimKey,
hideStats: _isPlayerAttacking,
),
),
],
),
],
),
),
],
),
// 3. Logs Overlay
if (_showLogs && battleProvider.logs.isNotEmpty)
Positioned(
top: 60,
left: 16,
right: 16,
height: 150,
child: BattleLogOverlay(logs: battleProvider.logs),
),
// 4. Floating Action Buttons (Bottom Right)
Positioned(
bottom: 20,
right: 20,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
_buildFloatingActionButton(
context,
"ATK",
Icons.whatshot,
Colors.redAccent,
ActionType.attack,
battleProvider.isPlayerTurn &&
!battleProvider.player.isDead &&
!battleProvider.enemy.isDead &&
!battleProvider.showRewardPopup,
),
const SizedBox(height: 16),
_buildFloatingActionButton(
context,
"DEF",
Icons.shield,
Colors.blueAccent,
ActionType.defend,
battleProvider.isPlayerTurn &&
!battleProvider.player.isDead &&
!battleProvider.enemy.isDead &&
!battleProvider.showRewardPopup,
),
],
),
),
// 5. Log Toggle Button (Bottom Left)
Positioned(
bottom: 20,
left: 20,
child: FloatingActionButton(
heroTag: "logToggle",
mini: true,
backgroundColor: Colors.grey[800],
onPressed: () {
setState(() {
_showLogs = !_showLogs;
});
},
child: Icon(
_showLogs ? Icons.visibility_off : Icons.visibility,
color: Colors.white,
),
),
),
// Reward Popup
if (battleProvider.showRewardPopup)
Container(
color: Colors.black54,
child: Center(
child: SimpleDialog(
title: const Text("Victory! Choose a Reward"),
children: battleProvider.rewardOptions.map((item) {
return SimpleDialogOption(
onPressed: () {
battleProvider.selectReward(item);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.blueGrey[700],
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.grey),
),
child: Icon(
ItemUtils.getIcon(item.slot),
color: ItemUtils.getColor(item.slot),
size: 24,
),
),
const SizedBox(width: 12),
Text(
item.name,
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 16,
),
),
],
),
_buildItemStatText(item),
Text(
item.description,
style: const TextStyle(
fontSize: 12,
color: Colors.grey,
),
),
],
),
);
}).toList(),
),
),
),
// Battle Area (Characters) - Expanded to fill available space
Expanded(
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Stack(
// Floating Effects
..._floatingDamageTexts.map((e) => e.widget),
..._floatingEffects.map((e) => e.widget),
..._floatingFeedbackTexts.map((e) => e.widget),
// Explosion Layer
ExplosionWidget(key: _explosionKey),
// Game Over Overlay
if (battleProvider.player.isDead)
Container(
color: Colors.black87,
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// Enemy (Top Right)
Positioned(
top: 0,
right: 0,
child: CharacterStatusCard(
character: battleProvider.enemy,
isPlayer: false,
isTurn: !battleProvider.isPlayerTurn,
key: _enemyKey,
const Text(
"DEFEAT",
style: TextStyle(
color: Colors.red,
fontSize: 48,
fontWeight: FontWeight.bold,
letterSpacing: 4.0,
),
),
// Player (Bottom Left)
Positioned(
bottom: 80, // Space for FABs
left: 0,
child: CharacterStatusCard(
character: battleProvider.player,
isPlayer: true,
isTurn: battleProvider.isPlayerTurn,
key: _playerKey,
const SizedBox(height: 32),
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[800],
padding: const EdgeInsets.symmetric(
horizontal: 32,
vertical: 16,
),
),
onPressed: () {
Navigator.of(context).pushAndRemoveUntil(
MaterialPageRoute(
builder: (context) => const MainMenuScreen(),
),
(route) => false,
);
},
child: const Text(
"Return to Main Menu",
style: TextStyle(
color: Colors.white,
fontSize: 18,
),
),
),
],
),
),
),
],
),
// 3. Logs Overlay
if (_showLogs && battleProvider.logs.isNotEmpty)
Positioned(
top: 60,
left: 16,
right: 16,
height: 150,
child: BattleLogOverlay(logs: battleProvider.logs),
),
// 4. Floating Action Buttons (Bottom Right)
Positioned(
bottom: 20,
right: 20,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
_buildFloatingActionButton(
context,
"ATK",
Icons.whatshot,
Colors.redAccent,
ActionType.attack,
battleProvider.isPlayerTurn &&
!battleProvider.player.isDead &&
!battleProvider.enemy.isDead &&
!battleProvider.showRewardPopup,
),
const SizedBox(height: 16),
_buildFloatingActionButton(
context,
"DEF",
Icons.shield,
Colors.blueAccent,
ActionType.defend,
battleProvider.isPlayerTurn &&
!battleProvider.player.isDead &&
!battleProvider.enemy.isDead &&
!battleProvider.showRewardPopup,
),
],
),
),
// 5. Log Toggle Button (Bottom Left)
Positioned(
bottom: 20,
left: 20,
child: FloatingActionButton(
heroTag: "logToggle",
mini: true,
backgroundColor: Colors.grey[800],
onPressed: () {
setState(() {
_showLogs = !_showLogs;
});
},
child: Icon(
_showLogs ? Icons.visibility_off : Icons.visibility,
color: Colors.white,
),
),
),
// Reward Popup
if (battleProvider.showRewardPopup)
Container(
color: Colors.black54,
child: Center(
child: SimpleDialog(
title: const Text("Victory! Choose a Reward"),
children: battleProvider.rewardOptions.map((item) {
return SimpleDialogOption(
onPressed: () {
battleProvider.selectReward(item);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.blueGrey[700],
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.grey),
),
child: Icon(
ItemUtils.getIcon(item.slot),
color: ItemUtils.getColor(item.slot),
size: 24,
),
),
const SizedBox(width: 12),
Text(
item.name,
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 16,
),
),
],
),
_buildItemStatText(item),
Text(
item.description,
style: const TextStyle(
fontSize: 12,
color: Colors.grey,
),
),
],
),
);
}).toList(),
),
),
),
// Floating Effects
..._floatingDamageTexts.map((e) => e.widget),
..._floatingEffects.map((e) => e.widget),
..._floatingFeedbackTexts.map((e) => e.widget),
// Game Over Overlay
if (battleProvider.player.isDead)
Container(
color: Colors.black87,
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Text(
"DEFEAT",
style: TextStyle(
color: Colors.red,
fontSize: 48,
fontWeight: FontWeight.bold,
letterSpacing: 4.0,
),
),
const SizedBox(height: 32),
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey[800],
padding: const EdgeInsets.symmetric(
horizontal: 32,
vertical: 16,
),
),
onPressed: () {
Navigator.of(context).pushAndRemoveUntil(
MaterialPageRoute(
builder: (context) => const MainMenuScreen(),
),
(route) => false,
);
},
child: const Text(
"Return to Main Menu",
style: TextStyle(color: Colors.white, fontSize: 18),
),
),
],
),
),
),
],
],
),
);
},
),
@@ -589,6 +655,7 @@ class _BattleScreenState extends State<BattleScreen> {
if (item.atkBonus > 0) stats.add("+${item.atkBonus} ATK");
if (item.hpBonus > 0) stats.add("+${item.hpBonus} HP");
if (item.armorBonus > 0) stats.add("+${item.armorBonus} DEF");
if (item.luck > 0) stats.add("+${item.luck} Luck");
List<String> effectTexts = item.effects.map((e) => e.description).toList();
lib/screens/inventory_screen.dart
+5
View File
@@ -460,6 +460,11 @@ class InventoryScreen extends StatelessWidget {
_buildStatChangeRow("Current HP", currentHp, newHp),
_buildStatChangeRow("ATK", currentAtk, newAtk),
_buildStatChangeRow("DEF", currentDef, newDef),
_buildStatChangeRow(
"LUCK",
player.totalLuck,
player.totalLuck - (oldItem?.luck ?? 0) + newItem.luck,
),
],
),
actions: [
lib/widgets/battle/battle_animation_widget.dart
+123
View File
@@ -0,0 +1,123 @@
import 'package:flutter/material.dart';
import '../../game/enums.dart';
class BattleAnimationWidget extends StatefulWidget {
final Widget child;
const BattleAnimationWidget({super.key, required this.child});
@override
BattleAnimationWidgetState createState() => BattleAnimationWidgetState();
}
class BattleAnimationWidgetState extends State<BattleAnimationWidget>
with TickerProviderStateMixin {
late AnimationController _scaleController;
late AnimationController _translateController;
late Animation<double> _scaleAnimation;
late Animation<Offset> _translateAnimation;
@override
void initState() {
super.initState();
_scaleController = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 800),
);
_translateController = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 1000),
);
_scaleAnimation = Tween<double>(
begin: 1.0,
end: 1.2,
).animate(CurvedAnimation(parent: _scaleController, curve: Curves.easeOut));
// Default translation, will be updated on animateAttack
_translateAnimation = Tween<Offset>(
begin: Offset.zero,
end: Offset.zero,
).animate(_translateController);
}
@override
void dispose() {
_scaleController.dispose();
_translateController.dispose();
super.dispose();
}
Future<void> animateAttack(
Offset targetOffset,
VoidCallback onImpact,
RiskLevel risk,
) async {
if (risk == RiskLevel.safe || risk == RiskLevel.normal) {
// Safe & Normal: Dash/Wobble without scale
final isSafe = risk == RiskLevel.safe;
final duration = isSafe ? 500 : 400;
final offsetFactor = isSafe ? 0.2 : 0.5;
_translateController.duration = Duration(milliseconds: duration);
_translateAnimation =
Tween<Offset>(
begin: Offset.zero,
end: targetOffset * offsetFactor,
).animate(
CurvedAnimation(
parent: _translateController,
curve: Curves.easeOutQuad,
),
);
await _translateController.forward();
if (!mounted) return;
onImpact();
await _translateController.reverse();
} else {
// Risky: Scale + Heavy Dash
_scaleController.duration = const Duration(milliseconds: 600);
_translateController.duration = const Duration(milliseconds: 500);
// 1. Scale Up (Preparation)
await _scaleController.forward();
if (!mounted) return;
// 2. Dash to Target (Impact)
_translateAnimation = Tween<Offset>(begin: Offset.zero, end: targetOffset)
.animate(
CurvedAnimation(
parent: _translateController,
curve: Curves.easeInExpo, // Heavy impact curve
),
);
await _translateController.forward();
if (!mounted) return;
// 3. Impact Callback (Shake)
onImpact();
// 4. Return (Reset)
_scaleController.reverse();
_translateController.reverse();
}
}
@override
Widget build(BuildContext context) {
return AnimatedBuilder(
animation: Listenable.merge([_scaleController, _translateController]),
builder: (context, child) {
return Transform.translate(
offset: _translateAnimation.value,
child: Transform.scale(
scale: _scaleAnimation.value,
child: widget.child,
),
);
},
);
}
}
lib/widgets/battle/character_status_card.dart
+98 -75
View File
@@ -3,101 +3,124 @@ import 'package:provider/provider.dart';
import '../../game/model/entity.dart';
import '../../game/enums.dart';
import '../../providers/battle_provider.dart';
import 'battle_animation_widget.dart';
import '../../game/config/theme_config.dart';
import '../../game/config/animation_config.dart';
class CharacterStatusCard extends StatelessWidget {
final Character character;
final bool isPlayer;
final bool isTurn;
final GlobalKey<BattleAnimationWidgetState>? animationKey;
final bool hideStats;
const CharacterStatusCard({
super.key,
required this.character,
this.isPlayer = false,
this.isTurn = false,
this.animationKey,
this.hideStats = false,
});
@override
Widget build(BuildContext context) {
return Column(
children: [
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Armor: ${character.armor}",
style: const TextStyle(color: Colors.white),
AnimatedOpacity(
opacity: hideStats ? 0.0 : 1.0,
duration: AnimationConfig.fadeDuration,
child: Column(
children: [
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"Armor: ${character.armor}",
style: const TextStyle(color: ThemeConfig.textColorWhite),
),
),
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"${character.name}: HP ${character.hp}/${character.totalMaxHp}",
style: TextStyle(
color: character.isDead
? ThemeConfig.statHpEnemyColor
: ThemeConfig.textColorWhite,
fontWeight: FontWeight.bold,
),
),
),
SizedBox(
width: 100,
child: LinearProgressIndicator(
value: character.totalMaxHp > 0
? character.hp / character.totalMaxHp
: 0,
color: !isPlayer
? ThemeConfig.statHpEnemyColor
: ThemeConfig.statHpPlayerColor,
backgroundColor: ThemeConfig.textColorGrey,
),
),
if (character.statusEffects.isNotEmpty)
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Wrap(
spacing: 4.0,
children: character.statusEffects.map((effect) {
return Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: ThemeConfig.effectBg,
borderRadius: BorderRadius.circular(4),
),
child: Text(
"${effect.type.name.toUpperCase()} (${effect.duration})",
style: const TextStyle(
color: ThemeConfig.effectText,
fontSize: 10,
fontWeight: FontWeight.bold,
),
),
);
}).toList(),
),
),
Text("ATK: ${character.totalAtk}"),
Text("DEF: ${character.totalDefense}"),
Text("LUCK: ${character.totalLuck}"),
],
),
),
FittedBox(
fit: BoxFit.scaleDown,
child: Text(
"${character.name}: HP ${character.hp}/${character.totalMaxHp}",
style: TextStyle(
color: character.isDead ? Colors.red : Colors.white,
fontWeight: FontWeight.bold,
),
),
),
SizedBox(
width: 100,
child: LinearProgressIndicator(
value: character.totalMaxHp > 0
? character.hp / character.totalMaxHp
: 0,
color: !isPlayer ? Colors.red : Colors.green,
backgroundColor: Colors.grey,
),
),
if (character.statusEffects.isNotEmpty)
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Wrap(
spacing: 4.0,
children: character.statusEffects.map((effect) {
return Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: Colors.deepOrange,
borderRadius: BorderRadius.circular(4),
),
child: Text(
"${effect.type.name.toUpperCase()} (${effect.duration})",
style: const TextStyle(
color: Colors.white,
fontSize: 10,
fontWeight: FontWeight.bold,
),
),
);
}).toList(),
),
),
Text("ATK: ${character.totalAtk}"),
Text("DEF: ${character.totalDefense}"),
// 캐릭터 아이콘/이미지 영역 추가
Container(
width: 100, // 임시 크기
height: 100, // 임시 크기
decoration: BoxDecoration(
color: isPlayer
? Colors.lightBlue
: Colors.deepOrange, // 플레이어/적 구분 색상
borderRadius: BorderRadius.circular(8),
),
child: Center(
child: isPlayer
? const Icon(
Icons.person,
size: 60,
color: Colors.white,
) // 플레이어 아이콘
: const Icon(
Icons.psychology,
size: 60,
color: Colors.white,
), // 적 아이콘 (몬스터 대신)
BattleAnimationWidget(
key: animationKey,
child: Container(
width: 100, // 임시 크기
height: 100, // 임시 크기
decoration: BoxDecoration(
color: isPlayer
? Colors.lightBlue
: Colors.deepOrange, // 플레이어/적 구분 색상
borderRadius: BorderRadius.circular(8),
),
child: Center(
child: isPlayer
? const Icon(
Icons.person,
size: 60,
color: ThemeConfig.textColorWhite,
) // 플레이어 아이콘
: const Icon(
Icons.psychology,
size: 60,
color: ThemeConfig.textColorWhite,
), // 적 아이콘 (몬스터 대신)
),
),
),
const SizedBox(height: 8), // 아이콘과 정보 사이 간격
lib/widgets/battle/explosion_widget.dart
+141
View File
@@ -0,0 +1,141 @@
import 'dart:math';
import 'package:flutter/material.dart';
class Particle {
Offset position;
Offset velocity;
Color color;
double size;
double life; // 1.0 to 0.0
double decay;
Particle({
required this.position,
required this.velocity,
required this.color,
required this.size,
required this.life,
required this.decay,
});
}
class ExplosionWidget extends StatefulWidget {
const ExplosionWidget({super.key});
@override
ExplosionWidgetState createState() => ExplosionWidgetState();
}
class ExplosionWidgetState extends State<ExplosionWidget>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
final List<Particle> _particles = [];
final Random _random = Random();
@override
void initState() {
super.initState();
_controller = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 1000),
);
_controller.addListener(_updateParticles);
}
@override
void dispose() {
_controller.removeListener(_updateParticles);
_controller.dispose();
super.dispose();
}
void _updateParticles() {
if (_particles.isEmpty) return;
for (var i = _particles.length - 1; i >= 0; i--) {
final p = _particles[i];
p.position += p.velocity;
p.velocity += Offset(0, 0.5); // Gravity
p.life -= p.decay;
if (p.life <= 0) {
_particles.removeAt(i);
}
}
if (_particles.isEmpty) {
_controller.stop();
}
setState(() {});
}
void explode(Offset position) {
// Clear old particles if any (optional, or just add more)
// _particles.clear();
// Create new particles
for (int i = 0; i < 30; i++) {
final double angle = _random.nextDouble() * 2 * pi;
final double speed = _random.nextDouble() * 5 + 2;
final double dx = cos(angle) * speed;
final double dy = sin(angle) * speed;
// Random colors for fire/explosion effect
Color color;
final r = _random.nextDouble();
if (r < 0.33) {
color = Colors.redAccent;
} else if (r < 0.66) {
color = Colors.orangeAccent;
} else {
color = Colors.yellowAccent;
}
_particles.add(
Particle(
position: position,
velocity: Offset(dx, dy),
color: color,
size: _random.nextDouble() * 4 + 2,
life: 1.0,
decay: _random.nextDouble() * 0.02 + 0.01,
),
);
}
if (!_controller.isAnimating) {
_controller.repeat(); // Use repeat to keep loop running until empty
}
}
@override
Widget build(BuildContext context) {
return IgnorePointer(
child: CustomPaint(
painter: ExplosionPainter(_particles),
size: Size.infinite,
),
);
}
}
class ExplosionPainter extends CustomPainter {
final List<Particle> particles;
ExplosionPainter(this.particles);
@override
void paint(Canvas canvas, Size size) {
for (final p in particles) {
final paint = Paint()
..color = p.color.withOpacity(p.life.clamp(0.0, 1.0))
..style = PaintingStyle.fill;
canvas.drawCircle(p.position, p.size, paint);
}
}
@override
bool shouldRepaint(covariant ExplosionPainter oldDelegate) {
return true; // Always repaint when animating
}
}
lib/widgets/battle/floating_battle_texts.dart
+34 -17
View File
@@ -1,5 +1,8 @@
import 'package:flutter/material.dart';
import '../../game/config/theme_config.dart';
import '../../game/config/animation_config.dart';
class FloatingDamageText extends StatefulWidget {
final String damage;
final Color color;
@@ -26,14 +29,20 @@ class FloatingDamageTextState extends State<FloatingDamageText>
void initState() {
super.initState();
_controller = AnimationController(
duration: const Duration(milliseconds: 1000),
duration: AnimationConfig.floatingTextDuration,
vsync: this,
);
_offsetAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.0),
end: const Offset(0.0, -1.5),
).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOut));
_offsetAnimation =
Tween<Offset>(
begin: const Offset(0.0, 0.0),
end: const Offset(0.0, -1.5),
).animate(
CurvedAnimation(
parent: _controller,
curve: AnimationConfig.floatingTextCurve,
),
);
_opacityAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
CurvedAnimation(
@@ -75,7 +84,7 @@ class FloatingDamageTextState extends State<FloatingDamageText>
shadows: const [
Shadow(
blurRadius: 2.0,
color: Colors.black,
color: ThemeConfig.feedbackShadow,
offset: Offset(1.0, 1.0),
),
],
@@ -124,14 +133,16 @@ class FloatingEffectState extends State<FloatingEffect>
void initState() {
super.initState();
_controller = AnimationController(
duration: const Duration(milliseconds: 800),
duration: AnimationConfig.floatingEffectDuration,
vsync: this,
);
_scaleAnimation = Tween<double>(
begin: 0.5,
end: 1.5,
).animate(CurvedAnimation(parent: _controller, curve: Curves.elasticOut));
_scaleAnimation = Tween<double>(begin: 0.5, end: 1.5).animate(
CurvedAnimation(
parent: _controller,
curve: AnimationConfig.floatingEffectScaleCurve,
),
);
_opacityAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
CurvedAnimation(
@@ -203,14 +214,20 @@ class FloatingFeedbackTextState extends State<FloatingFeedbackText>
void initState() {
super.initState();
_controller = AnimationController(
duration: const Duration(milliseconds: 1000),
duration: AnimationConfig.floatingTextDuration,
vsync: this,
);
_offsetAnimation = Tween<Offset>(
begin: const Offset(0.0, 0.0),
end: const Offset(0.0, -1.5),
).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOut));
_offsetAnimation =
Tween<Offset>(
begin: const Offset(0.0, 0.0),
end: const Offset(0.0, -1.5),
).animate(
CurvedAnimation(
parent: _controller,
curve: AnimationConfig.floatingTextCurve,
),
);
_opacityAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
CurvedAnimation(
@@ -252,7 +269,7 @@ class FloatingFeedbackTextState extends State<FloatingFeedbackText>
shadows: const [
Shadow(
blurRadius: 2.0,
color: Colors.black,
color: ThemeConfig.feedbackShadow,
offset: Offset(1.0, 1.0),
),
],
lib/widgets/battle/shake_widget.dart
+63
View File
@@ -0,0 +1,63 @@
import 'dart:math';
import 'package:flutter/material.dart';
class ShakeWidget extends StatefulWidget {
final Widget child;
final double shakeOffset;
final int shakeCount;
final Duration duration;
const ShakeWidget({
super.key,
required this.child,
this.shakeOffset = 10.0,
this.shakeCount = 3,
this.duration = const Duration(milliseconds: 400),
});
@override
ShakeWidgetState createState() => ShakeWidgetState();
}
class ShakeWidgetState extends State<ShakeWidget>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
@override
void initState() {
super.initState();
_controller = AnimationController(vsync: this, duration: widget.duration);
_controller.addStatusListener((status) {
if (status == AnimationStatus.completed) {
_controller.reset();
}
});
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
void shake() {
_controller.forward();
}
@override
Widget build(BuildContext context) {
return AnimatedBuilder(
animation: _controller,
builder: (context, child) {
final double sineValue = sin(
widget.shakeCount * 2 * pi * _controller.value,
);
return Transform.translate(
offset: Offset(sineValue * widget.shakeOffset, 0),
child: child,
);
},
child: widget.child,
);
}
}