Skip to content
This repository has been archived by the owner on Nov 13, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
m21-cerutti committed Jul 11, 2021
2 parents 8b64fe5 + 85914a0 commit 18f8137
Show file tree
Hide file tree
Showing 227 changed files with 270,815 additions and 24,248 deletions.
39 changes: 0 additions & 39 deletions .github/workflows/build_graph_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,6 @@ on: workflow_dispatch

jobs:

tests:
name: Tests ${{ matrix.testMode }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
testMode:
- playmode
- editmode
steps:
# Checkout
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
# Cache
- uses: actions/cache@v2
with:
path: Library
key: Library-Test
restore-keys: Library-Test
# Test
- name: Run tests
uses: game-ci/unity-test-runner@v2
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
testMode: ${{ matrix.testMode }}
artifactsPath: ${{ matrix.testMode }}-artifacts
checkName: Test Results ${{ matrix.testMode }}
id: test-out
# Output
- uses: actions/upload-artifact@v2
if: always()
with:
name: Test results for ${{ matrix.testMode }}
path: ${{ steps.test-out.outputs.artifactsPath }}

get-tag:
name: Get tag
runs-on: ubuntu-latest
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/build_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,22 @@ jobs:
name: Test results for ${{ matrix.testMode }}
path: ${{ steps.test-out.outputs.artifactsPath }}

get-tag:
name: Get tag
create-tag:
name: Create tag
runs-on: ubuntu-latest
needs: tests
outputs:
tag: ${{ steps.version.outputs.tag }}
steps:
steps:
# Checkout
- name: Checkout repository
uses: actions/checkout@v2
# Tag fetch
- name: Tag fetch
uses: actions-ecosystem/action-get-latest-tag@v1
# Tag
- name: Tag creation
uses: phish108/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN}}
release-branch: "master,main,develop"
id: version

build:
Expand All @@ -67,7 +70,7 @@ jobs:
- StandaloneWindows
- StandaloneWindows64
- StandaloneLinux64
needs: get-tag
needs: create-tag
steps:
# Checkout
- name: Checkout repository
Expand All @@ -94,10 +97,10 @@ jobs:
- name: Zip build
run: |
pushd build/${{ matrix.targetPlatform }}
zip -r ../../Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip .
zip -r ../../Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip .
popd
# Output Zip
- uses: actions/upload-artifact@v2
with:
name: Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip
path: ./Build-${{ matrix.targetPlatform }}-${{ needs.get-tag.outputs.tag }}.zip
name: Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip
path: ./Build-${{ matrix.targetPlatform }}-${{ needs.create-tag.outputs.tag }}.zip
25 changes: 0 additions & 25 deletions .github/workflows/dev_version.yaml

This file was deleted.

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

179 changes: 179 additions & 0 deletions Assets/Data/Animations/Menu Transi/Fade In.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fade In
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0.66
inSlope: 1
outSlope: 1
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Panel
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Panel/Text (TMP)
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1668086795
attribute: 304273561
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1075923503
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0.66
inSlope: 1
outSlope: 1
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Panel
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Panel/Text (TMP)
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Data/Animations/Menu Transi/Fade In.anim.meta

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

Loading

0 comments on commit 18f8137

Please sign in to comment.