update

2025-12-03 01:39:14 +09:00
parent 0e96aa4f7c
commit 36f93ccbcc
16 changed files with 691 additions and 89 deletions
@@ -1,9 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:game_test/game/model/item.dart';
-import 'package:game_test/game/model/stage.dart'; // Import StageModel
 import 'package:provider/provider.dart';
 import '../providers/battle_provider.dart';
 import '../game/model/entity.dart';
+import '../game/enums.dart';
+
+import '../game/model/damage_event.dart';
+import '../game/model/effect_event.dart';
+import 'dart:async'; // StreamSubscription

 class BattleScreen extends StatefulWidget {
  const BattleScreen({super.key});
@@ -14,6 +18,12 @@ class BattleScreen extends StatefulWidget {

 class _BattleScreenState extends State<BattleScreen> {
  final ScrollController _scrollController = ScrollController();
+  final List<_DamageTextData> _floatingDamageTexts = [];
+  final List<_FloatingEffectData> _floatingEffects = [];
+  StreamSubscription<DamageEvent>? _damageSubscription;
+  StreamSubscription<EffectEvent>? _effectSubscription;
+  final GlobalKey _playerKey = GlobalKey();
+  final GlobalKey _enemyKey = GlobalKey();

  @override
  void initState() {
@@ -24,14 +34,163 @@ class _BattleScreenState extends State<BattleScreen> {
        _scrollController.jumpTo(_scrollController.position.maxScrollExtent);
      }
    });
+
+    // Subscribe to Damage Stream
+    final battleProvider = context.read<BattleProvider>();
+    _damageSubscription = battleProvider.damageStream.listen(
+      _addFloatingDamageText,
+    );
+    _effectSubscription = battleProvider.effectStream.listen(
+      _addFloatingEffect,
+    );
  }

  @override
  void dispose() {
    _scrollController.dispose();
+    _damageSubscription?.cancel();
+    _effectSubscription?.cancel();
    super.dispose();
  }

+  void _addFloatingDamageText(DamageEvent event) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+
+      GlobalKey targetKey = event.target == DamageTarget.player
+          ? _playerKey
+          : _enemyKey;
+
+      if (targetKey.currentContext == null) return;
+      RenderBox? renderBox =
+          targetKey.currentContext!.findRenderObject() as RenderBox?;
+      if (renderBox == null) return;
+
+      Offset position = renderBox.localToGlobal(Offset.zero);
+
+      RenderBox? stackRenderBox = context.findRenderObject() as RenderBox?;
+      if (stackRenderBox != null) {
+        Offset stackOffset = stackRenderBox.localToGlobal(Offset.zero);
+        position = position - stackOffset;
+      }
+
+      // 중앙 정렬 보정 및 위쪽으로 이동
+      position = position + Offset(renderBox.size.width / 2 - 20, -20);
+
+      final String id = UniqueKey().toString();
+
+      setState(() {
+        _floatingDamageTexts.add(
+          _DamageTextData(
+            id: id,
+            widget: Positioned(
+              left: position.dx,
+              top: position.dy,
+              child: _FloatingDamageText(
+                key: ValueKey(id),
+                damage: event.damage.toString(),
+                color: event.color,
+                onRemove: () {
+                  if (mounted) {
+                    setState(() {
+                      _floatingDamageTexts.removeWhere((e) => e.id == id);
+                    });
+                  }
+                },
+              ),
+            ),
+          ),
+        );
+      });
+    });
+  }
+
+  void _addFloatingEffect(EffectEvent event) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+
+      GlobalKey targetKey = event.target == EffectTarget.player
+          ? _playerKey
+          : _enemyKey;
+      if (targetKey.currentContext == null) return;
+
+      RenderBox? renderBox =
+          targetKey.currentContext!.findRenderObject() as RenderBox?;
+      if (renderBox == null) return;
+
+      Offset position = renderBox.localToGlobal(Offset.zero);
+      RenderBox? stackRenderBox = context.findRenderObject() as RenderBox?;
+      if (stackRenderBox != null) {
+        Offset stackOffset = stackRenderBox.localToGlobal(Offset.zero);
+        position = position - stackOffset;
+      }
+
+      // 중앙 정렬
+      position =
+          position +
+          Offset(renderBox.size.width / 2 - 30, renderBox.size.height / 2 - 30);
+
+      IconData icon;
+      Color color;
+      double size;
+
+      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;
+        }
+      } 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;
+        }
+      }
+
+      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);
+                    });
+                  }
+                },
+              ),
+            ),
+          ),
+        );
+      });
+    });
+  }
+
  void _showRiskLevelSelection(BuildContext context, ActionType actionType) {
    final player = context.read<BattleProvider>().player;
    final baseValue = actionType == ActionType.attack
@@ -192,10 +351,12 @@ class _BattleScreenState extends State<BattleScreen> {
                        _buildCharacterStatus(
                          battleProvider.enemy,
                          isEnemy: true,
+                          key: _enemyKey,
                        ),
                        _buildCharacterStatus(
                          battleProvider.player,
                          isEnemy: false,
+                          key: _playerKey,
                        ),
                      ],
                    ),
@@ -285,6 +446,8 @@ class _BattleScreenState extends State<BattleScreen> {
                    ),
                  ),
                ),
+              ..._floatingDamageTexts.map((e) => e.widget),
+              ..._floatingEffects.map((e) => e.widget),
            ],
          );
        },
@@ -325,8 +488,13 @@ class _BattleScreenState extends State<BattleScreen> {
    );
  }

