diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be74efb..2dcd5ed 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - dev workflow_dispatch: permissions: @@ -19,33 +20,60 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout current branch uses: actions/checkout@v4 + with: + path: current + + - name: Checkout main branch + uses: actions/checkout@v4 + with: + ref: main + path: main-branch + + - name: Checkout dev branch + uses: actions/checkout@v4 + with: + ref: dev + path: dev-branch - name: Setup Node uses: actions/setup-node@v4 with: node-version: '20' cache: 'npm' - cache-dependency-path: monument-valley-demo/package-lock.json + cache-dependency-path: main-branch/monument-valley-demo/package-lock.json - - name: Install dependencies + - name: Build main branch run: | - cd monument-valley-demo + cd main-branch/monument-valley-demo npm ci + npm run build - - name: Build + - name: Build dev branch run: | - cd monument-valley-demo + cd dev-branch/monument-valley-demo + npm ci + # Update base path for dev subdirectory + sed -i "s|base: '/monument/'|base: '/monument/dev/'|g" vite.config.ts npm run build + - name: Prepare combined deployment + run: | + mkdir -p deployment + # Copy main build to root + cp -r main-branch/monument-valley-demo/dist/* deployment/ + # Copy dev build to /dev subdirectory + mkdir -p deployment/dev + cp -r dev-branch/monument-valley-demo/dist/* deployment/dev/ + - name: Setup Pages uses: actions/configure-pages@v4 - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: - path: monument-valley-demo/dist + path: deployment deploy: environment: diff --git a/monument-valley-demo/components/Scene/BuildingBlocks.tsx b/monument-valley-demo/components/Scene/BuildingBlocks.tsx index d768bb6..d5991ca 100644 --- a/monument-valley-demo/components/Scene/BuildingBlocks.tsx +++ b/monument-valley-demo/components/Scene/BuildingBlocks.tsx @@ -363,7 +363,7 @@ export const WaterfallBlock: React.FC = ({ }, [waterTexture, height]); useFrame((state, delta) => { - textureInstance.offset.y -= 1.5 * delta; + textureInstance.offset.y += 1.5 * delta; }); return ( diff --git a/monument-valley-demo/components/Scene/LevelOne.tsx b/monument-valley-demo/components/Scene/LevelOne.tsx index 0f42dd8..e953970 100644 --- a/monument-valley-demo/components/Scene/LevelOne.tsx +++ b/monument-valley-demo/components/Scene/LevelOne.tsx @@ -340,9 +340,8 @@ export const LevelOne: React.FC = () => { - {/* Beam B: The Short Corner (X Axis) -> Flows to Negative X */} - {/* Previous was [1, 0]. Reversed to [-1, 0]. */} - Flows to Positive X */} + { >