-
Notifications
You must be signed in to change notification settings - Fork 0
메인 변경사항 PR 옮기기 #145
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.
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
+175
−27
Merged
메인 변경사항 PR 옮기기 #145
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
0917a52
active -> active self
wkdrudgnsdla 7880589
Merge branch 'main' of https://github.com/leesiuuuu/Project-YOYO
wkdrudgnsdla 7ebf021
Merge pull request #117 from leesiuuuu/develop
leesiuuuu 2055726
Update README.md
leesiuuuu 0e03159
Update README.md
leesiuuuu ec7cfe2
Update README.md
leesiuuuu fd9c122
feat: 자동화 파일 추가
leesiuuuu 65c30a4
feat: build.yml 파일 추가
leesiuuuu cd22b80
fix: 활성화 조건 수정
leesiuuuu d9458fa
modify: 버전 명시 수정
leesiuuuu 4eb7d1a
fix: 잘못 명시한 버전 수정
leesiuuuu d86d667
feat: CI 코드 추가
leesiuuuu 1ca7d4f
feat: 원하는 브랜치 자동 빌드 추가
leesiuuuu 9b01d14
feat: Steam AppID 파일 추가되도록 설정
leesiuuuu 6fb387b
Merge branch 'develop' of https://github.com/leesiuuuu/Push-Pull
leesiuuuu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Acquire Activation File | ||
| on: | ||
| workflow_dispatch: # 수동 실행 | ||
|
|
||
| jobs: | ||
| activation: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| # 최신 방식: unity-activate 액션만 사용합니다. | ||
| - name: Request activation file | ||
| uses: game-ci/unity-activate@v2 | ||
| id: activation | ||
| with: | ||
| unityVersion: 2022.3.21f1 # 사용하시는 유니티 버전을 명시하세요. | ||
|
|
||
| - name: Upload .alf artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: activation-file | ||
| # 위 스텝에서 생성된 .alf 파일 경로를 참조합니다. | ||
| path: ${{ steps.activation.outputs.filePath }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| name: Unity CI — Desktop Build | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main, develop ] | ||
| pull_request: | ||
| branches: [ main ] | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| UNITY_VERSION: auto | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ${{ matrix.runs-on || 'ubuntu-latest' }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - targetPlatform: StandaloneWindows64 | ||
| buildName: Windows | ||
| - targetPlatform: StandaloneLinux64 | ||
| buildName: Linux | ||
| - targetPlatform: StandaloneOSX | ||
| buildName: macOS | ||
| runs-on: macos-latest | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| lfs: true | ||
|
|
||
| - name: Cache LFS objects | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: .git/lfs/objects | ||
| key: lfs-${{ hashFiles('.lfs-assets-id') }} | ||
| restore-keys: lfs- | ||
|
|
||
| # Library 캐시 (빌드 시간 50~80% 단축) | ||
| - name: Cache Unity Library | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: Library | ||
| key: | | ||
| Library-${{ matrix.targetPlatform }}-${{ hashFiles('Assets/**','Packages/**','ProjectSettings/**') }} | ||
| restore-keys: | | ||
| Library-${{ matrix.targetPlatform }}- | ||
| Library- | ||
|
|
||
| - name: Build ${{ matrix.buildName }} | ||
| uses: game-ci/unity-builder@v4 | ||
| env: | ||
| UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} | ||
| UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} | ||
| UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} | ||
| with: | ||
| unityVersion: ${{ env.UNITY_VERSION }} | ||
| targetPlatform: ${{ matrix.targetPlatform }} | ||
| buildName: ${{ matrix.buildName }} | ||
| buildsPath: builds | ||
| buildMethod: BuildScript.BuildProject | ||
| versioning: Semantic | ||
|
|
||
| - name: Zip build output | ||
| run: | | ||
| cd builds | ||
| zip -r ${{ matrix.buildName }}.zip ${{ matrix.targetPlatform }} | ||
|
|
||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: Build-${{ matrix.buildName }}-${{ github.sha }} | ||
| path: builds/${{ matrix.buildName }}.zip | ||
| retention-days: 14 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| name: Automated Build ⭐ | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ main, develop ] | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| buildWindows: | ||
| name: 💻 Windows-64 Bit | ||
| runs-on: windows-latest | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| lfs: true | ||
|
|
||
| - name: Cache Unity Library | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: Library | ||
| key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} | ||
| restore-keys: | | ||
| Library- | ||
|
|
||
| - name: Build project | ||
| uses: game-ci/unity-builder@v4 | ||
| env: | ||
| UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} | ||
| UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} | ||
| UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} | ||
| with: | ||
| targetPlatform: StandaloneWindows64 | ||
|
|
||
| # 빌드 파일 내부에 스팀 앱 ID 추가 | ||
| - name: Create steam_appid.txt | ||
| shell: pwsh | ||
| run: | | ||
| # 480은 테스트용 ID입니다. 실제 ID가 있다면 수정하세요. | ||
| $buildPath = "build/StandaloneWindows64/steam_appid.txt" | ||
| echo "480" > $buildPath | ||
| Write-Host "Created steam_appid.txt at $buildPath" | ||
|
|
||
| - name: Upload artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: Windows-Build-${{ github.run_number }} | ||
| path: build/StandaloneWindows64 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,33 +87,29 @@ | |
|
|
||
| --- | ||
|
|
||
| 스테이지는 총 3개이다. | ||
| 총 6개의 맵이 존재한다. | ||
|
|
||
| 각 스테이지는 3개의 기능 중 하나를 사용해 클리어하는 것을 목표로 한다. | ||
|
|
||
| 한 스테이지당 5개의 맵이 존재한다. | ||
|
|
||
| 1스테이지는 튜토리얼 맵으로 구성한다. | ||
| > 튜토리얼 맵 하나, 기본 맵 5개 | ||
|
|
||
| - 1스테이지 | ||
|
|
||
| <img width="493" alt="33" src="https://github.com/user-attachments/assets/50d3dc59-df93-424d-9db6-deaf8cb42e80" /> | ||
| <img width="493" alt="33" src="https://github.com/user-attachments/assets/01d30832-ebf6-468c-a9ed-35e3f2f430ba" /> | ||
|  | ||
|
|
||
| - 2스테이지 | ||
| <img width="493" alt="33" src="https://github.com/user-attachments/assets/d6b34995-be6b-41bc-9a56-e2e008310e3f" /> | ||
|
|
||
|  | ||
|
|
||
| - 3스테이지 | ||
|
|
||
| <img width="638" alt="image4" src="https://github.com/user-attachments/assets/2d00d39f-7f2e-4dd2-94cd-2529d175b1f0" /> | ||
|  | ||
|
|
||
| - 4스테이지 | ||
|
|
||
|  | ||
|  | ||
|
|
||
|
|
||
| - 5스테이지 | ||
| <img width="626" alt="image6" src="https://github.com/user-attachments/assets/979363a9-b5f4-4dba-a33d-316045d4d1b7" /> | ||
|  | ||
|
|
||
|
|
||
| ## 2.게임 컨텐츠 | ||
|
|
@@ -122,16 +118,14 @@ | |
| ## 2-1.메인 컨텐츠 | ||
|
|
||
|
|
||
| 스테이지마다 바뀌는 능력을 활용하여, 다른 플레이어와의 협동을 통해 해당 스테이지의 함정등을 파회하며 모든 스테이지를 클리어한다 | ||
| 각 맵마다 플레이어와 협동하여 열쇠를 얻고, 다음 스테이지로 이동하는 문을 찾는다. | ||
|
|
||
| ## 2-2.서브 컨텐츠 | ||
|
|
||
|
|
||
| 팀킬이 가능할만한 요소 추가 | ||
| 팀원을 밀치거나 당길 수 있게 해 협동심을 더욱 끌어올린다. | ||
|
|
||
| ## 2-3.엔딩 | ||
|
|
||
|
|
||
| 모든 스테이지 클리어 이후 엔딩크래딧 | ||
|
|
||
| # 3.기능 | ||
|
|
@@ -143,17 +137,17 @@ | |
|
|
||
| **밀치는 장갑**:**일정 게이지를 차징 이후 차징된 양에 따라 다른 플레이어를 밀친다** | ||
|
|
||
| 이런 느낌으로 초록색 위치일때 가장 큰 파워로 밀치게 된다 | ||
| 아래 이미지처럼 왼쪽에서 오른쪽으로 막대바가 이동하게 된다. | ||
| 맨 오른쪽에 있을 때 최대 파워로 대상을 밀친다. | ||
|
|
||
|  | ||
|  | ||
|
|
||
| **끌어오는 장갑: 일정 키를 누를시 그랩 방향이 위아래로 움직인다** | ||
|
|
||
|  | ||
|
|
||
| 사거리가 점점 늘어나고 일정 길이에 도달하면 약 0.1초간 유지되다 취소된다 | ||
| 아래 이미지처럼 키를 누를 시 화살표가 나타나며 위 아래로 움직이게 된다. | ||
| 키를 땔 시 화살표 방향으로 장갑이 날아간다. | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| 0.1초 뒤 취소되는건 가장 먼 사거리일때 타이밍을 잡는 재미요소를 위함 | ||
|  | ||
|
|
||
| # 스테이지 기믹 | ||
|
|
||
|
|
@@ -187,10 +181,14 @@ ex) | |
|
|
||
| ### 사용 리소스 출처 | ||
|
|
||
| https://assetstore.unity.com/packages/audio/music/8bit-music-album-051321-196147?srsltid=AfmBOorUaI9I9A3xIVTbJrYxmE4YKiXcARvwuUVgmaYW7bfbbCA8MfEC | ||
| [음악 에셋 1](https://assetstore.unity.com/packages/audio/music/8bit-music-album-051321-196147?srsltid=AfmBOorUaI9I9A3xIVTbJrYxmE4YKiXcARvwuUVgmaYW7bfbbCA8MfEC) | ||
|
|
||
| [음악 에셋 2](https://assetstore.unity.com/packages/audio/music/8bit-music-062022-225623) | ||
|
|
||
| [효과음 에셋 1](https://assetstore.unity.com/packages/audio/sound-fx/free-casual-game-sfx-pack-54116?srsltid=AfmBOopJ7WwyLVu7pqzrAfKBiJYI2TC9F8KAzT2ko1LZ553kCIdCbzqX) | ||
|
|
||
| https://assetstore.unity.com/packages/audio/music/8bit-music-062022-225623 | ||
| [효과음 에셋 2](https://www.kenney.nl/assets/ui-audio) | ||
|
|
||
| https://assetstore.unity.com/packages/audio/sound-fx/free-casual-game-sfx-pack-54116?srsltid=AfmBOopJ7WwyLVu7pqzrAfKBiJYI2TC9F8KAzT2ko1LZ553kCIdCbzqX | ||
| [그래픽 에셋](https://kenney.nl/assets/1-bit-platformer-pack) | ||
|
|
||
| https://www.kenney.nl/assets/ui-audio | ||
| [버튼 그래피 에셋](https://kenney.nl/assets/input-prompts-pixel-16) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
문서 상단에는 총 6개의 맵(튜토리얼 1개, 기본 맵 5개)이 있다고 설명되어 있으나, 아래 목록에는 5스테이지까지만 나열되어 있어 정보가 일치하지 않습니다. 설명에 맞게 6스테이지를 추가하거나 전체 맵 개수 설명을 수정해 주세요.