Skip to content

Commit 7ce7465

Browse files
GlazlkGlazlk
committed
animation logic
1 parent f115785 commit 7ce7465

File tree

6 files changed

+822
-553
lines changed

6 files changed

+822
-553
lines changed

‎src/App.css‎

Lines changed: 77 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -869,12 +869,6 @@ body.modal-open .collection-container-modern {
869869
position: relative !important;
870870
}
871871

872-
873-
874-
875-
876-
877-
878872
.modal {
879873
background: var(--glass-bg);
880874
backdrop-filter: blur(20px);
@@ -6881,7 +6875,9 @@ body.modal-open .collection-container-modern {
68816875
0 0 75px var(--rarity-glow);
68826876
border-color: var(--rarity-color);
68836877
/* Добавляем плавный переход для свечения */
6884-
transition: all 0.3s ease, box-shadow 0.3s ease;
6878+
transition:
6879+
all 0.3s ease,
6880+
box-shadow 0.3s ease;
68856881
}
68866882

68876883
/* Специальные эффекты свечения для разных редкостей при наведении */
@@ -7563,63 +7559,63 @@ body.modal-open .collection-container-modern {
75637559
transform: scale(1.1);
75647560
}
75657561

7566-
.level-up-modal-content {
7567-
padding: 1.5rem;
7568-
}
7569-
7570-
/* Elemental-themed backgrounds */
7571-
.level-up-modal.element-earth .level-up-elemental-info {
7572-
background: rgba(34, 197, 94, 0.2);
7573-
border: 1px solid rgba(34, 197, 94, 0.4);
7574-
border-radius: var(--border-radius-lg);
7575-
padding: 1rem;
7576-
margin-bottom: 1rem;
7577-
}
7578-
7579-
.level-up-modal.element-fire .level-up-elemental-info {
7580-
background: rgba(220, 38, 38, 0.2);
7581-
border: 1px solid rgba(220, 38, 38, 0.4);
7582-
border-radius: var(--border-radius-lg);
7583-
padding: 1rem;
7584-
margin-bottom: 1rem;
7585-
}
7586-
7587-
.level-up-modal.element-water .level-up-elemental-info {
7588-
background: rgba(59, 130, 246, 0.2);
7589-
border: 1px solid rgba(59, 130, 246, 0.4);
7590-
border-radius: var(--border-radius-lg);
7591-
padding: 1rem;
7592-
margin-bottom: 1rem;
7593-
}
7594-
7595-
/* Elemental-themed backgrounds for collectible cards */
7596-
.collectible-card.element-earth .character-name-block {
7597-
background: rgba(34, 197, 94, 0.15);
7598-
border: 1px solid rgba(34, 197, 94, 0.3);
7599-
}
7600-
7601-
.collectible-card.element-fire .character-name-block {
7602-
background: rgba(220, 38, 38, 0.15);
7603-
border: 1px solid rgba(220, 38, 38, 0.3);
7604-
}
7605-
7606-
.collectible-card.element-water .character-name-block {
7607-
background: rgba(59, 130, 246, 0.15);
7608-
border: 1px solid rgba(59, 130, 246, 0.3);
7609-
}
7562+
.level-up-modal-content {
7563+
padding: 1.5rem;
7564+
}
7565+
7566+
/* Elemental-themed backgrounds */
7567+
.level-up-modal.element-earth .level-up-elemental-info {
7568+
background: rgba(34, 197, 94, 0.2);
7569+
border: 1px solid rgba(34, 197, 94, 0.4);
7570+
border-radius: var(--border-radius-lg);
7571+
padding: 1rem;
7572+
margin-bottom: 1rem;
7573+
}
7574+
7575+
.level-up-modal.element-fire .level-up-elemental-info {
7576+
background: rgba(220, 38, 38, 0.2);
7577+
border: 1px solid rgba(220, 38, 38, 0.4);
7578+
border-radius: var(--border-radius-lg);
7579+
padding: 1rem;
7580+
margin-bottom: 1rem;
7581+
}
7582+
7583+
.level-up-modal.element-water .level-up-elemental-info {
7584+
background: rgba(59, 130, 246, 0.2);
7585+
border: 1px solid rgba(59, 130, 246, 0.4);
7586+
border-radius: var(--border-radius-lg);
7587+
padding: 1rem;
7588+
margin-bottom: 1rem;
7589+
}
7590+
7591+
/* Elemental-themed backgrounds for collectible cards */
7592+
.collectible-card.element-earth .character-name-block {
7593+
background: rgba(34, 197, 94, 0.15);
7594+
border: 1px solid rgba(34, 197, 94, 0.3);
7595+
}
7596+
7597+
.collectible-card.element-fire .character-name-block {
7598+
background: rgba(220, 38, 38, 0.15);
7599+
border: 1px solid rgba(220, 38, 38, 0.3);
7600+
}
7601+
7602+
.collectible-card.element-water .character-name-block {
7603+
background: rgba(59, 130, 246, 0.15);
7604+
border: 1px solid rgba(59, 130, 246, 0.3);
7605+
}
76107606

76117607
.level-up-elemental-info {
76127608
margin-bottom: 1.5rem;
76137609
text-align: center;
76147610
}
76157611

7616-
.level-up-elemental-details {
7617-
color: var(--text-secondary);
7618-
font-family: 'Inter', sans-serif;
7619-
font-size: 1.1rem;
7620-
font-weight: 700;
7621-
line-height: 1.4;
7622-
}
7612+
.level-up-elemental-details {
7613+
color: var(--text-secondary);
7614+
font-family: 'Inter', sans-serif;
7615+
font-size: 1.1rem;
7616+
font-weight: 700;
7617+
line-height: 1.4;
7618+
}
76237619

76247620
.level-up-rarity-upgrade {
76257621
display: block;
@@ -7663,29 +7659,29 @@ body.modal-open .collection-container-modern {
76637659
font-weight: 500;
76647660
}
76657661

7666-
.level-up-cost-value {
7667-
color: #ff4444;
7668-
font-weight: 600;
7669-
font-size: 1.05rem;
7670-
}
7671-
7672-
.level-up-balance-value {
7673-
color: var(--success);
7674-
font-weight: 600;
7675-
font-size: 1.05rem;
7676-
}
7677-
7678-
.level-up-remaining-value {
7679-
color: var(--primary-gold);
7680-
font-weight: 600;
7681-
font-size: 1.05rem;
7682-
}
7683-
7684-
.level-up-remaining-value.warning {
7685-
color: #ff4444;
7686-
font-weight: 700;
7687-
text-shadow: 0 0 8px rgba(255, 68, 68, 0.5);
7688-
}
7662+
.level-up-cost-value {
7663+
color: #ff4444;
7664+
font-weight: 600;
7665+
font-size: 1.05rem;
7666+
}
7667+
7668+
.level-up-balance-value {
7669+
color: var(--success);
7670+
font-weight: 600;
7671+
font-size: 1.05rem;
7672+
}
7673+
7674+
.level-up-remaining-value {
7675+
color: var(--primary-gold);
7676+
font-weight: 600;
7677+
font-size: 1.05rem;
7678+
}
7679+
7680+
.level-up-remaining-value.warning {
7681+
color: #ff4444;
7682+
font-weight: 700;
7683+
text-shadow: 0 0 8px rgba(255, 68, 68, 0.5);
7684+
}
76897685

76907686
.level-up-modal-actions {
76917687
display: flex;

‎src/App.tsx‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ import ProfileTab from './components/ProfileTab';
1111
import RulesTab from './components/RulesTab';
1212
import SettingsMenu from './components/SettingsMenu';
1313
import {
14-
ELEMENTAL_TYPES,
15-
ELEMENTS,
16-
LOCATIONS,
17-
addElementalToCollection,
18-
addExperienceToElemental,
19-
calculateBattleResult,
20-
canAffordLocation,
21-
canLevelUpElemental,
22-
createInitialCollection,
23-
generateOpponent,
24-
getAchievementDefinitions,
25-
getLevelUpCost,
26-
getMaxLevelForRarity,
27-
getRandomElement,
28-
getRandomElementalReward,
29-
getRank,
30-
getRarityUpgradeCost,
31-
getTitle,
32-
levelUpElemental,
33-
setElementalCooldown,
14+
ELEMENTAL_TYPES,
15+
ELEMENTS,
16+
LOCATIONS,
17+
addElementalToCollection,
18+
addExperienceToElemental,
19+
calculateBattleResult,
20+
canAffordLocation,
21+
canLevelUpElemental,
22+
createInitialCollection,
23+
generateOpponent,
24+
getAchievementDefinitions,
25+
getLevelUpCost,
26+
getMaxLevelForRarity,
27+
getRandomElement,
28+
getRandomElementalReward,
29+
getRank,
30+
getRarityUpgradeCost,
31+
getTitle,
32+
levelUpElemental,
33+
setElementalCooldown,
3434
} from './gameLogic';
3535
import {
36-
Element,
37-
ElementalRarity,
38-
GameState,
39-
Location,
40-
PlayerStats,
36+
Element,
37+
ElementalRarity,
38+
GameState,
39+
Location,
40+
PlayerStats,
4141
} from './types';
4242

4343
const INITIAL_PLAYER: PlayerStats = {

0 commit comments

Comments
 (0)