TheTangestFive/Tereis
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增可解锁Hold机制并补全特殊强化提示

Browse Source
This commit is contained in:
Qi-huanye
2026-04-24 20:17:52 +08:00
parent 8ee470b059
commit c185530e5f
5 changed files with 182 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+2 -2
View File
@@ -161,7 +161,7 @@
目标：在主体验稳定后再上特殊规则，避免一开始把复杂度拉满。
- [ ] Hold 功能改造成可解锁能力，而不是默认启用
- [x] Hold 功能改造成可解锁能力，而不是默认启用
- [ ] 扩展更多预览块显示
- [ ] 清扫者：累计消行触发底部清除
- [ ] 爆破方块：生成特殊方块并实现 3x3 清除
@@ -180,7 +180,7 @@
- [x] 右侧面板补充等级、EXP 条、强化列表、当前倍率
- [x] 增加本次结算浮动提示：`+Score`、`+EXP`、`Level Up`
- [ ] 为特殊强化增加简短提示文案
- [x] 为特殊强化增加简短提示文案
- [x] 增加暂停、升级、失败三种不同遮罩样式
- [ ] 增加占位图标、占位按钮、占位边框资源
- [ ] 检查中文排版、字号、留白、长文本换行
src/include/Tetris.h
+4
View File
@@ -49,6 +49,7 @@ struct PlayerStats
int expUpgradeLevel;
int previewUpgradeLevel;
int lastChanceUpgradeLevel;
int holdUnlocked;
};
struct UpgradeOption
@@ -119,6 +120,8 @@ extern int currentScreen;
extern int currentMode;
extern int currentFallInterval;
extern int nextTypes[3];
extern int holdType;
extern bool holdUsedThisTurn;
extern int bricks[7][4][4][4];
extern COLORREF BrickColor[7];
@@ -140,5 +143,6 @@ void ReturnToMainMenu();
void OpenRulesScreen();
void OpenUpgradeMenu();
void ConfirmUpgradeSelection();
void HoldCurrentPiece();
void TDrawScreen(HDC hdc, HWND hWnd);
src/source/Tetris.cpp
+4
View File
@@ -369,6 +369,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
DeleteLines();
}
break;
case 'C':
case VK_SHIFT:
HoldCurrentPiece();
break;
default:
break;
}
src/source/TetrisLogic.cpp
+89 -2
View File
@@ -20,6 +20,8 @@ int currentScreen = SCREEN_MENU;
int currentMode = MODE_CLASSIC;
int currentFallInterval = 500;
int nextTypes[3] = { 0, 0, 0 };
int holdType = -1;
bool holdUsedThisTurn = false;
enum UpgradeId
{
@@ -28,7 +30,8 @@ enum UpgradeId
UPGRADE_SLOW_FALL = 2,
UPGRADE_COMBO_BONUS = 3,
UPGRADE_PREVIEW_PLUS_ONE = 4,
UPGRADE_LAST_CHANCE = 5
UPGRADE_LAST_CHANCE = 5,
UPGRADE_HOLD_UNLOCK = 6
};
static const UpgradeEntry kUpgradePool[] =
@@ -38,7 +41,8 @@ static const UpgradeEntry kUpgradePool[] =
{ UPGRADE_SLOW_FALL, -1, true, _T("\u6162\u901f\u4e0b\u843d"), _T("\u64cd\u4f5c"), _T("\u81ea\u7136\u4e0b\u843d\u53d8\u6162\uff0c\u6bcf\u6b21\u63d0\u9ad8 80ms\u3002") },
{ UPGRADE_PREVIEW_PLUS_ONE, 3, false, _T("\u989d\u5916\u9884\u89c8"), _T("\u89c6\u91ce"), _T("\u4e0b\u4e00\u4e2a\u65b9\u5757\u9884\u89c8 +1\uff0c\u6700\u591a 3 \u4e2a\u3002") },
{ UPGRADE_EXP_MULTIPLIER, -1, true, _T("\u7ecf\u9a8c\u5f3a\u5316"), _T("\u6210\u957f"), _T("\u540e\u7eed\u6d88\u884c\u83b7\u5f97 EXP \u63d0\u9ad8 25%\u3002") },
{ UPGRADE_LAST_CHANCE, 1, false, _T("\u6700\u540e\u4e00\u640f"), _T("\u4fdd\u547d"), _T("\u9996\u6b21\u9876\u6b7b\u65f6\u81ea\u52a8\u6e05\u9664\u5e95\u90e8 3 \u884c\u5e76\u7ee7\u7eed\u6e38\u620f\u3002") }
{ UPGRADE_LAST_CHANCE, 1, false, _T("\u6700\u540e\u4e00\u640f"), _T("\u4fdd\u547d"), _T("\u9996\u6b21\u9876\u6b7b\u65f6\u81ea\u52a8\u6e05\u9664\u5e95\u90e8 3 \u884c\u5e76\u7ee7\u7eed\u6e38\u620f\u3002") },
{ UPGRADE_HOLD_UNLOCK, 1, false, _T("Hold \u89e3\u9501"), _T("\u7279\u6b8a"), _T("\u89e3\u9501 Hold \u69fd\uff0c\u5bf9\u5c40\u4e2d\u53ef\u7528 C \u6216 Shift \u6682\u5b58\u65b9\u5757\u3002") }
};
static constexpr int kUpgradePoolSize = sizeof(kUpgradePool) / sizeof(kUpgradePool[0]);
@@ -189,6 +193,7 @@ static void ResetPlayerStats(PlayerStats& stats, bool useRogueRules)
stats.expUpgradeLevel = 0;
stats.previewUpgradeLevel = 0;
stats.lastChanceUpgradeLevel = 0;
stats.holdUnlocked = 0;
}
static int GetNextPreviewLimit()
@@ -227,6 +232,8 @@ static int GetUpgradeCurrentLevel(int upgradeId)
return rogueStats.previewUpgradeLevel;
case UPGRADE_LAST_CHANCE:
return rogueStats.lastChanceUpgradeLevel;
case UPGRADE_HOLD_UNLOCK:
return rogueStats.holdUnlocked;
default:
return 0;
}
@@ -254,6 +261,35 @@ static void SetFeedbackMessage(const TCHAR* title, const TCHAR* detail, int tick
lstrcpyn(feedbackState.detail, detail, sizeof(feedbackState.detail) / sizeof(TCHAR));
}
static bool IsPiecePlacementValid(int pieceType, int pieceState, Point position)
{
for (int i = 0; i < 4; i++)
{
for (int j = 0; j < 4; j++)
{
if (bricks[pieceType][pieceState][i][j] == 0)
{
continue;
}
int checkY = position.y + i;
int checkX = position.x + j;
if (checkX < 0 || checkX >= nGameWidth || checkY >= nGameHeight)
{
return false;
}
if (checkY >= 0 && workRegion[checkY][checkX] != 0)
{
return false;
}
}
}
return true;
}
static void ResetNextQueue()
{
for (int i = 0; i < 3; i++)
@@ -379,6 +415,9 @@ static void ApplyUpgradeById(int upgradeId)
rogueStats.lastChanceCount = 1;
rogueStats.lastChanceUpgradeLevel = 1;
break;
case UPGRADE_HOLD_UNLOCK:
rogueStats.holdUnlocked = 1;
break;
default:
break;
}
@@ -716,6 +755,7 @@ void Fixing()
type = ConsumeNextType();
nType = nextTypes[0];
state = 0;
holdUsedThisTurn = false;
point = GetSpawnPoint(type);
target = point;
ComputeTarget();
@@ -840,12 +880,15 @@ void Restart()
feedbackState.visibleTicks = 0;
feedbackState.title[0] = _T('\0');
feedbackState.detail[0] = _T('\0');
holdType = -1;
holdUsedThisTurn = false;
tScore = 0;
ResetNextQueue();
type = ConsumeNextType();
nType = nextTypes[0];
state = 0;
holdUsedThisTurn = false;
point = GetSpawnPoint(type);
target = point;
@@ -922,3 +965,47 @@ void ConfirmUpgradeSelection()
currentScreen = SCREEN_PLAYING;
}
void HoldCurrentPiece()
{
if (currentMode != MODE_ROGUE || rogueStats.holdUnlocked == 0 || holdUsedThisTurn || gameOverFlag)
{
return;
}
int previousHoldType = holdType;
holdType = type;
state = 0;
holdUsedThisTurn = true;
if (previousHoldType < 0)
{
type = ConsumeNextType();
nType = nextTypes[0];
}
else
{
type = previousHoldType;
}
point = GetSpawnPoint(type);
target = point;
if (!IsPiecePlacementValid(type, state, point))
{
gameOverFlag = true;
SetFeedbackMessage(_T("Hold \u5931\u8d25"), _T("\u6362\u51fa\u7684\u65b9\u5757\u65e0\u6cd5\u653e\u7f6e\uff0c\u5bf9\u5c40\u7ed3\u675f\u3002"), 12);
return;
}
ComputeTarget();
if (previousHoldType < 0)
{
SetFeedbackMessage(_T("Hold \u5df2\u5b58\u5165"), _T("\u5f53\u524d\u65b9\u5757\u5df2\u8fdb\u5165 Hold \u69fd\u3002"), 10);
}
else
{
SetFeedbackMessage(_T("Hold \u5df2\u4ea4\u6362"), _T("\u5df2\u4e0e Hold \u69fd\u4e2d\u7684\u65b9\u5757\u4ea4\u6362\u3002"), 10);
}
}
src/source/TetrisRender.cpp
+83 -6
View File
@@ -332,6 +332,7 @@ void TDrawScreen(HDC hdc, HWND hWnd)
_T("\u2191 / W\uff1a\u65cb\u8f6c\u65b9\u5757\r\n")
_T("\u2193 / S\uff1a\u8f6f\u964d\r\n")
_T("Space\uff1a\u786c\u964d\r\n")
_T("C / Shift\uff1aHold\uff08\u89e3\u9501\u540e\uff09\r\n")
_T("P\uff1a\u6682\u505c / \u7ee7\u7eed\r\n")
_T("R\uff1a\u91cd\u5f00\u5f53\u524d\u5bf9\u5c40\r\n")
_T("M\uff1a\u8fd4\u56de\u4e3b\u83dc\u5355"),
@@ -361,7 +362,7 @@ void TDrawScreen(HDC hdc, HWND hWnd)
hdc,
_T("\u7ecf\u5178\u6a21\u5f0f\uff1a\u4fdd\u6301\u539f\u7248\u4fc4\u7f57\u65af\u65b9\u5757\u73a9\u6cd5\uff0c\u4ee5\u6d88\u884c\u548c\u751f\u5b58\u4e3a\u4e3b\u3002\r\n\r\n")
_T("Rogue \u6a21\u5f0f\uff1a\u6d88\u884c\u540e\u9664\u4e86\u83b7\u5f97\u5206\u6570\uff0c\u8fd8\u4f1a\u83b7\u5f97 EXP\u3002EXP \u8fbe\u5230\u9608\u503c\u540e\u89e6\u53d1\u5347\u7ea7\uff0c\u4ece\u4e09\u4e2a\u5f3a\u5316\u4e2d\u9009\u4e00\u4e2a\u3002\r\n\r\n")
_T("\u5f53\u524d\u5df2\u63a5\u5165\uff1a\u5206\u6570\u500d\u7387\u3001EXP \u500d\u7387\u3001\u6162\u901f\u4e0b\u843d\u3002\r\n\r\n")
_T("\u5f53\u524d\u5df2\u63a5\u5165\uff1a\u5206\u6570\u500d\u7387\u3001EXP \u500d\u7387\u3001\u6162\u901f\u4e0b\u843d\u3001Hold \u89e3\u9501\u3002\r\n\r\n")
_T("\u63d0\u793a\uff1a\u6682\u505c\u3001\u5931\u8d25\u548c\u5347\u7ea7\u4f1a\u8fdb\u5165\u4e0d\u540c\u754c\u9762\uff0c\u8bf7\u6839\u636e\u5c4f\u5e55\u63d0\u793a\u64cd\u4f5c\u3002"),
-1,
&rulesBody,
@@ -736,11 +737,87 @@ void TDrawScreen(HDC hdc, HWND hWnd)
SetTextColor(hdc, textColor);
}
int previewTitleTop = (currentMode == MODE_ROGUE) ? panelRect.top + SS(690) : panelRect.top + SS(430);
int nextCardTop = (currentMode == MODE_ROGUE) ? panelRect.top + SS(724) : panelRect.top + SS(472);
int holdTitleTop = (currentMode == MODE_ROGUE) ? panelRect.top + SS(690) : panelRect.top + SS(430);
int holdCardTop = (currentMode == MODE_ROGUE) ? panelRect.top + SS(724) : panelRect.top + SS(472);
int previewTitleTop = holdTitleTop;
int nextCardTop = holdCardTop;
int hintTop = (currentMode == MODE_ROGUE) ? panelRect.top + SS(818) : panelRect.top + SS(656);
TextOut(hdc, panelRect.left + SS(24), previewTitleTop, _T("\u4e0b\u4e00\u4e2a\u65b9\u5757"), lstrlen(_T("\u4e0b\u4e00\u4e2a\u65b9\u5757")));
if (currentMode == MODE_ROGUE)
{
TextOut(hdc, panelRect.left + SS(24), holdTitleTop, _T("Hold \u69fd"), lstrlen(_T("Hold \u69fd")));
RECT holdCard =
{
panelRect.left + SS(24),
holdCardTop,
panelRect.left + SS(24) + grid * 2 + SS(40),
holdCardTop + grid * 2 + SS(40)
};
DrawPanelCard(holdCard, RGB(255, 238, 244), RGB(233, 191, 208), 22);
if (rogueStats.holdUnlocked == 0)
{
SelectObject(hdc, smallFont);
SetTextColor(hdc, RGB(128, 104, 118));
RECT holdLockedRect =
{
holdCard.left + SS(10),
holdCard.top + SS(18),
holdCard.right - SS(10),
holdCard.bottom - SS(10)
};
DrawText(hdc, _T("\u672a\u89e3\u9501\r\n\u83b7\u53d6 Hold \u5f3a\u5316\u540e\u53ef\u7528"), -1, &holdLockedRect, DT_CENTER | DT_VCENTER | DT_WORDBREAK);
}
else if (holdType >= 0)
{
for (int i = 0; i < 4; i++)
{
for (int j = 0; j < 4; j++)
{
if (bricks[holdType][0][i][j] != 0)
{
RECT brickRect =
{
holdCard.left + SS(14) + j * (grid / 2),
holdCard.top + SS(14) + i * (grid / 2),
holdCard.left + SS(14) + (j + 1) * (grid / 2) - SS(1),
holdCard.top + SS(14) + (i + 1) * (grid / 2) - SS(1)
};
HBRUSH brickBrush = CreateSolidBrush(BrickColor[holdType]);
HPEN brickPen = CreatePen(PS_SOLID, 1, RGB(255, 248, 250));
oldPen = (HPEN)SelectObject(hdc, brickPen);
oldBrush = (HBRUSH)SelectObject(hdc, brickBrush);
RoundRect(hdc, brickRect.left, brickRect.top, brickRect.right, brickRect.bottom, SS(8), SS(8));
SelectObject(hdc, oldBrush);
SelectObject(hdc, oldPen);
DeleteObject(brickBrush);
DeleteObject(brickPen);
}
}
}
}
else
{
SelectObject(hdc, smallFont);
SetTextColor(hdc, RGB(128, 104, 118));
RECT emptyHoldRect =
{
holdCard.left + SS(10),
holdCard.top + SS(18),
holdCard.right - SS(10),
holdCard.bottom - SS(10)
};
DrawText(hdc, _T("\u6682\u65e0\u6682\u5b58\r\nC / Shift \u53ef\u5b58\u5165\u5f53\u524d\u65b9\u5757"), -1, &emptyHoldRect, DT_CENTER | DT_VCENTER | DT_WORDBREAK);
}
previewTitleTop = holdTitleTop;
nextCardTop = holdCardTop;
}
int previewLabelLeft = panelRect.left + SS((currentMode == MODE_ROGUE) ? 132 : 24);
TextOut(hdc, previewLabelLeft, previewTitleTop, _T("\u4e0b\u4e00\u4e2a\u65b9\u5757"), lstrlen(_T("\u4e0b\u4e00\u4e2a\u65b9\u5757")));
int previewCount = 1;
if (currentMode == MODE_ROGUE)
@@ -760,9 +837,9 @@ void TDrawScreen(HDC hdc, HWND hWnd)
{
RECT nextCard =
{
panelRect.left + SS(24) + previewIndex * SS(94),
previewLabelLeft + previewIndex * SS(94),
nextCardTop,
panelRect.left + SS(24) + previewIndex * SS(94) + grid * 2 + SS(40),
previewLabelLeft + previewIndex * SS(94) + grid * 2 + SS(40),
nextCardTop + grid * 2 + SS(40)
};