Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{
"metadata": {
"lastUpdated": "2026-08-08T12:00:52Z",
"currentVersion": "1.4.14",
"lastUpdated": "2026-08-08T12:45:23Z",
"currentVersion": "1.4.15",
"projectType": "project_type: react # spring, flutter, react, react-native, react-native-expo, node, basic",
"totalReleases": 29
"totalReleases": 30
},
"releases": [
{
"version": "1.4.15",
"project_type": "project_type: react # spring, flutter, react, react-native, react-native-expo, node, basic",
"date": "2026-08-08",
"pr_number": 116,
"raw_summary": "Summary by CodeRabbit\n๋ฆด๋ฆฌ์Šค ๋…ธํŠธ\n\n๊ฐœ์„ \n\n์Šคํ† ๋ฆฌ ์ง„ํ–‰ ๊ทœ์น™์„ ๋ถ„๋ฆฌํ•ด ์•ˆ์ •์„ฑ ํ–ฅ์ƒ",
"parsed_changes": {
"๊ฐœ์„ ": {
"title": "๊ฐœ์„ ",
"items": [
"์Šคํ† ๋ฆฌ ์ง„ํ–‰ ๊ทœ์น™์„ ๋ถ„๋ฆฌํ•ด ์•ˆ์ •์„ฑ ํ–ฅ์ƒ"
]
}
}
},
{
"version": "1.4.14",
"project_type": "project_type: react # spring, flutter, react, react-native, react-native-expo, node, basic",
Expand Down
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Changelog

**ํ˜„์žฌ ๋ฒ„์ „:** 1.4.14
**๋งˆ์ง€๋ง‰ ์—…๋ฐ์ดํŠธ:** 2026-08-08T12:00:52Z
**ํ˜„์žฌ ๋ฒ„์ „:** 1.4.15
**๋งˆ์ง€๋ง‰ ์—…๋ฐ์ดํŠธ:** 2026-08-08T12:45:23Z

---

## [1.4.15] - 2026-08-08

**PR:** #116

**๊ฐœ์„ **
- ์Šคํ† ๋ฆฌ ์ง„ํ–‰ ๊ทœ์น™์„ ๋ถ„๋ฆฌํ•ด ์•ˆ์ •์„ฑ ํ–ฅ์ƒ

---

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- ์ˆ˜์ •ํ•˜์ง€๋งˆ์„ธ์š” ์ž๋™์œผ๋กœ ๋™๊ธฐํ™” ๋ฉ๋‹ˆ๋‹ค -->

<!-- ์ˆ˜์ •ํ•˜์ง€๋งˆ์„ธ์š” ์ž๋™์œผ๋กœ ๋™๊ธฐํ™” ๋ฉ๋‹ˆ๋‹ค -->
## ์ตœ์‹  ๋ฒ„์ „ : v1.4.13 (2026-08-08)
## ์ตœ์‹  ๋ฒ„์ „ : v1.4.14 (2026-08-08)

[์ „์ฒด ์—…๋ฐ์ดํŠธ ๋‚ด์—ญ ๋ณด๊ธฐ](CHANGELOG.md)

Expand Down
16 changes: 11 additions & 5 deletions docs/GAME-FLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ Main2(์นดํŽ˜)์˜ ๋งˆ์ง€๋ง‰ ์”ฌ "๋ฐ”๋‹ฅ์— ๋ˆ์ด ๋–จ์–ด์ ธ ์žˆ๋Š” ๊ฒƒ์„ ๋ฐœ๊ฒฌ

## ์ ์ˆ˜ ์ž„๊ณ„์น˜

`src/components/GameUI/BagelSelectPageComponent.jsx`์˜ `onSubClicked()`์— ํ•˜๋“œ์ฝ”๋”ฉ๋˜์–ด ์žˆ๋‹ค.
์•„๋ž˜๋Š” **ํ˜„์žฌ ์‹ค์ œ ๋™์ž‘**์ด๋‹ค.
`src/game/storyFlow.js`์˜ `resolveNextStep()`์— ์ •์˜๋˜์–ด ์žˆ๋‹ค.
์•„๋ž˜๋Š” **ํ˜„์žฌ ์‹ค์ œ ๋™์ž‘**์ด๋ฉฐ, `src/game/storyFlow.test.js`๊ฐ€ ์ด ํ‘œ๋ฅผ ๊ทธ๋Œ€๋กœ ๊ฒ€์ฆํ•œ๋‹ค.

| ์Šคํ…Œ์ด์ง€ | ์กฐ๊ฑด | ๋ถ„๊ธฐ |
| -------- | ----------------------- | ------------------------------------------------------------- |
Expand Down Expand Up @@ -97,10 +97,16 @@ Main2(์นดํŽ˜)์˜ ๋งˆ์ง€๋ง‰ ์”ฌ "๋ฐ”๋‹ฅ์— ๋ˆ์ด ๋–จ์–ด์ ธ ์žˆ๋Š” ๊ฒƒ์„ ๋ฐœ๊ฒฌ
์ด ์ ˆ์˜ ๋‚ด์šฉ์€ `docs/superpowers/specs/2026-07-27-codebase-standardization-design.md` 1.2์ ˆ์˜
์ง„๋‹จ๊ณผ ๋Œ€์‘ํ•œ๋‹ค.

### 1. ์ปดํฌ๋„ŒํŠธ๊ฐ€ ์Šคํ† ๋ฆฌ ๊ตฌ์กฐ๋ฅผ ์•Œ๊ณ  ์žˆ๋‹ค
### 1. ์ปดํฌ๋„ŒํŠธ๊ฐ€ ์Šคํ† ๋ฆฌ ๊ตฌ์กฐ๋ฅผ ์•Œ๊ณ  ์žˆ๋‹ค โ€” **๋ถ€๋ถ„ ํ•ด์†Œ**

์”ฌ ์ „์ด ๊ทœ์น™์ด `scene`/`index` ์ˆซ์ž ์กฐ๊ฑด๋ฌธ ์•ฝ 60์ค„๋กœ ์ปดํฌ๋„ŒํŠธ์— ๋ฐ•ํ˜€ ์žˆ๋‹ค. **์”ฌ์„ ํ•˜๋‚˜
์ถ”๊ฐ€ํ•˜๋ ค๋ฉด ๋ฐ์ดํ„ฐ๊ฐ€ ์•„๋‹ˆ๋ผ ์ปดํฌ๋„ŒํŠธ๋ฅผ ๊ณ ์ณ์•ผ ํ•œ๋‹ค.**
์”ฌ ์ „์ด ๊ทœ์น™์ด `scene`/`index` ์ˆซ์ž ์กฐ๊ฑด๋ฌธ ์•ฝ 60์ค„๋กœ ์ปดํฌ๋„ŒํŠธ์— ๋ฐ•ํ˜€ ์žˆ์—ˆ๋‹ค.

`src/game/storyFlow.js`๋กœ **์ˆœ์ˆ˜ ํ•จ์ˆ˜ ์ถ”์ถœ์„ ์™„๋ฃŒ**ํ–ˆ๋‹ค. ์ปดํฌ๋„ŒํŠธ์—์„œ `scene ===` ์กฐ๊ฑด๋ฌธ์ด
์‚ฌ๋ผ์กŒ๊ณ , ์ „์ด ๊ทœ์น™์€ ์ด์ œ ํ…Œ์ŠคํŠธ ๊ฐ€๋Šฅํ•œ ํ•จ์ˆ˜๋‹ค. `src/game/storyFlow.test.js`์˜ 25๊ฐœ
ํ…Œ์ŠคํŠธ๊ฐ€ **ํ˜„์žฌ ๋™์ž‘์˜ ๊ธฐ๋Œ€๊ฐ’ ํ‘œ** ์—ญํ• ์„ ํ•œ๋‹ค.

๋‹ค๋งŒ ๊ทœ์น™์€ ์—ฌ์ „ํžˆ **์ฝ”๋“œ**์— ์žˆ๋‹ค. JSON ๋ฐ์ดํ„ฐ๋กœ ์˜ฎ๊ธฐ๋Š” ์ž‘์—…์ด ๋‚จ์•„ ์žˆ์œผ๋ฉฐ,
๊ทธ๋•Œ ์œ„ ํ…Œ์ŠคํŠธ๊ฐ€ ํšŒ๊ท€ ์•ˆ์ „๋ง์ด ๋œ๋‹ค.

### 2. ์šฐ์—ฐํžˆ ๋™์ž‘ํ•˜๋Š” ๋ถ„๊ธฐ

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "re-wave",
"version": "1.4.14",
"version": "1.4.15",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.17.0",
Expand Down
63 changes: 9 additions & 54 deletions src/components/GameUI/BagelSelectPageComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import styled from "styled-components";
import { scoreAtom, characterNameAtom } from "../../atom/atom";
import { ROUTES } from "../../constants/routes";
import { markGameCompleted } from "../../game/progress";
import { resolveNextStep, resolveStageExit } from "../../game/storyFlow";

import BagelChoiceButton from "./BagelChoiceButton";
import BagelDialogBox from "./BagelDialogBox";
Expand Down Expand Up @@ -175,13 +176,8 @@ const BagelSelectPageComponent = ({ backgroundImage, characterImage, storyData,
};

const onClicked = (option, i) => {
if (scene === 2) {
if (i === 0) {
setBase("/main4");
} else {
setBase("/main3");
}
}
// ๋‹ค์Œ ์Šคํ…Œ์ด์ง€ ๋ชฉ์ ์ง€๋Š” ์„ ํƒ์— ๋”ฐ๋ผ ๊ฐˆ๋ฆด ์ˆ˜ ์žˆ๋‹ค (์นดํŽ˜์˜ ๋ˆ ์ค๊ธฐ)
setBase(resolveStageExit(scene, i, url));
if (option.error) {
navigate(ROUTES.GAME_OVER);
} else {
Expand All @@ -199,54 +195,13 @@ const BagelSelectPageComponent = ({ backgroundImage, characterImage, storyData,
} else {
setToggle(false);

if (scene === 2) {
if (index === 0) {
if (score >= 15 && score < 40) {
setIndex(1);
} else if (score < 15) {
setIndex(2);
} else {
setIndex(3);
}
} else if (index !== 1 && index !== 2) {
setIndex((prev) => prev + 1);
} else {
setIndex(3);
}
} else if (scene === 3) {
if (index === 1) {
if (score >= 60) {
setIndex(2);
} else if (score >= 20 && score < 60) {
setIndex(3);
} else {
setIndex(4);
}
} else if (index === 2 || index === 3 || index === 4) {
setIndex(5);
} else {
setIndex((prev) => prev + 1);
}
} else if (scene === 4) {
if (index === 2) {
if (score >= 70) {
setIndex(3);
} else {
setIndex(4);
}
} else {
setIndex((prev) => prev + 1);
}
} else if (scene === 5) {
if (index === 2) {
// ๊ฒฐ๊ณผยท์—”๋”ฉ ํ™”๋ฉด์€ ๊ฒŒ์ž„ ์™„๋ฃŒ์ž๋งŒ ์ง„์ž…ํ•  ์ˆ˜ ์žˆ๋‹ค
markGameCompleted();
navigate(ROUTES.RESULT);
} else {
setIndex((prev) => prev + 1);
}
const step = resolveNextStep(scene, index, score);
if (step.type === "navigate") {
// ๊ฒฐ๊ณผยท์—”๋”ฉ ํ™”๋ฉด์€ ๊ฒŒ์ž„ ์™„๋ฃŒ์ž๋งŒ ์ง„์ž…ํ•  ์ˆ˜ ์žˆ๋‹ค
markGameCompleted();
navigate(step.to);
} else {
setIndex((prev) => prev + 1);
setIndex(step.index);
}
}
};
Expand Down
91 changes: 91 additions & 0 deletions src/game/storyFlow.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import { ROUTES } from "../constants/routes";

/**
* ์Šคํ† ๋ฆฌ ์ „์ด ๊ทœ์น™
*
* ์ด ๊ทœ์น™์€ ์›๋ž˜ `BagelSelectPageComponent`์˜ `onSubClicked()` ์•ˆ์—
* `scene`/`index` ์ˆซ์ž ์กฐ๊ฑด๋ฌธ ์•ฝ 60์ค„๋กœ ๋ฐ•ํ˜€ ์žˆ์—ˆ๋‹ค. ์ปดํฌ๋„ŒํŠธ๊ฐ€ ์Šคํ† ๋ฆฌ ๊ตฌ์กฐ๋ฅผ
* ์•Œ๊ณ  ์žˆ์–ด์„œ, ์”ฌ์„ ํ•˜๋‚˜ ์ถ”๊ฐ€ํ•˜๋ ค๋ฉด ๋ฐ์ดํ„ฐ๊ฐ€ ์•„๋‹ˆ๋ผ ์ปดํฌ๋„ŒํŠธ๋ฅผ ๊ณ ์ณ์•ผ ํ–ˆ๋‹ค.
*
* ์—ฌ๊ธฐ์„œ๋Š” **๋™์ž‘์„ ๊ทธ๋Œ€๋กœ ์œ ์ง€ํ•œ ์ฑ„** ์ˆœ์ˆ˜ ํ•จ์ˆ˜๋กœ๋งŒ ๋–ผ์–ด๋ƒˆ๋‹ค.
* ์ˆœ์ˆ˜ ํ•จ์ˆ˜๊ฐ€ ๋˜๋ฉด ์ „ ๊ฒฝ๋กœ๋ฅผ ํ…Œ์ŠคํŠธ๋กœ ๊ฒ€์ฆํ•  ์ˆ˜ ์žˆ๊ณ , ๊ทธ ํ…Œ์ŠคํŠธ๊ฐ€
* ์ดํ›„ ๋ฐ์ดํ„ฐํ™”(JSON ์Šคํ‚ค๋งˆ ์ „ํ™˜)์˜ ํšŒ๊ท€ ์•ˆ์ „๋ง์ด ๋œ๋‹ค.
*
* ๊ฐ’์€ ๋ฐ”๊พธ์ง€ ์•Š์•˜๋‹ค. ์ž„๊ณ„์น˜๊ฐ€ ์ด์ƒํ•ด ๋ณด์—ฌ๋„ ๊ทธ๊ฒƒ์ด ํ˜„์žฌ ๋™์ž‘์ด๋‹ค.
* ๊ทผ๊ฑฐ๋Š” docs/GAME-FLOW.md์— ๊ธฐ๋ก๋˜์–ด ์žˆ๋‹ค.
*/

/** ์Šคํ…Œ์ด์ง€ ์ข…๋ฃŒ๋ฅผ ๋œปํ•˜๋Š” ์‹ ํ˜ธ. ์”ฌ ์ธ๋ฑ์Šค ๋Œ€์‹  ์ด ๊ฐ’์„ ๋ฐ˜ํ™˜ํ•œ๋‹ค. */
export const STAGE_END = "STAGE_END";

/**
* ํ˜„์žฌ ์”ฌ์„ ๋งˆ์ณค์„ ๋•Œ ๋‹ค์Œ์— ๋ฌด์—‡์„ ํ• ์ง€ ๊ฒฐ์ •ํ•œ๋‹ค.
*
* @param {number} scene ์Šคํ…Œ์ด์ง€ ๋ฒˆํ˜ธ (1~5)
* @param {number} index ๋ฐฉ๊ธˆ ๋งˆ์นœ ์”ฌ ์ธ๋ฑ์Šค
* @param {number} score ํ˜„์žฌ๊นŒ์ง€ ๋ˆ„์  ์ ์ˆ˜
* @returns {{type: "scene", index: number} | {type: "navigate", to: string} | {type: "end"}}
*/
export const resolveNextStep = (scene, index, score) => {
const toScene = (i) => ({ type: "scene", index: i });

if (scene === 2) {
if (index === 0) {
if (score >= 15 && score < 40) return toScene(1);
if (score < 15) return toScene(2);
return toScene(3);
}
// ์ ์ˆ˜ ๋ถ„๊ธฐ๋กœ 1 ๋˜๋Š” 2์— ๋“ค์–ด์™”๋‹ค๋ฉด ๊ณตํ†ต ์”ฌ(3)์œผ๋กœ ํ•ฉ๋ฅ˜ํ•œ๋‹ค
if (index === 1 || index === 2) return toScene(3);
return toScene(index + 1);
}

if (scene === 3) {
if (index === 1) {
if (score >= 60) return toScene(2);
if (score >= 20) return toScene(3);
return toScene(4);
}
if (index === 2 || index === 3 || index === 4) return toScene(5);
return toScene(index + 1);
}

if (scene === 4) {
// ์ ์ˆ˜๊ฐ€ ๋†’์œผ๋ฉด ํŠน์ˆ˜ ์”ฌ(๋งฅ์ฃผ)์„ ๊ฑฐ์นœ๋‹ค.
// ๋ฐ์ดํ„ฐ์— `love: 60`์ด ์„ ์–ธ๋ผ ์žˆ์œผ๋‚˜ ์‹ค์ œ ๋™์ž‘์€ 70์ด๋‹ค (docs/GAME-FLOW.md ์ฐธ์กฐ)
if (index === 2) {
return score >= 70 ? toScene(3) : toScene(4);
}
return toScene(index + 1);
}

if (scene === 5) {
// ๋งˆ์ง€๋ง‰ ์Šคํ…Œ์ด์ง€๋ฅผ ๋งˆ์น˜๋ฉด ๊ฒฐ๊ณผ ํ™”๋ฉด์œผ๋กœ ๋‚˜๊ฐ„๋‹ค
if (index === 2) return { type: "navigate", to: ROUTES.RESULT };
return toScene(index + 1);
}

return toScene(index + 1);
};

/**
* ์Šคํ…Œ์ด์ง€๋ฅผ ๋งˆ์ณค์„ ๋•Œ ์ด๋™ํ•  ๋‹ค์Œ ์Šคํ…Œ์ด์ง€ ๊ฒฝ๋กœ.
*
* ์นดํŽ˜(2)์—์„œ "๋ˆ์„ ์ค๋Š”๋‹ค"(์ฒซ ์„ ํƒ์ง€)๋ฅผ ๊ณ ๋ฅด๋ฉด ์šฐ์‚ฐ(4), ์•„๋‹ˆ๋ฉด ๋™๊ตด(3)๋กœ ๊ฐ„๋‹ค.
* `data4`์˜ ๋„์ž…๋ถ€ "์–ป์€ ๋ˆ์œผ๋กœ ํŽธ์˜์ ์—์„œ ์šฐ์‚ฐ์„ ์‚ฌ์˜ฌ ์ˆ˜ ์žˆ์—ˆ๋‹ค"๊ฐ€ ์ด ์„ ํƒ๊ณผ ์—ฐ๊ฒฐ๋œ๋‹ค.
*
* @param {number} scene ์Šคํ…Œ์ด์ง€ ๋ฒˆํ˜ธ
* @param {number} choiceIndex ๊ณ ๋ฅธ ์„ ํƒ์ง€ ์ธ๋ฑ์Šค
* @param {string} defaultRoute ๋ถ„๊ธฐ๊ฐ€ ์—†๋Š” ์Šคํ…Œ์ด์ง€์˜ ๊ธฐ๋ณธ ๋ชฉ์ ์ง€
* @returns {string} ๋‹ค์Œ ์Šคํ…Œ์ด์ง€ ๊ฒฝ๋กœ
*/
export const resolveStageExit = (scene, choiceIndex, defaultRoute) => {
if (scene === 2) {
return choiceIndex === 0 ? ROUTES.MAIN4 : ROUTES.MAIN3;
}
return defaultRoute;
};

const storyFlow = { STAGE_END, resolveNextStep, resolveStageExit };

export default storyFlow;
Loading