ci

.gitlab-ci.yml

@@ -7,6 +7,31 @@ stages:
   - pack
   - deploy
 
+assetbundles:
+  stage: prepare
+  tags:
+    - linux
+  dependencies: []
+  script:
+    - mkdir Platforms
+    - wget -O - https://cdn02.moecube.com:444/mdpro3-assetbundles/$BUILD_TARGET.tar.zst | tar -I 'zstd -T0' -xf - -C Platforms
+  artifacts:
+    paths:
+      - Platforms
+
+assetbundles_windows:
+  extends: .assetbundles
+  variables:
+    BUILD_TARGET: StandaloneWindows64
+assetbundles_linux:
+  extends: .assetbundles
+  variables:
+    BUILD_TARGET: StandaloneLinux64
+assetbundles_macos:
+  extends: .assetbundles
+  variables:
+    BUILD_TARGET: StandaloneOSX
+
 dll:
   stage: prepare
   tags:
@@ -61,6 +86,9 @@ dll:
 StandaloneLinux64:
   extends: .unity
   image: unityci/editor:6000.0.24f1-base-3
+  dependencies:
+    - dll
+    - assetbundles_linux
   variables:
     BUILD_TARGET: StandaloneLinux64
     EXEC_NAME: MDPro3
@@ -68,6 +96,9 @@ StandaloneLinux64:
 StandaloneWindows64:
   extends: .unity
   image: unityci/editor:6000.0.24f1-windows-mono-3
+  dependencies:
+    - dll
+    - assetbundles_windows
   variables:
     BUILD_TARGET: StandaloneWindows64
     EXEC_NAME: MDPro3.exe
@@ -75,48 +106,14 @@ StandaloneWindows64:
 StandaloneOSX:
   extends: .unity
   image: unityci/editor:6000.0.24f1-mac-mono-3
+  dependencies:
+    - dll
+    - assetbundles_macos
   variables:
     BUILD_TARGET: StandaloneOSX
     EXEC_NAME: MDPro3.app
     BUILD_CMD: OSXUniversalPlayer
 
-.assetbundles:
-  stage: build
-  tags:
-    - linux
-  dependencies: []
-  script:
-    # standalone
-    - mkdir -p release/MDPro3_Data
-    - git clone --depth 1 https://code.moenext.com/sherry_chaos/mdpro3-assetbundles
-
-    # Ask sherry for mdpro3-assetbundles path relationship
-    #- mv mdpro3-assetbundles/StandaloneWindows64 release/MDPro3_Data/StandaloneWindows64
-    #- mv mdpro3-assetbundles/StandaloneOSX release/MDPro3_Data/StandaloneOSX
-    #- mv mdpro3-assetbundles/StandaloneLinux64 release/MDPro3_Data/StandaloneLinux64
-    #- mv mdpro3-assetbundles/iOS release/MDPro3_Data/iOS
-    - mv mdpro3-assetbundles/$FROM release/MDPro3_Data/$TO
-
-  artifacts:
-    paths:
-      - release
-
-assetbundles_windows:
-  extends: .assetbundles
-  variables:
-    FROM: StandaloneWindows64
-    TO: StandaloneWindows64
-assetbundles_linux:
-  extends: .assetbundles
-  variables:
-    FROM: StandaloneLinux64
-    TO: StandaloneLinux64
-assetbundles_macos:
-  extends: .assetbundles
-  variables:
-    FROM: StandaloneOSX
-    TO: StandaloneOSX
-
 resources:
   stage: build
   tags:
@@ -124,16 +121,16 @@ resources:
   dependencies: []
   script:
     # Picture
-    - mkdir -p release/Picture
+    - mkdir -p resources/Picture
     - git clone --depth 1 https://code.moenext.com/mycard/hd-arts
-    - mv hd-arts/arts release/Picture/Art
+    - mv hd-arts/arts resources/Picture/Art
     - git clone --depth 1 https://code.moenext.com/mycard/ygopro2-closeup
-    - mv ygopro2-closeup/closeup release/Picture/Closeup
+    - mv ygopro2-closeup/closeup resources/Picture/Closeup
     # Ask sherry for Picture/DIY and Sound
     # sound is too big, so we don't pack
     - git clone --depth 1 https://code.moenext.com/mycard/mdpro3-other
-    - mv mdpro3-other/Picture/* release/Picture/
-    # - mv mdpro3-other/Sound release/
+    - mv mdpro3-other/Picture/* resources/Picture/
+    # - mv mdpro3-other/Sound resources/
 
     # Data
     - git clone --depth 1 https://github.com/mycard/ygopro-scripts
@@ -146,16 +143,16 @@ resources:
     - git clone --depth 1 https://code.moenext.com/mycard/ygopro-database
     - cp -rf ygopro-database/locales/* Data/locales
 
-    - mv Data release/
+    - mv Data resources/
 
     # starter pack
     - git clone --depth 1 https://code.moenext.com/mycard/ygopro-starter-pack
-    - mv ygopro-starter-pack/deck release/Deck
-    - mv ygopro-starter-pack/single release/Puzzle
+    - mv ygopro-starter-pack/deck resources/Deck
+    - mv ygopro-starter-pack/single resources/Puzzle
 
   artifacts:
     paths:
-      - release
+      - resources
 
 .pack:
   stage: pack
@@ -164,13 +161,11 @@ resources:
   script:
     - mkdir -p dist
     - cd Builds/$BUILD_TARGET
-    - rm -rf MDPro3_Data/Standalone*
-    - mv ../../release/MDPro3_Data/* MDPro3_Data/
-    - mv ../../release/Picture .
-    - mv ../../release/Deck .
-    - mv ../../release/Puzzle .
-    # - mv ../../release/Sound .
-    - rsync -a ../../release/Data/ ./Data
+    - mv ../../resources/Picture .
+    - mv ../../resources/Deck .
+    - mv ../../resources/Puzzle .
+    # - mv ../../resources/Sound .
+    - rsync -a ../../resources/Data/ ./Data
     - tar --zstd -cf ../../dist/mdpro3-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM.tar.zst .
     - cd ../..
   artifacts:
@@ -184,7 +179,6 @@ pack_windows:
     TARGET_PLATFORM: win32
   dependencies:
     - StandaloneWindows64
-    - assetbundles_windows
     - resources
 
 pack_linux:
@@ -194,7 +188,6 @@ pack_linux:
     TARGET_PLATFORM: linux
   dependencies:
     - StandaloneLinux64
-    - assetbundles_linux
     - resources
 
 pack_macos:
@@ -204,5 +197,4 @@ pack_macos:
     TARGET_PLATFORM: darwin
   dependencies:
     - StandaloneOSX
-    - assetbundles_macos
     - resources

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -56,7 +56,7 @@ MonoBehaviour:
   m_ContentStateBuildPathProfileVariableName: <default settings path>
   m_CustomContentStateBuildPath: 
   m_ContentStateBuildPath: 
-  m_BuildAddressablesWithPlayerBuild: 2
+  m_BuildAddressablesWithPlayerBuild: 1
   m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
   m_GroupAssets:
   - {fileID: 11400000, guid: 00d23bf82261d794b8ad80777f3da3ae, type: 2}