-  Widget _buildCharacterStatus(Character character, {bool isEnemy = false}) {
+  Widget _buildCharacterStatus(
+    Character character, {
+    bool isEnemy = false,
+    Key? key,
+  }) {
    return Column(
+      key: key,
      children: [
        Text(
          "${character.name}: HP ${character.hp}/${character.totalMaxHp}",
@@ -454,3 +622,200 @@ class _BattleScreenState extends State<BattleScreen> {
    );
  }
 }
+
+class _FloatingDamageText extends StatefulWidget {
+  final String damage;
+  final Color color;
+  final VoidCallback onRemove;
+
+  const _FloatingDamageText({
+    Key? key,
+    required this.damage,
+    required this.color,
+    required this.onRemove,
+  }) : super(key: key);
+
+  @override
+  __FloatingDamageTextState createState() => __FloatingDamageTextState();
+}
+
+class __FloatingDamageTextState extends State<_FloatingDamageText>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<Offset> _offsetAnimation;
+  late Animation<double> _opacityAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 1000),
+      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));
+
+    _opacityAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(
+          0.5,
+          1.0,
+          curve: Curves.easeOut,
+        ), // 절반 이후부터 투명도 감소
+      ),
+    );
+
+    _controller.forward().then((_) {
+      if (mounted) {
+        widget.onRemove(); // 애니메이션 완료 후 콜백 호출하여 위젯 제거 요청
+        // _controller.dispose(); // 제거: dispose() 메서드에서 처리됨
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _controller,
+      builder: (context, child) {
+        return FractionalTranslation(
+          translation: _offsetAnimation.value,
+          child: Opacity(
+            opacity: _opacityAnimation.value,
+            child: Material(
+              color: Colors.transparent,
+              child: Text(
+                widget.damage,
+                style: TextStyle(
+                  color: widget.color,
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                  shadows: const [
+                    Shadow(
+                      blurRadius: 2.0,
+                      color: Colors.black,
+                      offset: Offset(1.0, 1.0),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _DamageTextData {
+  final String id;
+
+  final Widget widget;
+
+  _DamageTextData({required this.id, required this.widget});
+}
+
+class _FloatingEffect extends StatefulWidget {
+  final IconData icon;
+  final Color color;
+  final double size;
+  final VoidCallback onRemove;
+
+  const _FloatingEffect({
+    Key? key,
+
+    required this.icon,
+
+    required this.color,
+
+    required this.size,
+
+    required this.onRemove,
+  }) : super(key: key);
+
+  @override
+  __FloatingEffectState createState() => __FloatingEffectState();
+}
+
+class __FloatingEffectState extends State<_FloatingEffect>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+
+  late Animation<double> _scaleAnimation;
+
+  late Animation<double> _opacityAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 800),
+
+      vsync: this,
+    );
+
+    _scaleAnimation = Tween<double>(
+      begin: 0.5,
+      end: 1.5,
+    ).animate(CurvedAnimation(parent: _controller, curve: Curves.elasticOut));
+
+    _opacityAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
+      CurvedAnimation(
+        parent: _controller,
+
+        curve: const Interval(0.5, 1.0, curve: Curves.easeOut),
+      ),
+    );
+
+    _controller.forward().then((_) {
+      if (mounted) {
+        widget.onRemove();
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _controller,
+
+      builder: (context, child) {
+        return Transform.scale(
+          scale: _scaleAnimation.value,
+
+          child: Opacity(
+            opacity: _opacityAnimation.value,
+
+            child: Icon(widget.icon, color: widget.color, size: widget.size),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class _FloatingEffectData {
+  final String id;
+
+  final Widget widget;
+
+  _FloatingEffectData({required this.id, required this.widget});
+}
@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/battle_provider.dart';
 import '../game/model/item.dart';
-import '../game/model/entity.dart';
-import '../game/model/stage.dart'; // Import StageModel
+import '../game/enums.dart';

 class InventoryScreen extends StatelessWidget {
  const InventoryScreen({super.key});
@@ -41,8 +40,12 @@ class InventoryScreen extends StatelessWidget {
                          ),
                          _buildStatItem("ATK", "${player.totalAtk}"),
                          _buildStatItem("DEF", "${player.totalDefense}"),
-                          _buildStatItem("Shield", "${player.armor}"), 
-                          _buildStatItem("Gold", "${player.gold} G", color: Colors.amber),
+                          _buildStatItem("Shield", "${player.armor}"),
+                          _buildStatItem(
+                            "Gold",
+                            "${player.gold} G",
+                            color: Colors.amber,
+                          ),
                        ],
                      ),
                    ],
@@ -74,7 +77,11 @@ class InventoryScreen extends StatelessWidget {
                        return Expanded(
                          child: InkWell(
                            onTap: item != null
-                                ? () => _showUnequipConfirmationDialog(context, battleProvider, item)
+                                ? () => _showUnequipConfirmationDialog(
+                                    context,
+                                    battleProvider,
+                                    item,
+                                  )
                                : null,
                            child: Card(
                              color: item != null
@@ -232,8 +239,10 @@ class InventoryScreen extends StatelessWidget {

  /// Shows a menu with actions for the selected item (Equip, Discard, etc.)
  void _showItemActionDialog(
-      BuildContext context, BattleProvider provider, Item item) {
-    
+    BuildContext context,
+    BattleProvider provider,
+    Item item,
+  ) {
    bool isShop = provider.currentStage.type == StageType.shop;

    showDialog(
@@ -546,4 +555,4 @@ class InventoryScreen extends StatelessWidget {
      ],
    );
  }
-}
+}