mirror of
https://github.com/boudji-ludwig-pett/cnam-geometry-dash.git
synced 2025-06-27 11:58:51 +02:00
Compare commits
9 Commits
v1.0.0-sta
...
e0b7ec84fd
Author | SHA1 | Date | |
---|---|---|---|
e0b7ec84fd | |||
fb89b825e1 | |||
a8194fbe5c | |||
29f352513e | |||
ee11e683f6 | |||
fb107f9020 | |||
efeae89ac3 | |||
a7a527cfcc | |||
54be935d7c |
@ -7,7 +7,7 @@ charset = utf-8
|
||||
indent_style = space
|
||||
end_of_line = lf
|
||||
|
||||
[*.asmdef]
|
||||
[*.{json,jsonc,asmdef}]
|
||||
indent_size = 4
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
@ -28,11 +28,6 @@ indent_style = tab
|
||||
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
|
||||
indent_size = 2
|
||||
|
||||
[*.{json,jsonc}]
|
||||
indent_size = 2
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[*.builds]
|
||||
indent_size = 2
|
||||
|
||||
|
168
.github/workflows/ci.yml
vendored
168
.github/workflows/ci.yml
vendored
@ -2,20 +2,16 @@ name: "ci"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [develop, staging, main]
|
||||
branches: [develop]
|
||||
pull_request:
|
||||
branches: [develop, staging, main]
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
pull-requests: write
|
||||
|
||||
jobs:
|
||||
lint-commit:
|
||||
runs-on: "ubuntu-latest"
|
||||
steps:
|
||||
- uses: "actions/checkout@v4.2.2"
|
||||
- uses: "wagoid/commitlint-github-action@v6.2.1"
|
||||
- uses: "wagoid/commitlint-github-action@v6.1.2"
|
||||
|
||||
lint-editorconfig-checker:
|
||||
runs-on: "ubuntu-latest"
|
||||
@ -24,80 +20,38 @@ jobs:
|
||||
- uses: "editorconfig-checker/action-editorconfig-checker@main"
|
||||
- run: "editorconfig-checker"
|
||||
|
||||
build-windows:
|
||||
# test:
|
||||
# permissions:
|
||||
# checks: "write"
|
||||
# runs-on: "ubuntu-latest"
|
||||
# steps:
|
||||
# - uses: "actions/checkout@v4.2.2"
|
||||
# with:
|
||||
# lfs: true
|
||||
|
||||
# - uses: "actions/cache@v4.2.0"
|
||||
# with:
|
||||
# path: "Library"
|
||||
# key: "Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}"
|
||||
# restore-keys: |
|
||||
# "Library-"
|
||||
|
||||
# - uses: "game-ci/unity-test-runner@v4.3.1"
|
||||
# env:
|
||||
# UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||
# UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
|
||||
# UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
|
||||
# with:
|
||||
# githubToken: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
build:
|
||||
runs-on: "ubuntu-latest"
|
||||
outputs:
|
||||
build-path: ${{ steps.upload.outputs.path }}
|
||||
steps:
|
||||
- uses: "actions/checkout@v4.2.2"
|
||||
with:
|
||||
lfs: true
|
||||
|
||||
- uses: "actions/cache@v4.2.3"
|
||||
with:
|
||||
path: "Library"
|
||||
key: "Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}"
|
||||
restore-keys: |
|
||||
"Library-"
|
||||
|
||||
- uses: "game-ci/unity-builder@v4.3.0"
|
||||
env:
|
||||
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
|
||||
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
|
||||
with:
|
||||
targetPlatform: "StandaloneWindows64"
|
||||
|
||||
- name: Upload Windows Build Artifact
|
||||
id: upload
|
||||
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
|
||||
uses: actions/upload-artifact@v4.4.3
|
||||
with:
|
||||
name: build-windows
|
||||
path: build/
|
||||
|
||||
build-macos:
|
||||
runs-on: "ubuntu-latest"
|
||||
outputs:
|
||||
build-path: ${{ steps.upload.outputs.path }}
|
||||
steps:
|
||||
- uses: "actions/checkout@v4.2.2"
|
||||
with:
|
||||
lfs: true
|
||||
|
||||
- uses: "actions/cache@v4.2.3"
|
||||
with:
|
||||
path: "Library"
|
||||
key: "Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}"
|
||||
restore-keys: |
|
||||
"Library-"
|
||||
|
||||
- uses: "game-ci/unity-builder@v4.3.0"
|
||||
env:
|
||||
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
|
||||
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
|
||||
with:
|
||||
targetPlatform: "StandaloneOSX"
|
||||
|
||||
- name: Upload macOS Build Artifact
|
||||
id: upload
|
||||
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
|
||||
uses: actions/upload-artifact@v4.3.0
|
||||
with:
|
||||
name: build-macos
|
||||
path: build/
|
||||
|
||||
build-linux:
|
||||
runs-on: "ubuntu-latest"
|
||||
outputs:
|
||||
build-path: ${{ steps.upload.outputs.path }}
|
||||
steps:
|
||||
- uses: "actions/checkout@v4.2.2"
|
||||
with:
|
||||
lfs: true
|
||||
|
||||
- uses: "actions/cache@v4.2.3"
|
||||
- uses: "actions/cache@v4.2.0"
|
||||
with:
|
||||
path: "Library"
|
||||
key: "Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}"
|
||||
@ -112,65 +66,7 @@ jobs:
|
||||
with:
|
||||
targetPlatform: "StandaloneLinux64"
|
||||
|
||||
- name: Upload Linux Build Artifact
|
||||
id: upload
|
||||
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
|
||||
uses: actions/upload-artifact@v4.6.2
|
||||
with:
|
||||
name: build-linux
|
||||
path: build/
|
||||
|
||||
create-release:
|
||||
needs: [build-windows, build-macos, build-linux]
|
||||
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Get version from commit message
|
||||
id: get_version
|
||||
run: |
|
||||
COMMIT_MESSAGE="${{ github.event.head_commit.message }}"
|
||||
# Extract the version number after "chore(release): "
|
||||
VERSION=$(echo "$COMMIT_MESSAGE" | sed -n 's/^chore(release): \(v[0-9]*\.[0-9]*\.[0-9]*[-a-zA-Z0-9.]*\).*$/\1/p')
|
||||
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
|
||||
shell: bash
|
||||
|
||||
- name: Download Windows Build Artifact
|
||||
uses: actions/download-artifact@v4.3.0
|
||||
with:
|
||||
name: build-windows
|
||||
path: build/windows
|
||||
|
||||
- name: Download macOS Build Artifact
|
||||
uses: actions/download-artifact@v4.3.0
|
||||
with:
|
||||
name: build-macos
|
||||
path: build/macos
|
||||
|
||||
- name: Download Linux Build Artifact
|
||||
uses: actions/download-artifact@v4.3.0
|
||||
with:
|
||||
name: build-linux
|
||||
path: build/linux
|
||||
|
||||
- name: Zip Builds
|
||||
run: |
|
||||
cd build/windows
|
||||
zip -r ../windows.zip .
|
||||
cd ../macos
|
||||
zip -r ../macos.zip .
|
||||
cd ../linux
|
||||
zip -r ../linux.zip .
|
||||
|
||||
- name: Create GitHub Release
|
||||
id: create_release
|
||||
uses: softprops/action-gh-release@v2.2.2
|
||||
with:
|
||||
tag_name: ${{ steps.get_version.outputs.version }}
|
||||
name: ${{ steps.get_version.outputs.version }}
|
||||
body: |
|
||||
🎮 Automatic ${{ github.ref == 'refs/heads/main' && 'Production' || 'Pre-release' }} build
|
||||
prerelease: ${{ github.ref != 'refs/heads/main' }}
|
||||
files: |
|
||||
build/windows.zip
|
||||
build/macos.zip
|
||||
build/linux.zip
|
||||
# - uses: "actions/upload-artifact@v4.4.3"
|
||||
# with:
|
||||
# name: "Build"
|
||||
# path: "build"
|
||||
|
14
.vscode/extensions.json
vendored
14
.vscode/extensions.json
vendored
@ -1,9 +1,9 @@
|
||||
{
|
||||
"recommendations": [
|
||||
"editorconfig.editorconfig",
|
||||
"jebbs.plantuml",
|
||||
"visualstudiotoolsforunity.vstuc",
|
||||
"ms-dotnettools.csharp",
|
||||
"ms-dotnettools.csdevkit"
|
||||
]
|
||||
"recommendations": [
|
||||
"editorconfig.editorconfig",
|
||||
"jebbs.plantuml",
|
||||
"visualstudiotoolsforunity.vstuc",
|
||||
"ms-dotnettools.csharp",
|
||||
"ms-dotnettools.csdevkit"
|
||||
]
|
||||
}
|
||||
|
16
.vscode/launch.json
vendored
16
.vscode/launch.json
vendored
@ -1,10 +1,10 @@
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Attach to Unity",
|
||||
"type": "vstuc",
|
||||
"request": "attach"
|
||||
}
|
||||
]
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Attach to Unity",
|
||||
"type": "vstuc",
|
||||
"request": "attach"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
16
.vscode/settings.json
vendored
16
.vscode/settings.json
vendored
@ -1,10 +1,10 @@
|
||||
{
|
||||
"editor.bracketPairColorization.enabled": true,
|
||||
"editor.wordWrap": "on",
|
||||
"[csharp]": {
|
||||
"editor.tabSize": 4,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.formatOnType": true
|
||||
},
|
||||
"omnisharp.useModernNet": false
|
||||
"editor.bracketPairColorization.enabled": true,
|
||||
"editor.wordWrap": "on",
|
||||
"[csharp]": {
|
||||
"editor.tabSize": 4,
|
||||
"editor.formatOnSave": true,
|
||||
"editor.formatOnType": true
|
||||
},
|
||||
"omnisharp.useModernNet": false
|
||||
}
|
||||
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
RegularBlock01_0: 229215520534054086
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e0426acdd6d763946bab617252a0f5aa
|
||||
guid: b51d2de513d090b4485816dbca782498
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 1925945982471551178
|
||||
second: BlankSquare 1_0
|
||||
213: 6385790085498839582
|
||||
second: BlankSquare_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -100,7 +100,7 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: BlankSquare 1_0
|
||||
name: BlankSquare_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -115,8 +115,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: ac8becdbaa55aba10800000000000000
|
||||
internalID: 1925945982471551178
|
||||
spriteID: e12ae58df32ee9850800000000000000
|
||||
internalID: 6385790085498839582
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -134,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
BlankSquare 1_0: 1925945982471551178
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fa5971280ed90e04cafadbd76400bed2
|
||||
guid: eed5a0d2b4493ec4ca90bb1bd7316047
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 6385790085498839582
|
||||
second: BlankSquare_0
|
||||
213: -8811806715494619191
|
||||
second: ExitButton_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -113,13 +113,13 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: BlankSquare_0
|
||||
name: ExitButton_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 512
|
||||
height: 512
|
||||
x: 143
|
||||
y: 123
|
||||
width: 284
|
||||
height: 252
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -128,8 +128,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: e12ae58df32ee9850800000000000000
|
||||
internalID: 6385790085498839582
|
||||
spriteID: 9c7aa8daa7c26b580800000000000000
|
||||
internalID: -8811806715494619191
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -148,7 +148,7 @@ TextureImporter:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
BlankSquare_0: 6385790085498839582
|
||||
ExitButton_0: -8811806715494619191
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
NewLevelButton 1_0: 4829622404114481491
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: afd28cff37c57da4090ac3ddfdb8ee28
|
||||
guid: 7b0f71ceca28c434ca33829e4a13b313
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -4781373940957465942
|
||||
second: exit_0
|
||||
213: -1958676783162264248
|
||||
second: PlayButton_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -113,13 +113,13 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: exit_0
|
||||
name: PlayButton_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 31
|
||||
y: 31
|
||||
width: 298
|
||||
height: 298
|
||||
x: 280
|
||||
y: 180
|
||||
width: 503
|
||||
height: 545
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -128,8 +128,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: aa2bbe6cbb525adb0800000000000000
|
||||
internalID: -4781373940957465942
|
||||
spriteID: 845fecdd7d161d4e0800000000000000
|
||||
internalID: -1958676783162264248
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -148,7 +148,7 @@ TextureImporter:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
exit_0: -4781373940957465942
|
||||
PlayButton_0: -1958676783162264248
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
SaveButton_0: 2079131731516339571
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f34830d17508a4b478c164611c202e12
|
||||
guid: 2937fecef4993e64cb555077cf09d377
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 229215520534054086
|
||||
second: RegularBlock01_0
|
||||
213: -1655109142887154325
|
||||
second: SettingsButton_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -113,13 +113,13 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: RegularBlock01_0
|
||||
name: SettingsButton_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 122
|
||||
height: 122
|
||||
x: 63
|
||||
y: 133
|
||||
width: 233
|
||||
height: 92
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -128,8 +128,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 6c4407e2d465e2300800000000000000
|
||||
internalID: 229215520534054086
|
||||
spriteID: b6db5b1f00fd709e0800000000000000
|
||||
internalID: -1655109142887154325
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -148,7 +148,7 @@ TextureImporter:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
RegularBlock01_0: 229215520534054086
|
||||
SettingsButton_0: -1655109142887154325
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 103 KiB |
@ -1,156 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1b21bd4ccae70934eb86a3a2a6928e98
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -4781373940957465942
|
||||
second: exit_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: exit_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 31
|
||||
y: 31
|
||||
width: 298
|
||||
height: 298
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: aa2bbe6cbb525adb0800000000000000
|
||||
internalID: -4781373940957465942
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
exit_0: -4781373940957465942
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7fe0358ef92ff8a449d0bee123119795
|
||||
guid: 4874b4932ea8df273aafe2c64ec3e05a
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 2079131731516339571
|
||||
second: SaveButton_0
|
||||
213: -8878088185706026076
|
||||
second: pause_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -113,13 +113,13 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: SaveButton_0
|
||||
name: pause_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 980
|
||||
height: 982
|
||||
width: 256
|
||||
height: 256
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -128,8 +128,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 375364a4b4f8adc10800000000000000
|
||||
internalID: 2079131731516339571
|
||||
spriteID: 4ab666e45d1bac480800000000000000
|
||||
internalID: -8878088185706026076
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -148,7 +148,7 @@ TextureImporter:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
SaveButton_0: 2079131731516339571
|
||||
pause_0: -8878088185706026076
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 10 KiB |
@ -1,156 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bcd6c4da7709ff9458a5784f7f807e30
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -2073137460773038770
|
||||
second: PauseIcon_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: PauseIcon_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 17
|
||||
y: 19
|
||||
width: 239
|
||||
height: 218
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: e455110a67cba33e0800000000000000
|
||||
internalID: -2073137460773038770
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
PauseIcon_0: -2073137460773038770
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
RegularPlatform01_0: 3787390808643081465
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -1,10 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6b64c942662170e44b2f80d605a405f4
|
||||
guid: c51e366cbbc7cd534a9788dd491e8086
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -2073137460773038770
|
||||
second: PauseIcon_0
|
||||
213: 6208176927266180224
|
||||
second: Play_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
@ -113,13 +113,13 @@ TextureImporter:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: PauseIcon_0
|
||||
name: Play_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 17
|
||||
y: 19
|
||||
x: 7
|
||||
y: 7
|
||||
width: 239
|
||||
height: 218
|
||||
height: 238
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -128,8 +128,8 @@ TextureImporter:
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: e455110a67cba33e0800000000000000
|
||||
internalID: -2073137460773038770
|
||||
spriteID: 08c0a74e500e72650800000000000000
|
||||
internalID: 6208176927266180224
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
@ -148,7 +148,7 @@ TextureImporter:
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
PauseIcon_0: -2073137460773038770
|
||||
Play_0: 6208176927266180224
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 48 KiB |
@ -1,156 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23d8ef624fc9e5f3fa3f695b9385f5cc
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -8770034739519435172
|
||||
second: PlayIcon_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: PlayIcon_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 26
|
||||
y: 27
|
||||
width: 206
|
||||
height: 199
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: c5ecb1bbed39a4680800000000000000
|
||||
internalID: -8770034739519435172
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
PlayIcon_0: -8770034739519435172
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
CubePortalLabelled_0: -799402021850825835
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
@ -96,19 +96,6 @@ TextureImporter:
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
@ -147,8 +134,7 @@ TextureImporter:
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
ShipPortalLabelled_0: -1834338360412052916
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 16 KiB |
@ -1,156 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79b56765ff1452848bd947d19c642244
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -6564193165698205349
|
||||
second: Remove_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Remove_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 512
|
||||
height: 512
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: b59f289281d47e4a0800000000000000
|
||||
internalID: -6564193165698205349
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable:
|
||||
Remove_0: -6564193165698205349
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 1.4 MiB |
@ -1,155 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7941bec4ab82ba5f8a978cf1b4d91010
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: 1404028623067837608
|
||||
second: Logo_0
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Logo_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1024
|
||||
height: 1024
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
customData:
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 8a47074089c1c7310800000000000000
|
||||
internalID: 1404028623067837608
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1,136 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &4469289624494365187
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8964879669643113576}
|
||||
- component: {fileID: 5612594502755166219}
|
||||
- component: {fileID: 1469510466419132587}
|
||||
m_Layer: 0
|
||||
m_Name: Ground
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8964879669643113576
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4469289624494365187}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -15.92, y: -5.7, z: 0}
|
||||
m_LocalScale: {x: 1, y: 0.8581, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &5612594502755166219
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4469289624494365187}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -2257217325195158302, guid: a192a62ef32304b4182909c80a175f39, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 5.12, y: 5.12}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!61 &1469510466419132587
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4469289624494365187}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_ForceSendLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ForceReceiveLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ContactCaptureLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_CompositeOperation: 0
|
||||
m_CompositeOrder: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 5.12, y: 5.12}
|
||||
newSize: {x: 5.12, y: 5.12}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 5.12, y: 5.12}
|
||||
m_EdgeRadius: 0
|
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 052f6240a620828cea410bf389122be0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -202,7 +202,7 @@ BoxCollider2D:
|
||||
m_UsedByEffector: 0
|
||||
m_CompositeOperation: 0
|
||||
m_CompositeOrder: 0
|
||||
m_Offset: {x: -0.0040085316, y: -0.35639262}
|
||||
m_Offset: {x: -0.0040085316, y: -0.985047}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
@ -212,7 +212,7 @@ BoxCollider2D:
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 5.1211915, y: 4.4239116}
|
||||
m_Size: {x: 5.1211915, y: 2.672097}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &4179475610744468388
|
||||
GameObject:
|
||||
@ -280,7 +280,7 @@ BoxCollider2D:
|
||||
m_UsedByEffector: 0
|
||||
m_CompositeOperation: 0
|
||||
m_CompositeOrder: 0
|
||||
m_Offset: {x: 0.0038814545, y: 2.4709496}
|
||||
m_Offset: {x: -0.004009247, y: 1.7748187}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
@ -290,5 +290,5 @@ BoxCollider2D:
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 5.1474953, y: 0.20310307}
|
||||
m_Size: {x: 5.121194, y: 1.4569769}
|
||||
m_EdgeRadius: 0
|
||||
|
@ -122,7 +122,7 @@ BoxCollider2D:
|
||||
m_UsedByEffector: 0
|
||||
m_CompositeOperation: 0
|
||||
m_CompositeOrder: 0
|
||||
m_Offset: {x: 0.0058231354, y: 0.09898627}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
@ -132,5 +132,5 @@ BoxCollider2D:
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 0.97265434, y: 3.202761}
|
||||
m_Size: {x: 0.6, y: 1.06}
|
||||
m_EdgeRadius: 0
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bdddba7e4ac5baa4e833a5e67122d0d3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 200c916866fde6f4bb0123b72f22771f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -543,8 +543,6 @@ MonoBehaviour:
|
||||
playerObject: {fileID: 1267397455}
|
||||
normalMinYFollow: 2
|
||||
shipMinYFollow: 6
|
||||
smoothSpeed: 5
|
||||
isPlaying: 1
|
||||
--- !u!1 &521952199
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6222,7 +6220,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -2073137460773038770, guid: bcd6c4da7709ff9458a5784f7f807e30, type: 3}
|
||||
m_Sprite: {fileID: -8878088185706026076, guid: 4874b4932ea8df273aafe2c64ec3e05a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -6275,6 +6273,140 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1235900592
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1235900594}
|
||||
- component: {fileID: 1235900593}
|
||||
- component: {fileID: 1235900595}
|
||||
m_Layer: 0
|
||||
m_Name: Ground
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!212 &1235900593
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1235900592}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 0
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 0
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Sprite: {fileID: -2257217325195158302, guid: a192a62ef32304b4182909c80a175f39, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
m_FlipY: 0
|
||||
m_DrawMode: 0
|
||||
m_Size: {x: 5.12, y: 5.12}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!4 &1235900594
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1235900592}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 353.61, y: -5.69, z: 0}
|
||||
m_LocalScale: {x: 150, y: 0.8581, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &1235900595
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1235900592}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_ForceSendLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ForceReceiveLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ContactCaptureLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_CompositeOperation: 0
|
||||
m_CompositeOrder: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 5.12, y: 5.12}
|
||||
newSize: {x: 5.12, y: 5.12}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
m_Size: {x: 5.12, y: 5.12}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1 &1267397455
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -6319,9 +6451,9 @@ Rigidbody2D:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_Interpolate: 0
|
||||
m_SleepingMode: 0
|
||||
m_CollisionDetection: 1
|
||||
m_Constraints: 4
|
||||
m_SleepingMode: 1
|
||||
m_CollisionDetection: 0
|
||||
m_Constraints: 0
|
||||
--- !u!212 &1267397457
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7026,7 +7158,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: -8770034739519435172, guid: 23d8ef624fc9e5f3fa3f695b9385f5cc, type: 3}
|
||||
m_Sprite: {fileID: 6208176927266180224, guid: c51e366cbbc7cd534a9788dd491e8086, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@ -7471,6 +7603,7 @@ SceneRoots:
|
||||
m_Roots:
|
||||
- {fileID: 519420032}
|
||||
- {fileID: 1267397458}
|
||||
- {fileID: 1235900594}
|
||||
- {fileID: 1999482187}
|
||||
- {fileID: 1371294550}
|
||||
- {fileID: 521952202}
|
||||
|
@ -1,20 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class CameraController : MonoBehaviour
|
||||
{
|
||||
public float moveSpeed = 10f;
|
||||
|
||||
void Update()
|
||||
{
|
||||
float horizontalInput = Input.GetAxisRaw("Horizontal"); // ← → ou A D
|
||||
float verticalInput = Input.GetAxisRaw("Vertical"); // ↑ ↓ ou W S
|
||||
|
||||
Vector3 movement = new Vector3(
|
||||
horizontalInput * moveSpeed * Time.deltaTime,
|
||||
verticalInput * moveSpeed * Time.deltaTime,
|
||||
0f
|
||||
);
|
||||
|
||||
Camera.main.transform.position += movement;
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74af3e3f2c02bde43b24c2f56589d071
|
@ -1,38 +1,30 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
|
||||
public class NormalGameMode : IGameMode
|
||||
{
|
||||
private const float HorizontalSpeed = 8.6f;
|
||||
private const float JumpForce = 26.6581f;
|
||||
private const KeyCode JumpKey = KeyCode.Space;
|
||||
private bool isRotating = false;
|
||||
private float targetRotationAngle = 0f;
|
||||
private readonly float rotationSpeed = 360f;
|
||||
|
||||
public void Update(Player player)
|
||||
{
|
||||
player.RigidBody.linearVelocity = new Vector2(HorizontalSpeed * player.SpeedMultiplier, player.RigidBody.linearVelocity.y);
|
||||
|
||||
|
||||
if (player.IsColliding && Input.GetKey(JumpKey) && !isRotating)
|
||||
if (player.HasStarted && player.IsColliding && Input.GetKey(JumpKey) && player.CanJump)
|
||||
{
|
||||
Jump(player);
|
||||
}
|
||||
|
||||
if (isRotating)
|
||||
{
|
||||
PerformRotation(player);
|
||||
}
|
||||
|
||||
if (!IsJumping(player))
|
||||
{
|
||||
AlignRotation(player);
|
||||
player.Particle.gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
player.Particle.gameObject.SetActive(false);
|
||||
player.Transform.Rotate(Vector3.back * 360 * Time.deltaTime);
|
||||
}
|
||||
|
||||
UpdateParticlePositionAndRotation(player);
|
||||
@ -42,26 +34,7 @@ public class NormalGameMode : IGameMode
|
||||
{
|
||||
player.RigidBody.linearVelocity = new Vector2(player.RigidBody.linearVelocity.x, 0);
|
||||
player.RigidBody.AddForce(Vector2.up * JumpForce, ForceMode2D.Impulse);
|
||||
if (player.LevelsLoader != null)
|
||||
{
|
||||
player.LevelsLoader.IncreaseTotalJumps();
|
||||
}
|
||||
isRotating = true;
|
||||
targetRotationAngle = player.transform.eulerAngles.z - 90f;
|
||||
}
|
||||
|
||||
private void PerformRotation(Player player)
|
||||
{
|
||||
float rotationThisFrame = rotationSpeed * Time.deltaTime;
|
||||
float newRotation = Mathf.MoveTowardsAngle(player.transform.eulerAngles.z, targetRotationAngle, rotationThisFrame);
|
||||
player.transform.rotation = Quaternion.Euler(0, 0, newRotation);
|
||||
|
||||
if (Mathf.Abs(Mathf.DeltaAngle(newRotation, targetRotationAngle)) < 0.1f)
|
||||
{
|
||||
player.transform.rotation = Quaternion.Euler(0, 0, targetRotationAngle);
|
||||
isRotating = false;
|
||||
AlignRotation(player);
|
||||
}
|
||||
player.LevelsLoader.IncreaseTotalJumps();
|
||||
}
|
||||
|
||||
private bool IsJumping(Player player)
|
||||
@ -71,21 +44,21 @@ public class NormalGameMode : IGameMode
|
||||
|
||||
private void AlignRotation(Player player)
|
||||
{
|
||||
Vector3 rotation = player.transform.eulerAngles;
|
||||
Vector3 rotation = player.Transform.rotation.eulerAngles;
|
||||
rotation.z = Mathf.Round(rotation.z / 90) * 90;
|
||||
player.transform.rotation = Quaternion.Euler(rotation);
|
||||
player.Transform.rotation = Quaternion.Euler(rotation);
|
||||
}
|
||||
|
||||
private void UpdateParticlePositionAndRotation(Player player)
|
||||
{
|
||||
player.Particle.transform.position =
|
||||
player.transform.position + new Vector3(-0.19f, -0.64f, -10);
|
||||
player.Particle.transform.position = player.Transform.position + new Vector3(-0.19f, -0.64f, -10);
|
||||
player.Particle.transform.rotation = Quaternion.Euler(0, 0, 150.464f);
|
||||
}
|
||||
|
||||
public void OnCollisionEnter(Player player, Collision2D collision)
|
||||
{
|
||||
player.IsColliding = true;
|
||||
player.CanJump = true;
|
||||
|
||||
if (collision.gameObject.CompareTag("Kill"))
|
||||
{
|
||||
|
@ -16,7 +16,7 @@ public class ShipGameMode : IGameMode
|
||||
|
||||
bool jumpPressed = Input.GetKey(JumpKey);
|
||||
|
||||
if (jumpPressed)
|
||||
if (player.HasStarted && jumpPressed)
|
||||
{
|
||||
Jump(player);
|
||||
|
||||
@ -49,9 +49,7 @@ public class ShipGameMode : IGameMode
|
||||
{
|
||||
float angle = player.Transform.rotation.eulerAngles.z;
|
||||
if (angle > 180f)
|
||||
{
|
||||
angle -= 360f;
|
||||
}
|
||||
return angle;
|
||||
}
|
||||
|
||||
@ -59,10 +57,7 @@ public class ShipGameMode : IGameMode
|
||||
{
|
||||
player.RigidBody.linearVelocity = new Vector2(player.RigidBody.linearVelocity.x, 0);
|
||||
player.RigidBody.AddForce(Vector2.up * JumpForce, ForceMode2D.Impulse);
|
||||
if (player.LevelsLoader != null)
|
||||
{
|
||||
player.LevelsLoader.IncreaseTotalJumps();
|
||||
}
|
||||
player.LevelsLoader.IncreaseTotalJumps();
|
||||
}
|
||||
|
||||
public void OnCollisionEnter(Player player, Collision2D collision)
|
||||
|
@ -1,147 +0,0 @@
|
||||
using UnityEngine;
|
||||
using System.IO;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using SimpleFileBrowser;
|
||||
using TMPro;
|
||||
|
||||
[RequireComponent(typeof(LevelEditor))]
|
||||
public class JSONExporter : MonoBehaviour
|
||||
{
|
||||
public TMP_Text statusText;
|
||||
private LevelEditor editor;
|
||||
private string levelsFolder;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
editor = GetComponent<LevelEditor>();
|
||||
levelsFolder = Path.Combine(Application.dataPath, "Resources/Levels");
|
||||
if (!Directory.Exists(levelsFolder))
|
||||
Directory.CreateDirectory(levelsFolder);
|
||||
|
||||
if (statusText == null)
|
||||
{
|
||||
var statusObj = GameObject.Find("StatusText");
|
||||
if (statusObj != null)
|
||||
statusText = statusObj.GetComponent<TMP_Text>();
|
||||
}
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
SetStatus("Ready to export...", Color.white);
|
||||
}
|
||||
|
||||
public void ExportJSON()
|
||||
{
|
||||
SetStatus("Exporting...", Color.yellow);
|
||||
StartCoroutine(ShowSaveDialog());
|
||||
}
|
||||
|
||||
private IEnumerator ShowSaveDialog()
|
||||
{
|
||||
yield return FileBrowser.WaitForSaveDialog(
|
||||
FileBrowser.PickMode.Files,
|
||||
false,
|
||||
levelsFolder,
|
||||
"NewLevel.json",
|
||||
"Save Level JSON",
|
||||
"Save"
|
||||
);
|
||||
|
||||
if (!FileBrowser.Success)
|
||||
{
|
||||
SetStatus("Save canceled.", Color.red);
|
||||
yield break;
|
||||
}
|
||||
|
||||
string chosenPath = FileBrowser.Result[0];
|
||||
string fileName = Path.GetFileNameWithoutExtension(chosenPath);
|
||||
string destPath = Path.Combine(levelsFolder, fileName + ".json");
|
||||
|
||||
var elements = new List<SerializableElement>();
|
||||
var allCols = Object.FindObjectsByType<Collider2D>(FindObjectsSortMode.None);
|
||||
foreach (var col in allCols)
|
||||
{
|
||||
var go = col.gameObject;
|
||||
if (!go.name.Contains("(Clone)") || go.name.ToLower().Contains("ground"))
|
||||
continue;
|
||||
|
||||
Vector3 scale = go.transform.localScale;
|
||||
Vector3 pos = go.transform.position;
|
||||
|
||||
elements.Add(new SerializableElement
|
||||
{
|
||||
type = go.name.Replace("(Clone)", ""),
|
||||
x = Mathf.Round(pos.x * 100f) / 100f,
|
||||
y = Mathf.Round(pos.y * 100f) / 100f,
|
||||
scaleX = Mathf.Round(scale.x * 100f) / 100f,
|
||||
scaleY = Mathf.Round(scale.y * 100f) / 100f
|
||||
});
|
||||
}
|
||||
|
||||
if (elements.Count == 0)
|
||||
{
|
||||
SetStatus("No elements to export.", Color.red);
|
||||
yield break;
|
||||
}
|
||||
|
||||
LevelData data = new LevelData
|
||||
{
|
||||
name = fileName,
|
||||
musicName = "",
|
||||
order = 0,
|
||||
elements = elements.ToArray()
|
||||
};
|
||||
string json = JsonUtility.ToJson(data, prettyPrint: true);
|
||||
|
||||
try
|
||||
{
|
||||
File.WriteAllText(destPath, json);
|
||||
SetStatus("Export successful: " + fileName + ".json", Color.green);
|
||||
}
|
||||
catch (System.Exception e)
|
||||
{
|
||||
Debug.LogError("Export error: " + e);
|
||||
SetStatus("Export error. See console.", Color.red);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
UnityEditor.AssetDatabase.Refresh();
|
||||
#endif
|
||||
var loader = Object.FindAnyObjectByType<LevelsLoader>();
|
||||
if (loader != null)
|
||||
loader.RefreshLevels();
|
||||
}
|
||||
|
||||
private void SetStatus(string message, Color color)
|
||||
{
|
||||
if (statusText != null)
|
||||
{
|
||||
statusText.text = message;
|
||||
statusText.color = color;
|
||||
statusText.gameObject.SetActive(false);
|
||||
statusText.gameObject.SetActive(true);
|
||||
Canvas.ForceUpdateCanvases();
|
||||
}
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
private class SerializableElement
|
||||
{
|
||||
public string type;
|
||||
public float x;
|
||||
public float y;
|
||||
public float scaleX;
|
||||
public float scaleY;
|
||||
}
|
||||
|
||||
[System.Serializable]
|
||||
private class LevelData
|
||||
{
|
||||
public string name;
|
||||
public string musicName;
|
||||
public int order;
|
||||
public SerializableElement[] elements;
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3227fe18f4441647bdd19d3131efa02
|
@ -17,6 +17,18 @@ public class JSONImporter : MonoBehaviour
|
||||
if (statusObj != null)
|
||||
{
|
||||
statusText = statusObj.GetComponent<TMP_Text>();
|
||||
if (statusText != null)
|
||||
{
|
||||
Debug.Log("✅ StatusText found and assigned automatically!");
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("⚠️ 'StatusText' was found but does not have a TMP_Text component!");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("⚠️ No GameObject named 'StatusText' found in the scene. Please create a TextMeshPro element and name it 'StatusText'.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -28,10 +40,15 @@ public class JSONImporter : MonoBehaviour
|
||||
statusText.text = "Ready to import...";
|
||||
statusText.color = Color.white;
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("statusText is not assigned!");
|
||||
}
|
||||
}
|
||||
|
||||
public void ImportJSON()
|
||||
{
|
||||
Debug.Log("Button clicked, starting import...");
|
||||
if (statusText != null)
|
||||
{
|
||||
statusText.text = "Importing...";
|
||||
@ -63,7 +80,10 @@ public class JSONImporter : MonoBehaviour
|
||||
File.Copy(sourcePath, destinationPath, true);
|
||||
success = true;
|
||||
}
|
||||
catch { }
|
||||
catch (IOException e)
|
||||
{
|
||||
Debug.LogError("Error copying file: " + e.Message);
|
||||
}
|
||||
|
||||
if (success)
|
||||
{
|
||||
@ -100,5 +120,9 @@ public class JSONImporter : MonoBehaviour
|
||||
statusText.gameObject.SetActive(true);
|
||||
Canvas.ForceUpdateCanvases();
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogError("statusText is NULL!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ using System.Collections.Generic;
|
||||
public class LevelEditor : MonoBehaviour
|
||||
{
|
||||
[Header("Placement")]
|
||||
public Transform mapParent;
|
||||
private GameObject currentBlock;
|
||||
private bool isPlacingBlock = false;
|
||||
private Vector3 currentScale = new Vector3(1f, 1f, 1);
|
||||
@ -41,16 +42,6 @@ public class LevelEditor : MonoBehaviour
|
||||
|
||||
void GenerateButtons()
|
||||
{
|
||||
if (buttonPrefabTemplate == null)
|
||||
{
|
||||
Debug.LogError("LevelEditor.GenerateButtons(): buttonPrefabTemplate n’est pas assigné !");
|
||||
return;
|
||||
}
|
||||
if (blockGroupContainer == null)
|
||||
{
|
||||
Debug.LogError("LevelEditor.GenerateButtons(): blockGroupContainer n’est pas assigné !");
|
||||
return;
|
||||
}
|
||||
ClearCurrentButtons();
|
||||
|
||||
Transform container = blockGroupContainer;
|
||||
@ -151,19 +142,14 @@ public class LevelEditor : MonoBehaviour
|
||||
|
||||
InstantiateAndPrepare(prefab, currentScale);
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
// Déplacement de l'objet en cours de placement
|
||||
if (isPlacingBlock && currentBlock != null)
|
||||
{
|
||||
Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
currentBlock.transform.position = new Vector3(Mathf.Round(mousePos.x), Mathf.Round(mousePos.y), -1);
|
||||
|
||||
if (currentBlock != null && Input.GetKeyDown(KeyCode.R))
|
||||
{
|
||||
HandleBlockRotation(); // ✅ Nouvelle rotation
|
||||
}
|
||||
|
||||
if (!currentBlock.name.ToLower().Contains("portal"))
|
||||
{
|
||||
float scroll = Input.GetAxis("Mouse ScrollWheel");
|
||||
@ -192,33 +178,13 @@ public class LevelEditor : MonoBehaviour
|
||||
PlaceBlock();
|
||||
}
|
||||
}
|
||||
else if (Input.GetMouseButtonDown(0)) // Clic gauche pour reprendre un objet déjà placé
|
||||
|
||||
if (Input.GetMouseButtonDown(0) && !isPlacingBlock)
|
||||
{
|
||||
Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
Collider2D hit = Physics2D.OverlapPoint(mousePos);
|
||||
|
||||
if (hit != null && hit.transform != null)
|
||||
{
|
||||
if (hit.CompareTag("Ground"))
|
||||
{
|
||||
Debug.Log("Impossible de déplacer le sol (tag Ground).");
|
||||
return;
|
||||
}
|
||||
currentBlock = hit.gameObject;
|
||||
isPlacingBlock = true;
|
||||
currentScale = currentBlock.transform.localScale;
|
||||
Debug.Log($"Déplacement de l'objet : {currentBlock.name}");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Redimensionnement d'un objet déjà placé
|
||||
if (Input.GetMouseButtonDown(0) && Input.GetKey(KeyCode.LeftShift) && !isPlacingBlock)
|
||||
{
|
||||
Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
Collider2D hit = Physics2D.OverlapPoint(mousePos);
|
||||
|
||||
if (hit != null && hit.transform != null && !hit.CompareTag("Ground"))
|
||||
if (hit != null)
|
||||
{
|
||||
resizingTarget = hit.gameObject;
|
||||
originalMousePos = mousePos;
|
||||
@ -233,7 +199,6 @@ public class LevelEditor : MonoBehaviour
|
||||
: ResizeAxis.Vertical;
|
||||
|
||||
isResizing = true;
|
||||
Debug.Log($"Début de redimensionnement : {resizingTarget.name}, axe = {currentResizeAxis}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -242,34 +207,15 @@ public class LevelEditor : MonoBehaviour
|
||||
Vector3 currentMousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
Vector3 delta = currentMousePos - originalMousePos;
|
||||
|
||||
Vector3 newScale = originalScale;
|
||||
|
||||
if (currentResizeAxis == ResizeAxis.Horizontal)
|
||||
newScale.x = Mathf.Max(0.1f, originalScale.x + delta.x);
|
||||
else if (currentResizeAxis == ResizeAxis.Vertical)
|
||||
newScale.y = Mathf.Max(0.1f, originalScale.y + delta.y);
|
||||
|
||||
// Temporarily apply the new scale for collision testing
|
||||
Vector3 originalPos = resizingTarget.transform.position;
|
||||
resizingTarget.transform.localScale = newScale;
|
||||
|
||||
Bounds bounds = resizingTarget.GetComponent<Collider2D>().bounds;
|
||||
Collider2D[] overlaps = Physics2D.OverlapBoxAll(bounds.center, bounds.size, 0f);
|
||||
|
||||
bool hasCollision = false;
|
||||
foreach (var col in overlaps)
|
||||
{
|
||||
if (col.gameObject != resizingTarget)
|
||||
{
|
||||
hasCollision = true;
|
||||
break;
|
||||
}
|
||||
float newScaleX = Mathf.Max(0.1f, originalScale.x + delta.x);
|
||||
resizingTarget.transform.localScale = new Vector3(newScaleX, originalScale.y, 1);
|
||||
}
|
||||
|
||||
if (hasCollision)
|
||||
else if (currentResizeAxis == ResizeAxis.Vertical)
|
||||
{
|
||||
resizingTarget.transform.localScale = originalScale; // revert
|
||||
Debug.Log("Étirement annulé : collision détectée.");
|
||||
float newScaleY = Mathf.Max(0.1f, originalScale.y + delta.y);
|
||||
resizingTarget.transform.localScale = new Vector3(originalScale.x, newScaleY, 1);
|
||||
}
|
||||
|
||||
if (Input.GetMouseButtonUp(0))
|
||||
@ -279,159 +225,14 @@ public class LevelEditor : MonoBehaviour
|
||||
currentResizeAxis = ResizeAxis.None;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Clic droit pour supprimer un objet déjà placé (sauf le sol)
|
||||
if (Input.GetMouseButtonDown(1))
|
||||
{
|
||||
Vector2 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
|
||||
Collider2D hit = Physics2D.OverlapPoint(mousePos);
|
||||
|
||||
if (hit != null && hit.transform != null)
|
||||
{
|
||||
if (hit.CompareTag("Ground"))
|
||||
{
|
||||
Debug.Log("Impossible de supprimer le sol (tag Ground).");
|
||||
return;
|
||||
}
|
||||
|
||||
Destroy(hit.gameObject);
|
||||
Debug.Log($"Objet supprimé : {hit.name}");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void PlaceBlock()
|
||||
{
|
||||
bool skipVerticalSnap = false;
|
||||
|
||||
if (currentBlock.name.ToLower().Contains("smallobstacle") || currentBlock.name.ToLower().Contains("portal"))
|
||||
{
|
||||
skipVerticalSnap = true; // On saute l'alignement vertical pour ces cas-là
|
||||
}
|
||||
|
||||
if (!skipVerticalSnap)
|
||||
{
|
||||
Vector2 origin = currentBlock.transform.position;
|
||||
RaycastHit2D[] hitsBelow = Physics2D.RaycastAll(origin, Vector2.down, 100f);
|
||||
|
||||
float highestY = -Mathf.Infinity;
|
||||
GameObject bestTargetBelow = null;
|
||||
|
||||
foreach (var hit in hitsBelow)
|
||||
{
|
||||
if (hit.collider != null && hit.collider.gameObject != currentBlock)
|
||||
{
|
||||
float topOfObject = hit.collider.bounds.max.y;
|
||||
if (topOfObject > highestY)
|
||||
{
|
||||
highestY = topOfObject;
|
||||
bestTargetBelow = hit.collider.gameObject;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (bestTargetBelow != null)
|
||||
{
|
||||
float height = currentBlock.GetComponent<Collider2D>().bounds.size.y;
|
||||
currentBlock.transform.position = new Vector3(currentBlock.transform.position.x, highestY + height / 2f, -1);
|
||||
}
|
||||
else
|
||||
{
|
||||
float height = currentBlock.GetComponent<Collider2D>().bounds.size.y;
|
||||
currentBlock.transform.position = new Vector3(currentBlock.transform.position.x, height / 2f, -1);
|
||||
}
|
||||
}
|
||||
// ➔ Toujours essayer de snap sur la droite et en bas même pour Portal et SmallObstacle
|
||||
TrySnapToNearbyBlock();
|
||||
|
||||
isPlacingBlock = false;
|
||||
currentBlock = null;
|
||||
}
|
||||
|
||||
|
||||
private void TrySnapToNearbyBlock()
|
||||
{
|
||||
if (currentBlock == null)
|
||||
return;
|
||||
|
||||
Collider2D blockCollider = currentBlock.GetComponent<Collider2D>();
|
||||
Bounds bounds = blockCollider.bounds;
|
||||
|
||||
float snapDistance = 1f; // Distance de snap (en Unity units)
|
||||
|
||||
// Zone de scan à droite
|
||||
Vector2 rightAreaStart = new Vector2(bounds.max.x, bounds.min.y);
|
||||
Vector2 rightAreaEnd = new Vector2(bounds.max.x + snapDistance, bounds.max.y);
|
||||
|
||||
// Zone de scan à gauche
|
||||
Vector2 leftAreaStart = new Vector2(bounds.min.x - snapDistance, bounds.min.y);
|
||||
Vector2 leftAreaEnd = new Vector2(bounds.min.x, bounds.max.y);
|
||||
|
||||
// Zone de scan en dessous
|
||||
Vector2 bottomAreaStart = new Vector2(bounds.min.x, bounds.min.y - snapDistance);
|
||||
Vector2 bottomAreaEnd = new Vector2(bounds.max.x, bounds.min.y);
|
||||
|
||||
// Zone de scan au dessus
|
||||
Vector2 topAreaStart = new Vector2(bounds.min.x, bounds.max.y);
|
||||
Vector2 topAreaEnd = new Vector2(bounds.max.x, bounds.max.y + snapDistance);
|
||||
|
||||
Collider2D[] hitsRight = Physics2D.OverlapAreaAll(rightAreaStart, rightAreaEnd);
|
||||
Collider2D[] hitsLeft = Physics2D.OverlapAreaAll(leftAreaStart, leftAreaEnd);
|
||||
Collider2D[] hitsBelow = Physics2D.OverlapAreaAll(bottomAreaStart, bottomAreaEnd);
|
||||
Collider2D[] hitsAbove = Physics2D.OverlapAreaAll(topAreaStart, topAreaEnd);
|
||||
|
||||
// ➔ Priorité : droite > gauche > bas > haut
|
||||
|
||||
foreach (var hit in hitsRight)
|
||||
{
|
||||
if (hit != null && hit.gameObject != currentBlock)
|
||||
{
|
||||
float theirLeft = hit.bounds.min.x;
|
||||
float ourWidth = bounds.size.x;
|
||||
currentBlock.transform.position = new Vector3(theirLeft - ourWidth / 2f, currentBlock.transform.position.y, -1);
|
||||
Debug.Log("✅ Snap automatique à droite !");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var hit in hitsLeft)
|
||||
{
|
||||
if (hit != null && hit.gameObject != currentBlock)
|
||||
{
|
||||
float theirRight = hit.bounds.max.x;
|
||||
float ourWidth = bounds.size.x;
|
||||
currentBlock.transform.position = new Vector3(theirRight + ourWidth / 2f, currentBlock.transform.position.y, -1);
|
||||
Debug.Log("✅ Snap automatique à gauche !");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var hit in hitsBelow)
|
||||
{
|
||||
if (hit != null && hit.gameObject != currentBlock)
|
||||
{
|
||||
float theirTop = hit.bounds.max.y;
|
||||
float ourHeight = bounds.size.y;
|
||||
currentBlock.transform.position = new Vector3(currentBlock.transform.position.x, theirTop + ourHeight / 2f, -1);
|
||||
Debug.Log("✅ Snap automatique en bas !");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var hit in hitsAbove)
|
||||
{
|
||||
if (hit != null && hit.gameObject != currentBlock)
|
||||
{
|
||||
float theirBottom = hit.bounds.min.y;
|
||||
float ourHeight = bounds.size.y;
|
||||
currentBlock.transform.position = new Vector3(currentBlock.transform.position.x, theirBottom - ourHeight / 2f, -1);
|
||||
Debug.Log("✅ Snap automatique en haut !");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
void InstantiateAndPrepare(GameObject prefab, Vector3? scaleOverride = null)
|
||||
{
|
||||
GameObject obj = Instantiate(prefab);
|
||||
@ -441,13 +242,15 @@ public class LevelEditor : MonoBehaviour
|
||||
try { obj.tag = prefab.name; }
|
||||
catch { Debug.LogWarning($"Le tag '{prefab.name}' n'existe pas. Ajoutez-le dans Project Settings > Tags."); }
|
||||
|
||||
if (mapParent != null)
|
||||
obj.transform.SetParent(mapParent);
|
||||
|
||||
currentBlock = obj;
|
||||
isPlacingBlock = true;
|
||||
}
|
||||
|
||||
private void HandleBlockRotation()
|
||||
public void Save()
|
||||
{
|
||||
currentBlock.transform.Rotate(0f, 0f, -90f); // ➔ Rotation de 90° dans le sens horaire
|
||||
Debug.Log("🔄 Bloc pivoté de 90° !");
|
||||
// TODO : Implémenter la sauvegarde du niveau
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,6 @@ public class LevelLoader : MonoBehaviour
|
||||
public LevelsLoader levelsLoader;
|
||||
public AudioSource audioSource;
|
||||
public Text progressionText;
|
||||
private readonly float groundY = -6.034f;
|
||||
|
||||
private GameObject GetPrefab(string type)
|
||||
{
|
||||
@ -44,12 +43,6 @@ public class LevelLoader : MonoBehaviour
|
||||
|
||||
instance.transform.localScale = new Vector3(newScaleX, newScaleY, originalScale.z);
|
||||
}
|
||||
|
||||
GameObject groundPrefab = GetPrefab("Ground");
|
||||
GameObject groundInstance = Instantiate(groundPrefab, new Vector3(current.LastX / 2, groundY, 0), Quaternion.identity);
|
||||
float groundWidth = current.LastX;
|
||||
groundInstance.transform.localScale = new Vector3(groundWidth / 5f * 2, 1, 1);
|
||||
|
||||
Instantiate(GetPrefab("WinnerWall"), new Vector3(current.LastX, 0, 0), Quaternion.Euler(0, 0, 90));
|
||||
}
|
||||
|
||||
|
@ -18,39 +18,46 @@ public class LevelsLoader : MonoBehaviour
|
||||
private void LoadAllLevels()
|
||||
{
|
||||
TextAsset[] levelFiles = Resources.LoadAll<TextAsset>("Levels");
|
||||
TextAsset[] levelStatsFiles = Resources.LoadAll<TextAsset>("LevelsStats");
|
||||
|
||||
Dictionary<string, LevelStat> levelStatsMap = new();
|
||||
foreach (TextAsset jsonTextFileStats in levelStatsFiles)
|
||||
{
|
||||
LevelStat levelStat = LevelStat.CreateFromJSON(jsonTextFileStats.text);
|
||||
levelStat.JsonName = jsonTextFileStats.name;
|
||||
levelStatsMap[levelStat.JsonName] = levelStat;
|
||||
}
|
||||
|
||||
foreach (TextAsset jsonTextFile in levelFiles)
|
||||
{
|
||||
Level level = Level.CreateFromJSON(jsonTextFile.text);
|
||||
level.JsonName = jsonTextFile.name;
|
||||
level.TotalAttempts = 0;
|
||||
level.TotalJumps = 0;
|
||||
level.ProgressionPercent = 0;
|
||||
level.ProgressionPercentMax = 0;
|
||||
|
||||
string statPath = Path.Combine(Application.persistentDataPath, level.JsonName + ".json");
|
||||
if (File.Exists(statPath))
|
||||
if (levelStatsMap.TryGetValue(level.JsonName, out LevelStat levelStat))
|
||||
{
|
||||
string statJson = File.ReadAllText(statPath);
|
||||
LevelStat levelStat = JsonUtility.FromJson<LevelStat>(statJson);
|
||||
|
||||
level.TotalAttempts = levelStat.totalAttempts;
|
||||
level.TotalJumps = levelStat.totalJumps;
|
||||
level.ProgressionPercentMax = levelStat.progressionPercent;
|
||||
}
|
||||
else
|
||||
{
|
||||
level.TotalAttempts = 0;
|
||||
level.TotalJumps = 0;
|
||||
level.ProgressionPercentMax = 0;
|
||||
levelStat = new LevelStat { JsonName = level.JsonName, totalJumps = 0, totalAttempts = 0 };
|
||||
levelStatsMap[level.JsonName] = levelStat;
|
||||
}
|
||||
|
||||
level.ProgressionPercent = 0;
|
||||
levels.Add(level);
|
||||
}
|
||||
|
||||
levels.Sort((x, y) => x.order.CompareTo(y.order));
|
||||
}
|
||||
|
||||
private void SaveLevelCurrent()
|
||||
{
|
||||
if (levelCurrent == null) return;
|
||||
string levelJson = JsonUtility.ToJson(levelCurrent, true) + "\n";
|
||||
File.WriteAllText(Path.Combine(Application.dataPath, "Resources", "Levels", levelCurrent.JsonName + ".json"), levelJson);
|
||||
|
||||
LevelStat levelStat = new()
|
||||
{
|
||||
@ -59,54 +66,39 @@ public class LevelsLoader : MonoBehaviour
|
||||
totalAttempts = levelCurrent.TotalAttempts,
|
||||
progressionPercent = levelCurrent.ProgressionPercentMax,
|
||||
};
|
||||
|
||||
string levelStatJson = JsonUtility.ToJson(levelStat, true) + "\n";
|
||||
|
||||
string savePath = Path.Combine(Application.persistentDataPath, levelCurrent.JsonName + ".json");
|
||||
File.WriteAllText(savePath, levelStatJson);
|
||||
File.WriteAllText(Path.Combine(Application.dataPath, "Resources", "LevelsStats", levelCurrent.JsonName + ".json"), levelStatJson);
|
||||
}
|
||||
|
||||
public void NextLevel()
|
||||
{
|
||||
if (levels.Count == 0) return;
|
||||
|
||||
int currentIndex = levels.IndexOf(levelCurrent);
|
||||
levelCurrent = levels[(currentIndex + 1) % levels.Count];
|
||||
}
|
||||
|
||||
public void PreviousLevel()
|
||||
{
|
||||
if (levels.Count == 0) return;
|
||||
|
||||
int currentIndex = levels.IndexOf(levelCurrent);
|
||||
levelCurrent = levels[(currentIndex - 1 + levels.Count) % levels.Count];
|
||||
}
|
||||
|
||||
public void IncreaseTotalJumps()
|
||||
{
|
||||
if (levelCurrent == null) return;
|
||||
|
||||
levelCurrent.TotalJumps += 1;
|
||||
SaveLevelCurrent();
|
||||
}
|
||||
|
||||
public void IncreaseTotalAttempts()
|
||||
{
|
||||
if (levelCurrent == null) return;
|
||||
|
||||
levelCurrent.TotalAttempts += 1;
|
||||
SaveLevelCurrent();
|
||||
}
|
||||
|
||||
public int CalculateCurrentProgressionPercent(Vector3 playerPosition)
|
||||
{
|
||||
if (levelCurrent == null) return 0;
|
||||
|
||||
float lastX = levelCurrent.LastX;
|
||||
GameObject winnerWallPrefab = Resources.Load<GameObject>("Prefabs/WinnerWall");
|
||||
float winnerWallWidth = winnerWallPrefab != null
|
||||
? winnerWallPrefab.GetComponent<Renderer>().bounds.size.x
|
||||
: 0f;
|
||||
float winnerWallWidth = winnerWallPrefab.GetComponent<Renderer>().bounds.size.x;
|
||||
float marginError = 0.5f;
|
||||
float totalDistance = lastX - (winnerWallWidth / 2) - marginError;
|
||||
|
||||
|
@ -13,6 +13,11 @@ public class MainMenu : MonoBehaviour
|
||||
SceneManager.LoadSceneAsync("ImportScene");
|
||||
}
|
||||
|
||||
public void OpenSettings()
|
||||
{
|
||||
// SceneManager.LoadSceneAsync(?);
|
||||
}
|
||||
|
||||
public void QuitGame()
|
||||
{
|
||||
Application.Quit();
|
||||
@ -22,14 +27,4 @@ public class MainMenu : MonoBehaviour
|
||||
{
|
||||
SceneManager.LoadSceneAsync("LevelEditorScene");
|
||||
}
|
||||
|
||||
public void EditorChoice()
|
||||
{
|
||||
SceneManager.LoadSceneAsync("EditorChoiceScene");
|
||||
}
|
||||
|
||||
public void CreateLevel()
|
||||
{
|
||||
SceneManager.LoadSceneAsync("CreateLevelScene");
|
||||
}
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ using UnityEngine.UI;
|
||||
|
||||
public class PageScript : MonoBehaviour
|
||||
{
|
||||
public List<GameObject> buttons;
|
||||
public List<GameObject> buttons; // À assigner dans l’inspector
|
||||
public int visibleCount = 4;
|
||||
private int currentIndex = 0;
|
||||
|
||||
|
@ -6,10 +6,10 @@ public class Player : MonoBehaviour
|
||||
public Rigidbody2D RigidBody { get; private set; }
|
||||
public Transform Transform { get; private set; }
|
||||
public ParticleSystem Particle { get; private set; }
|
||||
public LevelsLoader LevelsLoader { get; set; }
|
||||
public LevelsLoader LevelsLoader { get; private set; }
|
||||
public SpriteRenderer SpriteRenderer { get; private set; }
|
||||
public bool IsColliding { get; set; } = true;
|
||||
public bool HasStarted { get; set; } = false;
|
||||
public bool HasStarted { get; private set; } = false;
|
||||
public bool CanJump { get; set; } = true;
|
||||
|
||||
public IGameMode CurrentGameMode { get; set; }
|
||||
@ -21,12 +21,7 @@ public class Player : MonoBehaviour
|
||||
Transform = transform;
|
||||
Particle = GetComponentInChildren<ParticleSystem>();
|
||||
SpriteRenderer = GetComponentInChildren<SpriteRenderer>();
|
||||
|
||||
GameObject loaderObj = GameObject.FindGameObjectWithTag("LevelsLoader");
|
||||
if (loaderObj != null)
|
||||
LevelsLoader = loaderObj.GetComponent<LevelsLoader>();
|
||||
else
|
||||
Debug.LogWarning("LevelsLoader introuvable : Progression désactivée pour ce niveau.");
|
||||
LevelsLoader = GameObject.FindGameObjectWithTag("LevelsLoader").GetComponent<LevelsLoader>();
|
||||
}
|
||||
|
||||
public void Start()
|
||||
@ -35,29 +30,33 @@ public class Player : MonoBehaviour
|
||||
mainModule.simulationSpace = ParticleSystemSimulationSpace.World;
|
||||
Particle.transform.parent = null;
|
||||
|
||||
Invoke(nameof(EnableInput), 0.1f);
|
||||
|
||||
CurrentGameMode = new NormalGameMode();
|
||||
}
|
||||
|
||||
private void EnableInput()
|
||||
{
|
||||
HasStarted = true;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (CurrentGameMode != null)
|
||||
CurrentGameMode.Update(this);
|
||||
|
||||
if (LevelsLoader != null)
|
||||
LevelsLoader.CalculateCurrentProgressionPercent(transform.position);
|
||||
CurrentGameMode.Update(this);
|
||||
LevelsLoader.CalculateCurrentProgressionPercent(transform.position);
|
||||
}
|
||||
|
||||
public virtual void OnCollisionEnter2D(Collision2D collision)
|
||||
public void OnCollisionEnter2D(Collision2D collision)
|
||||
{
|
||||
CurrentGameMode?.OnCollisionEnter(this, collision);
|
||||
CurrentGameMode.OnCollisionEnter(this, collision);
|
||||
}
|
||||
|
||||
public void OnCollisionExit2D(Collision2D collision)
|
||||
{
|
||||
CurrentGameMode?.OnCollisionExit(this, collision);
|
||||
CurrentGameMode.OnCollisionExit(this, collision);
|
||||
}
|
||||
|
||||
public virtual void OnTriggerEnter2D(Collider2D collision)
|
||||
private void OnTriggerEnter2D(Collider2D collision)
|
||||
{
|
||||
if (collision.CompareTag("ShipPortal"))
|
||||
{
|
||||
|
@ -5,12 +5,8 @@ public class PlayerCamera : MonoBehaviour
|
||||
public GameObject playerObject;
|
||||
public float normalMinYFollow = 2.0f;
|
||||
public float shipMinYFollow = 6.0f;
|
||||
public float smoothSpeed = 5.0f;
|
||||
private float initialY;
|
||||
|
||||
[Header("References")]
|
||||
public bool isPlaying;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
initialY = transform.position.y;
|
||||
@ -18,25 +14,20 @@ public class PlayerCamera : MonoBehaviour
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (isPlaying)
|
||||
Player player = playerObject.GetComponent<Player>();
|
||||
|
||||
float minYFollow = normalMinYFollow;
|
||||
if (player.CurrentGameMode is ShipGameMode)
|
||||
{
|
||||
Player player = playerObject.GetComponent<Player>();
|
||||
|
||||
float minYFollow = normalMinYFollow;
|
||||
if (player.CurrentGameMode is ShipGameMode)
|
||||
{
|
||||
minYFollow = shipMinYFollow;
|
||||
}
|
||||
|
||||
float targetY = initialY;
|
||||
if (playerObject.transform.position.y > minYFollow)
|
||||
{
|
||||
targetY = playerObject.transform.position.y;
|
||||
}
|
||||
|
||||
float newY = Mathf.Lerp(transform.position.y, targetY, smoothSpeed * Time.deltaTime);
|
||||
|
||||
transform.position = new Vector3(playerObject.transform.position.x, newY, transform.position.z);
|
||||
minYFollow = shipMinYFollow;
|
||||
}
|
||||
|
||||
float targetY = initialY;
|
||||
if (playerObject.transform.position.y > minYFollow)
|
||||
{
|
||||
targetY = playerObject.transform.position.y;
|
||||
}
|
||||
|
||||
transform.position = new Vector3(playerObject.transform.position.x, targetY, transform.position.z);
|
||||
}
|
||||
}
|
||||
|
@ -1,127 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class TestManager : MonoBehaviour
|
||||
{
|
||||
[Header("References")]
|
||||
public IGameMode gameMode;
|
||||
public Player currentPlayer;
|
||||
public Transform spawnPoint;
|
||||
public GameObject editorUI;
|
||||
public PlayerCamera playerCamera;
|
||||
|
||||
private bool isTesting = false;
|
||||
|
||||
void Start()
|
||||
{
|
||||
if (spawnPoint == null)
|
||||
{
|
||||
GameObject spawn = new GameObject("AutoSpawnPoint");
|
||||
spawn.transform.position = new Vector3(-16, -3, 0f);
|
||||
spawnPoint = spawn.transform;
|
||||
}
|
||||
|
||||
if (currentPlayer == null)
|
||||
{
|
||||
Debug.LogError("[TestManager] Aucun Player assigné !");
|
||||
}
|
||||
else
|
||||
{
|
||||
gameMode = new NormalGameMode();
|
||||
currentPlayer.ChangeGameMode(gameMode);
|
||||
currentPlayer.SpeedMultiplier = 0f;
|
||||
|
||||
if (currentPlayer.SpriteRenderer != null)
|
||||
currentPlayer.SpriteRenderer.enabled = false;
|
||||
|
||||
if (currentPlayer.Particle != null)
|
||||
currentPlayer.Particle.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); // 🛑 Stop propre
|
||||
}
|
||||
|
||||
if (playerCamera != null)
|
||||
{
|
||||
playerCamera.isPlaying = false;
|
||||
}
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (isTesting && currentPlayer == null)
|
||||
{
|
||||
StopTest();
|
||||
}
|
||||
}
|
||||
|
||||
public void StartOrStop()
|
||||
{
|
||||
if (isTesting)
|
||||
StopTest();
|
||||
else
|
||||
StartTest();
|
||||
}
|
||||
|
||||
public void StartTest()
|
||||
{
|
||||
if (currentPlayer == null)
|
||||
{
|
||||
Debug.LogError("[TestManager] Player manquant pour lancer le test !");
|
||||
return;
|
||||
}
|
||||
|
||||
if (editorUI != null)
|
||||
editorUI.SetActive(false);
|
||||
|
||||
currentPlayer.transform.position = spawnPoint.position;
|
||||
currentPlayer.RigidBody.linearVelocity = Vector2.zero;
|
||||
currentPlayer.SpeedMultiplier = 1f;
|
||||
currentPlayer.SpriteRenderer.sprite = Resources.Load<Sprite>("Shapes/BaseSquare");
|
||||
|
||||
currentPlayer.ChangeGameMode(gameMode);
|
||||
isTesting = true;
|
||||
|
||||
if (playerCamera != null)
|
||||
{
|
||||
playerCamera.playerObject = currentPlayer.gameObject;
|
||||
playerCamera.isPlaying = true;
|
||||
}
|
||||
|
||||
if (currentPlayer.SpriteRenderer != null)
|
||||
currentPlayer.SpriteRenderer.enabled = true;
|
||||
|
||||
if (currentPlayer.Particle != null)
|
||||
currentPlayer.Particle.Play(); // ✅ Démarrer la particule
|
||||
|
||||
Debug.Log("[TestManager] Test du niveau démarré !");
|
||||
}
|
||||
|
||||
public void StopTest()
|
||||
{
|
||||
if (currentPlayer != null)
|
||||
{
|
||||
currentPlayer.transform.position = spawnPoint.position;
|
||||
currentPlayer.RigidBody.linearVelocity = Vector2.zero;
|
||||
currentPlayer.RigidBody.angularVelocity = 0f;
|
||||
currentPlayer.transform.rotation = Quaternion.identity;
|
||||
currentPlayer.SpriteRenderer.sprite = Resources.Load<Sprite>("Shapes/BaseSquare");
|
||||
currentPlayer.SpeedMultiplier = 0f;
|
||||
|
||||
if (currentPlayer.Particle != null)
|
||||
currentPlayer.Particle.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); // ✅ Arrêter proprement
|
||||
|
||||
if (currentPlayer.SpriteRenderer != null)
|
||||
currentPlayer.SpriteRenderer.enabled = false;
|
||||
}
|
||||
|
||||
if (editorUI != null)
|
||||
editorUI.SetActive(true);
|
||||
|
||||
if (playerCamera != null)
|
||||
{
|
||||
playerCamera.isPlaying = false;
|
||||
playerCamera.transform.position = new Vector3(0f, 0f, -10f);
|
||||
}
|
||||
|
||||
isTesting = false;
|
||||
|
||||
Debug.Log("[TestManager] Test du niveau arrêté, joueur reset et caméra recentrée !");
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2c6d38f8c53ec314c9827a842e6f17d8
|
@ -1,48 +1,47 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.collab-proxy": "2.6.0",
|
||||
"com.unity.feature.2d": "2.0.1",
|
||||
"com.unity.ide.rider": "3.0.31",
|
||||
"com.unity.ide.visualstudio": "2.0.22",
|
||||
"com.unity.inputsystem": "1.11.2",
|
||||
"com.unity.multiplayer.center": "1.0.0",
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.timeline": "1.8.7",
|
||||
"com.unity.toolchain.linux-x86_64": "2.0.10",
|
||||
"com.unity.ugui": "2.0.0",
|
||||
"com.unity.visualscripting": "1.9.4",
|
||||
"com.yasirkula.simplefilebrowser": "https://github.com/yasirkula/UnitySimpleFileBrowser.git",
|
||||
"com.unity.modules.accessibility": "1.0.0",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
"com.unity.modules.androidjni": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.assetbundle": "1.0.0",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.cloth": "1.0.0",
|
||||
"com.unity.modules.director": "1.0.0",
|
||||
"com.unity.modules.imageconversion": "1.0.0",
|
||||
"com.unity.modules.imgui": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0",
|
||||
"com.unity.modules.physics": "1.0.0",
|
||||
"com.unity.modules.physics2d": "1.0.0",
|
||||
"com.unity.modules.screencapture": "1.0.0",
|
||||
"com.unity.modules.terrain": "1.0.0",
|
||||
"com.unity.modules.terrainphysics": "1.0.0",
|
||||
"com.unity.modules.tilemap": "1.0.0",
|
||||
"com.unity.modules.ui": "1.0.0",
|
||||
"com.unity.modules.uielements": "1.0.0",
|
||||
"com.unity.modules.umbra": "1.0.0",
|
||||
"com.unity.modules.unityanalytics": "1.0.0",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestaudio": "1.0.0",
|
||||
"com.unity.modules.unitywebrequesttexture": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestwww": "1.0.0",
|
||||
"com.unity.modules.vehicles": "1.0.0",
|
||||
"com.unity.modules.video": "1.0.0",
|
||||
"com.unity.modules.vr": "1.0.0",
|
||||
"com.unity.modules.wind": "1.0.0",
|
||||
"com.unity.modules.xr": "1.0.0"
|
||||
}
|
||||
"dependencies": {
|
||||
"com.unity.collab-proxy": "2.6.0",
|
||||
"com.unity.feature.2d": "2.0.1",
|
||||
"com.unity.ide.rider": "3.0.31",
|
||||
"com.unity.ide.visualstudio": "2.0.22",
|
||||
"com.unity.inputsystem": "1.11.2",
|
||||
"com.unity.multiplayer.center": "1.0.0",
|
||||
"com.unity.test-framework": "1.4.5",
|
||||
"com.unity.timeline": "1.8.7",
|
||||
"com.unity.ugui": "2.0.0",
|
||||
"com.unity.visualscripting": "1.9.4",
|
||||
"com.yasirkula.simplefilebrowser": "https://github.com/yasirkula/UnitySimpleFileBrowser.git",
|
||||
"com.unity.modules.accessibility": "1.0.0",
|
||||
"com.unity.modules.ai": "1.0.0",
|
||||
"com.unity.modules.androidjni": "1.0.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
"com.unity.modules.assetbundle": "1.0.0",
|
||||
"com.unity.modules.audio": "1.0.0",
|
||||
"com.unity.modules.cloth": "1.0.0",
|
||||
"com.unity.modules.director": "1.0.0",
|
||||
"com.unity.modules.imageconversion": "1.0.0",
|
||||
"com.unity.modules.imgui": "1.0.0",
|
||||
"com.unity.modules.jsonserialize": "1.0.0",
|
||||
"com.unity.modules.particlesystem": "1.0.0",
|
||||
"com.unity.modules.physics": "1.0.0",
|
||||
"com.unity.modules.physics2d": "1.0.0",
|
||||
"com.unity.modules.screencapture": "1.0.0",
|
||||
"com.unity.modules.terrain": "1.0.0",
|
||||
"com.unity.modules.terrainphysics": "1.0.0",
|
||||
"com.unity.modules.tilemap": "1.0.0",
|
||||
"com.unity.modules.ui": "1.0.0",
|
||||
"com.unity.modules.uielements": "1.0.0",
|
||||
"com.unity.modules.umbra": "1.0.0",
|
||||
"com.unity.modules.unityanalytics": "1.0.0",
|
||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestaudio": "1.0.0",
|
||||
"com.unity.modules.unitywebrequesttexture": "1.0.0",
|
||||
"com.unity.modules.unitywebrequestwww": "1.0.0",
|
||||
"com.unity.modules.vehicles": "1.0.0",
|
||||
"com.unity.modules.video": "1.0.0",
|
||||
"com.unity.modules.vr": "1.0.0",
|
||||
"com.unity.modules.wind": "1.0.0",
|
||||
"com.unity.modules.xr": "1.0.0"
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -17,15 +17,9 @@ EditorBuildSettings:
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/LevelScene.unity
|
||||
guid: 8c9cfa26abfee488c85f1582747f6a02
|
||||
- enabled: 0
|
||||
path: Assets/Scenes/LevelEditorScene.unity
|
||||
guid: 73b983a44d701df4bb6d8ceb94e05a2b
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/LevelEditorScene.unity
|
||||
guid: 73b983a44d701df4bb6d8ceb94e05a2b
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/EditorChoiceScene.unity
|
||||
guid: 200c916866fde6f4bb0123b72f22771f
|
||||
m_configObjects:
|
||||
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
|
||||
m_UseUCBPForAssetBundles: 0
|
||||
|
@ -12,7 +12,7 @@ PlayerSettings:
|
||||
targetDevice: 2
|
||||
useOnDemandResources: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: CNAM
|
||||
companyName: DefaultCompany
|
||||
productName: GeometryDash
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
@ -106,7 +106,7 @@ PlayerSettings:
|
||||
xboxEnableFitness: 0
|
||||
visibleInBackground: 1
|
||||
allowFullscreenSwitch: 1
|
||||
fullscreenMode: 3
|
||||
fullscreenMode: 1
|
||||
xboxSpeechDB: 0
|
||||
xboxEnableHeadOrientation: 0
|
||||
xboxEnableGuest: 0
|
||||
@ -140,7 +140,7 @@ PlayerSettings:
|
||||
loadStoreDebugModeEnabled: 0
|
||||
visionOSBundleVersion: 1.0
|
||||
tvOSBundleVersion: 1.0
|
||||
bundleVersion: v1.0.0-staging.3
|
||||
bundleVersion: 1.0
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
@ -286,107 +286,8 @@ PlayerSettings:
|
||||
AndroidAppBundleSizeToValidate: 150
|
||||
AndroidReportGooglePlayAppDependencies: 1
|
||||
androidSymbolsSizeThreshold: 800
|
||||
m_BuildTargetIcons:
|
||||
- m_BuildTarget:
|
||||
m_Icons:
|
||||
- serializedVersion: 2
|
||||
m_Icon: {fileID: 2800000, guid: 7941bec4ab82ba5f8a978cf1b4d91010, type: 3}
|
||||
m_Width: 128
|
||||
m_Height: 128
|
||||
m_Kind: 0
|
||||
m_BuildTargetPlatformIcons:
|
||||
- m_BuildTarget: Android
|
||||
m_Icons:
|
||||
- m_Textures: []
|
||||
m_Width: 432
|
||||
m_Height: 432
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 324
|
||||
m_Height: 324
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 216
|
||||
m_Height: 216
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 162
|
||||
m_Height: 162
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 108
|
||||
m_Height: 108
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 81
|
||||
m_Height: 81
|
||||
m_Kind: 2
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 192
|
||||
m_Height: 192
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 144
|
||||
m_Height: 144
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 96
|
||||
m_Height: 96
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 72
|
||||
m_Height: 72
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 48
|
||||
m_Height: 48
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 36
|
||||
m_Height: 36
|
||||
m_Kind: 1
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 192
|
||||
m_Height: 192
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 144
|
||||
m_Height: 144
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 96
|
||||
m_Height: 96
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 72
|
||||
m_Height: 72
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 48
|
||||
m_Height: 48
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
- m_Textures: []
|
||||
m_Width: 36
|
||||
m_Height: 36
|
||||
m_Kind: 0
|
||||
m_SubKind:
|
||||
m_BuildTargetIcons: []
|
||||
m_BuildTargetPlatformIcons: []
|
||||
m_BuildTargetBatching: []
|
||||
m_BuildTargetShaderSettings: []
|
||||
m_BuildTargetGraphicsJobs: []
|
||||
|
@ -18,7 +18,6 @@ TagManager:
|
||||
- PortalButtonGroup
|
||||
- BonusBoostSpeed
|
||||
- BonusSlowSpeed
|
||||
- Ground
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
|
Reference in New Issue
Block a user