diff --git a/.gitignore b/.gitignore index 4eaad64..c4210ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Build outputs /.vscode-build/ +/.worktrees/ /build/ /bin/ /obj/ diff --git a/.worktrees/ack-syc-swj b/.worktrees/ack-syc-swj deleted file mode 160000 index 58ab400..0000000 --- a/.worktrees/ack-syc-swj +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58ab40094998453cb433060ebb0a1e92913e8d9f diff --git a/src/source/TetrisRender.cpp b/src/source/TetrisRender.cpp index b975ef4..14055c3 100644 --- a/src/source/TetrisRender.cpp +++ b/src/source/TetrisRender.cpp @@ -844,20 +844,22 @@ void TDrawScreen(HDC hdc, HWND hWnd) else if (helpState.currentPage == 4) { const int creditAnimationTotalTicks = 60; - constexpr int creditPageCount = 4; + constexpr int creditPageCount = 5; const TCHAR* creditNames[creditPageCount] = { _T("qls"), _T("wyk"), - _T("juju"), - _T("qhy") + _T("swj"), + _T("qhy"), + _T("syc") }; const TCHAR* creditTexts[creditPageCount] = { _T("\u611f\u8c22\u6fc0\u60c5\u6295\u8eab\u4e8e\u6d4b\u8bd5\u4e4b\u4e2d\u7684Lisa"), _T("\u611f\u8c22\u70ed\u5ff1coding\u7684\u5c0f\u86cb\u7cd5"), _T("\u611f\u8c22\u8bfe\u524d\u95f2\u91cc\u5077\u5fd9\u7684juju"), - _T("\u611f\u8c22qhy\u7684\u5929\u624d\u6784\u60f3") + _T("\u611f\u8c22qhy\u7684\u5929\u624d\u6784\u60f3"), + _T("\u611f\u8c22syc\u63fd\u4e0b\u6240\u6709\u6742\u6d3b") }; int currentCredit = creditPageIndex; diff --git a/src/source/extensions/TetrisGameExtensions.cpp b/src/source/extensions/TetrisGameExtensions.cpp index f8bdd00..e1f427a 100644 --- a/src/source/extensions/TetrisGameExtensions.cpp +++ b/src/source/extensions/TetrisGameExtensions.cpp @@ -726,7 +726,7 @@ void OpenCreditScreen() */ void ChangeCreditPage(int direction) { - constexpr int creditPageCount = 4; + constexpr int creditPageCount = 5; if (direction == 0) { return; diff --git a/src/source/render/TetrisRenderAssets.cpp b/src/source/render/TetrisRenderAssets.cpp index 8d4a989..1cc5b9f 100644 --- a/src/source/render/TetrisRenderAssets.cpp +++ b/src/source/render/TetrisRenderAssets.cpp @@ -101,7 +101,7 @@ Bitmap* LoadBackgroundImage() */ Bitmap* LoadCreditImage(int index) { - constexpr int creditPageCount = 4; + constexpr int creditPageCount = 5; static Bitmap* creditImages[creditPageCount] = {}; static bool attempted[creditPageCount] = {}; @@ -121,7 +121,8 @@ Bitmap* LoadCreditImage(int index) L"assets\\images\\qls.jpg", L"assets\\images\\wyk.jpg", L"assets\\images\\swj.jpg", - L"assets\\images\\qhy.jpg" + L"assets\\images\\qhy.jpg", + L"assets\\images\\syc.jpg" }; const std::wstring creditExtraCandidates[] = {