diff --git a/src/source/TetrisRender.cpp b/src/source/TetrisRender.cpp index 835af4f..7888df2 100644 --- a/src/source/TetrisRender.cpp +++ b/src/source/TetrisRender.cpp @@ -2036,7 +2036,7 @@ void TDrawScreen(HDC hdc, HWND hWnd) cardBorder = RGB(38, 34, 42); descColor = RGB(72, 62, 72); footerColor = RGB(48, 42, 50); - rarityText = _T("\u7a00\u6709\u5ea6\uff1a\u8bc5\u5492"); + rarityText = _T("\u8bc5\u5492\uff1a\u4e0b\u6b21\u5347\u7ea7\u6240\u9700 EXP +25%"); } else if (hasSynthesisPath) { @@ -2099,14 +2099,28 @@ void TDrawScreen(HDC hdc, HWND hWnd) DrawText(hdc, levelText, -1, &levelRect, DT_RIGHT | DT_VCENTER | DT_SINGLELINE); } + if (hasSynthesisPath) + { + SelectObject(hdc, smallFont); + SetTextColor(hdc, upgradeUiState.options[i].cursed ? RGB(142, 78, 78) : RGB(116, 82, 104)); + RECT synthesisRect = + { + cardRect.left + SS(20), + cardRect.top + SS(18), + cardRect.right - SS(96), + cardRect.top + SS(44) + }; + DrawText(hdc, synthesisPath, -1, &synthesisRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + } + SelectObject(hdc, sectionFont); SetTextColor(hdc, upgradeUiState.options[i].cursed ? RGB(130, 54, 54) : (isSelected ? titleColor : textColor)); RECT nameRect = { cardRect.left + SS(20), - cardRect.top + SS(44), + cardRect.top + (hasSynthesisPath ? SS(54) : SS(44)), cardRect.right - SS(96), - cardRect.top + SS(98) + cardRect.top + (hasSynthesisPath ? SS(106) : SS(98)) }; DrawText(hdc, upgradeUiState.options[i].name, -1, &nameRect, DT_LEFT | DT_TOP | DT_WORDBREAK); @@ -2115,26 +2129,13 @@ void TDrawScreen(HDC hdc, HWND hWnd) RECT descRect = { cardRect.left + SS(20), - cardRect.top + SS(116), + cardRect.top + (hasSynthesisPath ? SS(124) : SS(116)), cardRect.right - SS(20), - cardRect.bottom - (hasSynthesisPath ? SS(98) : SS(64)) + cardRect.bottom - SS(64) }; DrawText(hdc, upgradeUiState.options[i].description, -1, &descRect, DT_LEFT | DT_WORDBREAK); SelectObject(hdc, smallFont); - if (hasSynthesisPath) - { - RECT synthesisRect = - { - cardRect.left + SS(20), - cardRect.bottom - SS(88), - cardRect.right - SS(20), - cardRect.bottom - SS(58) - }; - SetTextColor(hdc, upgradeUiState.options[i].cursed ? RGB(142, 78, 78) : RGB(116, 82, 104)); - DrawText(hdc, synthesisPath, -1, &synthesisRect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); - } - RECT footerRect = { cardRect.left + SS(20),