Skip to content

Commit

Permalink
Merge pull request #2871 from planetarium/fast-track/30
Browse files Browse the repository at this point in the history
Fast track/30
  • Loading branch information
sonohoshi authored Aug 10, 2023
2 parents 4c89a25 + 1d69bfb commit c07bf28
Show file tree
Hide file tree
Showing 365 changed files with 12,143 additions and 243 deletions.
7 changes: 6 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ root = true
charset = utf-8
end_of_line = lf
insert_final_newline = true
tab_width = 8
tab_width = 4
trim_trailing_whitespace = true

[*.{cs,csproj,md,xml}]
Expand Down Expand Up @@ -41,3 +41,8 @@ quote_type = double

[*.sln]
indent_style = tab

[*.{yaml, yml}]
indent_size = 2
quote_type = double
tab_width = 2
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
nekoyume/Assets/Plugins/**/*.so filter=lfs diff=lfs merge=lfs -text
tools/**/*.exe filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle filter=lfs diff=lfs merge=lfs -text
93 changes: 93 additions & 0 deletions .github/workflows/build-via-workflow-dispatch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Build via Workflow Dispatch
on:
workflow_dispatch:
inputs:
targetPlatform:
description: "Target Platform"
required: true
type: choice
default: "Android"
options:
- "Android(AAB)"
- "Android(APK)"
- "StandaloneWindows"
- "StandaloneLinux64"
- "StandaloneOSX"
clo:
description: "Assets/StreamingAssets/clo.json"
required: false
type: string
default: ""

jobs:
build:
name: Build for ${{ github.event.inputs.targetPlatform }}
env:
TARGET_PLATFORM: ${{
startsWith(github.event.inputs.targetPlatform, 'Android')
&& 'Android'
|| github.event.inputs.targetPlatform
}}
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
runs-on:
labels: ["linux", "8cores"]
steps:
- uses: actions/checkout@v3
with:
lfs: true
submodules: true

- uses: actions/cache@v3
with:
path: nekoyume/Library
key: Library-nekoyume-ubuntu-${{ github.env.TARGET_PLATFORM }}
restore-keys: |
Library-nekoyume-ubuntu-
Library-
- name: Copy clo.json
run: |
if [ -n "${{ github.event.inputs.clo }}" ]; then
echo ${{ github.event.inputs.clo }} > nekoyume/Assets/StreamingAssets/clo.json
fi
- uses: game-ci/unity-builder@v2
with:
androidAppBundle: ${{ github.event.inputs.targetPlatform == 'Android(AAB)' }}
androidKeystoreName: 9c-aos-signing-keystore.keystore # This file won't exist, but this property needs to exist.
androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }}
androidKeyaliasName: ${{ secrets.ANDROID_KEY_ALIAS_NAME }}
androidKeyaliasPass: ${{ secrets.ANDROID_KEY_ALIAS_PASS }}
buildMethod: "Editor.Builder.Build${{ github.env.TARGET_PLATFORM }}"
buildName: ${{ github.env.TARGET_PLATFORM }}
projectPath: nekoyume
targetPlatform: ${{ github.env.TARGET_PLATFORM }}

- uses: actions/setup-python@v4
with:
python-version: 3.11.0

- name: Pack
run: |
if [ github.env.TARGET_PLATFORM == "Android" ]; then
tr -d "\r" < .github/bin/pack.sh > .github/bin/pack_trimed.sh
rm .github/bin/pack.sh
mv .github/bin/pack_trimed.sh .github/bin/pack.sh
fi
sudo mv $GITHUB_WORKSPACE/build /tmp/player
pip3 install wheel
sudo bash .github/bin/pack.sh \
/tmp/packages \
"${{ github.env.TARGET_PLATFORM }}" \
"/tmp/player"
- uses: actions/upload-artifact@v3
with:
name: Build-${{ github.env.TARGET_PLATFORM }}
path: /tmp/packages
retention-days: 7
if-no-files-found: error
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,4 @@ nekoyume/Assets/StreamingAssets/9c_dev*

