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

update

Browse Source
This commit is contained in:
horoli
2026-02-04 01:44:38 +09:00
parent e020e44d8f
commit 3b9fa47f0a
7 changed files with 126 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/widgets/battle/battle_controls.dart
+14 -41
View File
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import '../../game/config.dart';
import '../common/custom_icon_button.dart';
class BattleControls extends StatelessWidget {
final bool isAttackEnabled;
@@ -18,57 +18,30 @@ class BattleControls extends StatelessWidget {
required this.onItemPressed, // New
});
Widget _buildFloatingActionButton({
required String label,
required Color color,
required String iconPath, // Changed from ActionType to String
required bool isEnabled,
required VoidCallback onPressed,
}) {
return FloatingActionButton(
heroTag: label,
onPressed: isEnabled ? onPressed : null,
backgroundColor: isEnabled ? color : ThemeConfig.btnDisabled,
child: Image.asset(
iconPath,
width: 32,
height: 32,
color: ThemeConfig.textColorWhite, // Tint icon white
fit: BoxFit.contain,
filterQuality: FilterQuality.high,
),
);
}
@override
Widget build(BuildContext context) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
_buildFloatingActionButton(
label: "ATK",
color: ThemeConfig.btnActionActive,
iconPath: 'assets/data/icon/icon_weapon.png',
CustomIconButton(
iconPath: 'assets/images/icons/weapons/sword_02.png',
isEnabled: isAttackEnabled,
onPressed: onAttackPressed,
onTap: onAttackPressed,
iconColor: Colors.white,
),
const SizedBox(height: 16),
_buildFloatingActionButton(
label: "DEF",
color: ThemeConfig.btnDefendActive,
iconPath: 'assets/data/icon/icon_shield.png',
CustomIconButton(
iconPath: 'assets/images/icons/subweapons/shield_01.png',
isEnabled: isDefendEnabled,
onPressed: onDefendPressed,
onTap: onDefendPressed,
iconColor: Colors.white,
),
const SizedBox(height: 16),
_buildFloatingActionButton(
label: "ITEM",
color: Colors.indigoAccent, // Distinct color for Item
iconPath:
'assets/data/icon/icon_accessory.png', // Placeholder for Bag
isEnabled:
isAttackEnabled, // Enabled when it's player turn (same as attack)
onPressed: onItemPressed,
CustomIconButton(
iconPath: 'assets/images/icons/potions/potion_blue.png',
isEnabled: isAttackEnabled, // Enabled when it's player turn
onTap: onItemPressed,
iconColor: Colors.white,
),
],
);
lib/widgets/common/item_card_widget.dart
+59 -37
View File
@@ -24,7 +24,7 @@ class ItemCardWidget extends StatelessWidget {
onTap: onTap,
child: Card(
color: ThemeConfig.shopItemCardBg, // Configurable if needed
shape: item.rarity != ItemRarity.magic
shape: item.rarity != ItemRarity.normal
? RoundedRectangleBorder(
side: BorderSide(
color: ItemUtils.getRarityColor(item.rarity),
@@ -33,44 +33,66 @@ class ItemCardWidget extends StatelessWidget {
borderRadius: BorderRadius.circular(8.0),
)
: null,
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(
child: Image.asset(
ItemUtils.getIconPath(item.slot),
fit: BoxFit.contain,
child: Stack(
fit: StackFit.expand,
children: [
// Background Watermark/Silhouette Icon (Top-Left)
Positioned(
left: 8,
top: 8,
child: Image.asset(
ItemUtils.getIconPath(item.slot),
width: 32,
height: 32,
fit: BoxFit.contain,
color: Colors.black12, // Shadow silhouette
),
),
// Main Content (Centered)
Center(
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const SizedBox(height: 12),
Text(
item.name,
maxLines: 1,
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: FontWeight.bold,
color: ItemUtils.getRarityColor(item.rarity),
fontSize: 12,
),
),
const SizedBox(height: 4),
// Show Item Stats
FittedBox(
fit: BoxFit.scaleDown,
child: _buildItemStatText(item),
),
if (showPrice) ...[
const SizedBox(height: 4),
Text(
"${item.price} G",
textAlign: TextAlign.center,
style: TextStyle(
color: canBuy
? ThemeConfig.statGoldColor
: ThemeConfig.textColorGrey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
],
],
),
),
Text(
item.name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: FontWeight.bold,
color: ItemUtils.getRarityColor(item.rarity),
fontSize: 12,
),
),
// Show Item Stats (Fixed to show negative values)
FittedBox(fit: BoxFit.scaleDown, child: _buildItemStatText(item)),
if (showPrice) ...[
const Spacer(),
Text(
"${item.price} G",
style: TextStyle(
color: canBuy
? ThemeConfig.statGoldColor
: ThemeConfig.textColorGrey,
fontWeight: FontWeight.bold,
fontSize: 12,
),
),
],
],
),
),
],
),
),
);