Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix] Demo day에 있었던 날짜 체크 & x가 보이지 않던 오류 해결 #50

Merged
merged 2 commits into from
Aug 19, 2024
Merged

[Hotfix] Demo day에 있었던 날짜 체크 & x가 보이지 않던 오류 해결 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738cbe3
hotfix: demo day에 생겼던 에러 수정
Dunkkkk Aug 19, 2024
7b2a28a
hotfix: 숨은그림찾기 날짜판별 로직 변경
Dunkkkk Aug 19, 2024
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
6 changes: 3 additions & 3 deletions Caecae/src/components/FindingGame/FindingGame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ const FindingGame = () => {
});

const showingWrongElement = state.wrongAnswers.map((wrongAnswer) => {
console.log(wrongAnswer);
return (
<LottieContainer
key={wrongAnswer.id}
x={wrongAnswer.x * pictureWidth.current}
y={wrongAnswer.y * pictureHeight.current}
x={wrongAnswer.x}
y={wrongAnswer.y}
width={lottieWidth}
height={lottieHeight}
jsonFile={wrongLottie}
Expand All @@ -117,7 +118,6 @@ const FindingGame = () => {
// const showingHintElement = state.showingHint.map((hintAnswer) => {
// return <HintSpot y={hintAnswer.y} x={hintAnswer.x} />;
// });

return (
<div>
<PictureGameBoard
Expand Down
99 changes: 58 additions & 41 deletions Caecae/src/features/FindingGameLanding/OpenEvent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
info.startTime,
info.endTime
);
console.log(tempAnswer);

if (tempAnswer !== "none") {
answer = tempAnswer;
Expand Down Expand Up @@ -71,6 +72,19 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
<div className="mt-[60px]">
<SmileBadge width={175} badgeType="yellow_wink" />
</div>
<div
className={`bg-[#CCCCCC] w-[175px] h-[50px] flex items-center justify-center gap-3 mt-[60px]`}
onClick={() => alert("현재시간엔 게임을 시작할 수 없습니다.")}
>
<span className="text-[white] font-semibold">
캐스퍼 찾으러가기
</span>
<img
src="/assets/whiteRightShevron.svg"
alt="smileBage3D"
className="w-[10px]"
/>
</div>
</>
),
isButtonOpen: false,
Expand Down Expand Up @@ -136,6 +150,23 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
<div className="mt-[60px]">
<SmileBadge width={175} badgeType="yellow_wink" />
</div>
<Link
to={leftTime <= 0 ? "/findcaspergame#010643431936" : "/findcasper"}
isPathChage={false}
>
<div
className={`bg-[blue] w-[175px] h-[50px] flex items-center justify-center gap-3 mt-[60px]`}
>
<span className="text-[white] font-semibold">
캐스퍼 찾으러가기
</span>
<img
src="/assets/whiteRightShevron.svg"
alt="smileBage3D"
className="w-[10px]"
/>
</div>
</Link>
</>
),
isButtonOpen: true,
Expand All @@ -155,25 +186,6 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
{data?.title}
</div>
{data?.mainContent}
<Link
to={leftTime <= 0 ? "/findcaspergame#010643431936" : "/findcasper"}
isPathChage={false}
>
<div
className={`bg-[${
data?.isButtonOpen ? "blue" : "#CCCCCC"
}] w-[175px] h-[50px] flex items-center justify-center gap-3 mt-[60px]`}
>
<span className="text-[white] font-semibold">
캐스퍼 찾으러가기
</span>
<img
src="/assets/whiteRightShevron.svg"
alt="smileBage3D"
className="w-[10px]"
/>
</div>
</Link>
</div>
<img
src="/assets/openBackGround.svg"
Expand All @@ -185,29 +197,34 @@ const OpenEvent = forwardRef<HTMLDivElement, OpenEventProps>((props, ref) => {
});

function chechCurrentStuts(startTime: number[], endTime: number[]) {
const currentDate = new Date();
const currentTime = [
currentDate.getFullYear(),
currentDate.getMonth() + 1,
currentDate.getDate(),
currentDate.getHours(),
currentDate.getMinutes(),
];
const soonTime = [...startTime];
soonTime[3] = soonTime[3] - 1;
const eventStartTime = new Date(
startTime[0],
startTime[1] - 1,
startTime[2],
startTime[3],
startTime[4]
);
const currentTime = new Date();
const eventEndTime = new Date(
endTime[0],
endTime[1] - 1,
endTime[2],
endTime[3],
endTime[4]
);
const eventSoonTime = new Date(eventStartTime);
eventSoonTime.setHours(eventStartTime.getHours() - 1);

function isIn(startTime: number[], targetTime: number[], endTime: number[]) {
for (let i = 0; i < startTime.length; i++) {
if (startTime[i] === endTime[i] && startTime[i] === targetTime[i])
continue;
else if (startTime[i] <= targetTime[i] && targetTime[i] <= endTime[i])
return true;
else return false;
}
return false;
}
if (isIn(soonTime, currentTime, startTime)) return "soon";
else if (isIn(startTime, currentTime, endTime)) return "opened";
if (
eventSoonTime.getTime() <= currentTime.getTime() &&
currentTime.getTime() <= eventStartTime.getTime()
)
return "soon";
else if (
eventStartTime.getTime() <= currentTime.getTime() &&
currentTime.getTime() <= eventEndTime.getTime()
)
return "opened";
return "none";
}

Expand Down
Loading