# Keystores
*.keystore
*.keystore.meta
Original file line number Diff line number Diff line change
Expand Up @@ -12582,12 +12582,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7004156271689514272}
m_RootOrder: 4
m_Father: {fileID: 8338442938563373544}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 173.53996, y: -36.620007}
m_AnchoredPosition: {x: 115.53996, y: -36.620007}
m_SizeDelta: {x: 130, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8338442937347405793
Expand Down Expand Up @@ -12961,6 +12961,7 @@ RectTransform:
- {fileID: 1148819529888051777}
- {fileID: 5204584470288503779}
- {fileID: 7004156271689514272}
- {fileID: 8338442937347405798}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -13484,7 +13485,6 @@ RectTransform:
- {fileID: 8338442937243993079}
- {fileID: 1944878149879175434}
- {fileID: 4116474407613894361}
- {fileID: 8338442937347405798}
m_Father: {fileID: 8338442938563373544}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29368,12 +29368,12 @@ RectTransform:
m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4617867177338651019}
m_RootOrder: 5
m_Father: {fileID: 6684225965647263715}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -48}
m_AnchoredPosition: {x: 0, y: -78.00001}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6752938357428850992
Expand Down Expand Up @@ -49761,7 +49761,6 @@ RectTransform:
- {fileID: 2289669823915776800}
- {fileID: 6210845405394287771}
- {fileID: 8822888979465370497}
- {fileID: 6659974995213235428}
m_Father: {fileID: 6684225965647263715}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -65620,6 +65619,7 @@ RectTransform:
m_Children:
- {fileID: 4617867177338651019}
- {fileID: 8088310778780114024}
- {fileID: 6659974995213235428}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ RectTransform:
- {fileID: 21887679660293355}
- {fileID: 2505441311892281251}
- {fileID: 8232355514928224794}
- {fileID: 6864952659803937324}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1576,7 +1577,7 @@ RectTransform:
m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2505441311892281251}
m_Father: {fileID: 21887680680723080}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -2587,7 +2588,6 @@ RectTransform:
- {fileID: 21887681494209307}
- {fileID: 7604452899302235937}
- {fileID: 654358469586272635}
- {fileID: 6864952659803937324}
m_Father: {fileID: 21887680680723080}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,7 @@ RectTransform:
- {fileID: 2117963323469927503}
- {fileID: 8347244533818123768}
- {fileID: 7716833337508423867}
- {fileID: 9044489233577518989}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -2320,7 +2321,6 @@ RectTransform:
- {fileID: 2543131741972588869}
- {fileID: 2543131741813834659}
- {fileID: 9184220585697022119}
- {fileID: 9044489233577518989}
m_Father: {fileID: 1806947039787728185}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -4401,8 +4401,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2117963323469927503}
m_RootOrder: 3
m_Father: {fileID: 1806947039787728185}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ RectTransform:
m_Children:
- {fileID: 8054985533658865450}
m_Father: {fileID: 7702144876723794782}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -150,6 +150,7 @@ RectTransform:
- {fileID: 3317755364091931427}
- {fileID: 7702144876723794782}
- {fileID: 814064675049409318}
- {fileID: 3028424330904642687}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -330,12 +331,12 @@ RectTransform:
m_LocalScale: {x: 1.1, y: 1.1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7702144876723794782}
m_RootOrder: 0
m_Father: {fileID: 2674885860706672921}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -21.999989}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1806462785869275233
Expand Down Expand Up @@ -494,7 +495,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3028424330904642687}
- {fileID: 2660394460532417418}
m_Father: {fileID: 2674885860706672921}
m_RootOrder: 1
Expand Down
8 changes: 8 additions & 0 deletions nekoyume/Assets/Editor Default Resources/Firebase.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c07bf28

Please sign in to comment.