Skip to content

Commit 5a9ebb5

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into feature/heal-or-kill-player-cheat
2 parents 26ca7d6 + a722eb8 commit 5a9ebb5

File tree

194 files changed

+11379
-5954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+11379
-5954
lines changed

‎.github/workflows/autoupdate.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: auto-update
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
jobs:
7+
autoupdate:
8+
name: auto-update
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: docker://chinthakagodawita/autoupdate-action:v1
12+
env:
13+
GITHUB_TOKEN: "${{ secrets.NETCODE_CI_SERVICE_TOKEN }}"
14+
PR_FILTER: "auto_merge"
15+
PR_READY_STATE: "ready_for_review"
16+
MERGE_CONFLICT_ACTION: "ignore"
17+

‎.yamato/project-standards.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{% metadata_file .yamato/project.metafile %}
2+
---
3+
standards_{{ projects.first.name }}:
4+
name: Standards Check {{ projects.first.name }}
5+
agent:
6+
type: Unity::VM
7+
image: desktop/logging-testing-linux:v0.1.2-926285
8+
flavor: b1.medium
9+
commands:
10+
- dotnet --version
11+
- dotnet format --version
12+
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
13+
- unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
14+
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
15+
- dotnet run --project dotnet-tools/netcode.standards -- --project={{ projects.first.path }} --check

‎.yamato/project.metafile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
validation_editor: 2020.3
2+
3+
# Platforms that will be tested. The first entry in this array will also
4+
# be used for validation
5+
test_platforms:
6+
- name: win
7+
type: Unity::VM
8+
image: package-ci/win10:stable
9+
flavor: b1.large
10+
editorpath: .Editor\Unity.exe
11+
utr: .\utr.bat
12+
- name: mac
13+
type: Unity::VM::osx
14+
image: package-ci/mac:stable
15+
flavor: b1.large
16+
editorpath: .Editor/Unity.app/Contents/MacOS/Unity
17+
utr: ./utr
18+
- name: ubuntu
19+
type: Unity::VM
20+
image: package-ci/ubuntu:stable
21+
flavor: b1.large
22+
editorpath: .Editor/Unity
23+
utr: ./utr
24+
25+
# Projects within the repository that will be tested. Name will be used
26+
# for job ids, so it should not contain spaces/non-supported characters
27+
projects:
28+
- name: com.unity.multiplayer.samples.coop
29+
path: .
30+
validate: true
31+
# Packages within a project that will be tested
32+
packages:
33+
- name: com.unity.multiplayer.samples.coop
34+
path: Packages/com.unity.multiplayer.samples.coop
35+
test_editors:
36+
- 2021.1
37+
- 2021.2
38+
- 2020.3
39+
- trunk

‎.yamato/upm-ci.yml

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎Assets/BossRoom/GameData/Action/Archer/ArcherBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:21a470a8f30ac8d33fcebc3a0da8d0d6cd5d4459ec3860fe2897e4481fd7c142
3-
size 1185
2+
oid sha256:add1740f30f9604edabacd15b1667e7e87e8d87f7e7f460df83283493815be6f
3+
size 1190

‎Assets/BossRoom/GameData/Action/Boss/BossImpBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f42c8b44098bce11f911f490c2a9b591154ec91ea45ac7f976bcf4fd9a777d90
3-
size 893
2+
oid sha256:78a688221c3c529b0ad804a5b0f9124886aea12bb393066d8aa35e4578d9e6a1
3+
size 916

‎Assets/BossRoom/GameData/Action/Boss/BossImpTrampleAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:db2842d2b13725ad76131a5033581688d829341806fa39a4acc6695f54edc30e
3-
size 995
2+
oid sha256:e931108c6883dc893a12f829d908afcf5f266246c8897d7f7074f1c92410262d
3+
size 1016

‎Assets/BossRoom/GameData/Action/Imp/ImpBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a98f1f8a7a639885e253211c2db5d07a2a584b8f1278a85bf65b9b9f1e69f104
3-
size 891
2+
oid sha256:394895e048b1e10db039698943484303db2a89e69dcb57d329ce627e0145eaac
3+
size 913

‎Assets/BossRoom/GameData/Action/Mage/MageBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ef8c664c1fa4913e17558d5d856f619841e865406e737be18e17e0380df75635
3-
size 1237
2+
oid sha256:7e5be6a23abcddd484cc7260eeb5994d71819db7b38d3e86e8cb71bf6ce5d70c
3+
size 1240

‎Assets/BossRoom/GameData/Action/Mage/MageHeal.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c31e29db020255b5b54a4153b3692e757474629c0dfcf88e865926ccf0e439a1
3-
size 1111
2+
oid sha256:74ab0fac7294b7d7a2445fcb3446f3407813756a6f747a1ade70ac8ba12df3b6
3+
size 1114

‎Assets/BossRoom/GameData/Action/Rogue/RogueBaseAttack.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fca28ad3dfb101896c93e1bffb13a0c7e2c6343bc9ba82ff132f366eb0d94777
2+
oid sha256:632593cdc46477fe5ac9d0723c5486a094c146b690f201c6e4e3d1cd2f52420e
33
size 1041

‎Assets/BossRoom/GameData/Action/Rogue/RogueDashAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:fea3f4f1d992f72a3d6b970a2d333a9d4e798b9b6ed47a3cb561bc5fbca8ecce
3-
size 1109
2+
oid sha256:51cf453826c56dbe95e242f997f7d89e3d9088346b0eac1ef0dfe286688bb0f5
3+
size 1107

‎Assets/BossRoom/GameData/Action/Tank/TankBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f410171a065de91b302077a46b292de2134cefde702c0fb9030b0be51dc338bd
3-
size 1033
2+
oid sha256:80c72a81acc09cc7c11c34daf87b425726759f25bb736530272e63703cefbc6f
3+
size 1034

‎Assets/BossRoom/GameData/Action/Tank/TankShieldBuff.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:62c559c1217f50f851e9cebc82a25a3a657f0e03c5778fa3397dbcf5cadf43d4
3-
size 1345
2+
oid sha256:f052fd6beabaf4e1bf4d5607e42ead147b165f59a5a36b519ed056642d5dd86a
3+
size 1367

‎Assets/BossRoom/GameData/Character/Archer/Archer.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:46af12e5b6fa15272734ec6f61b68490cf226ab91879b1a59d0c76fcdd6254a7
2+
oid sha256:9d525de16846e73d76bc72eb190c57ea8d35257d79d6da6ab1d3b3775955d0d7
33
size 782

‎Assets/BossRoom/GameData/Character/Imp/Imp.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:320a6fd1653e534b4c85d9c8b4a55037adfc6c11f356d92253c051f888e671d5
2+
oid sha256:43e076424e36f94f11d46a4b2d88d30a94457458535d89ee20f302d7c19f49c4
33
size 659

‎Assets/BossRoom/GameData/Character/ImpBoss/ImpBoss.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:4fc71ffcb26824597f21af7610672dc907d791aedf1bae232d155f96c857dede
2+
oid sha256:82289028624e8b897ca15a2b4f568f473dc232ca52a507bee6aa020fa92d1a04
33
size 666

‎Assets/BossRoom/GameData/Character/Mage/Mage.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:eef86ade765d6f6732976451e436630c1a0aeae573ed6e8ed6c1f4d91dc46c95
2+
oid sha256:3eaf176772d79ce896b5b0a291f6e70de5fed160891da4e1268ea33b40e56b82
33
size 777

‎Assets/BossRoom/GameData/Character/Rogue/Rogue.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:da201b412899840350e9f55fe5e692bcf0c0a962b10f9c0651863f37e76cd5d0
2+
oid sha256:851dc11f3c17e3416b1957397a5e89d7aca441f3d9d6681bc701966da3516541
33
size 780

‎Assets/BossRoom/GameData/Character/Tank/Tank.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:899af2464725b90fb7e7ff4d6e668016d57dc5006ba8fec32db7e1ea0496b1e1
2+
oid sha256:d223ee27a5e5c44fe5a98342f9e997dc00e4afd11f8a8cd6a537eaef40460f30
33
size 777

‎Assets/BossRoom/Models/Animation Controllers/CharacterSetController.controller

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,7 @@ AnimatorState:
13961396
m_PrefabInstance: {fileID: 0}
13971397
m_PrefabAsset: {fileID: 0}
13981398
m_Name: SkillHeal
1399-
m_Speed: 1
1399+
m_Speed: 1.2
14001400
m_CycleOffset: 0
14011401
m_Transitions:
14021402
- {fileID: 7908433373164699421}
@@ -2229,7 +2229,7 @@ AnimatorState:
22292229
m_PrefabInstance: {fileID: 0}
22302230
m_PrefabAsset: {fileID: 0}
22312231
m_Name: TankShieldBuff (start)
2232-
m_Speed: 1
2232+
m_Speed: 1.2
22332233
m_CycleOffset: 0
22342234
m_Transitions:
22352235
- {fileID: 8849726690194494114}
@@ -2914,7 +2914,7 @@ AnimatorState:
29142914
m_PrefabInstance: {fileID: 0}
29152915
m_PrefabAsset: {fileID: 0}
29162916
m_Name: Attack1
2917-
m_Speed: 1
2917+
m_Speed: 1.66
29182918
m_CycleOffset: 0
29192919
m_Transitions:
29202920
- {fileID: -3576141394984483750}

‎Assets/BossRoom/Models/Animation Controllers/DoorController.controller

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ AnimatorState:
139139
m_PrefabInstance: {fileID: 0}
140140
m_PrefabAsset: {fileID: 0}
141141
m_Name: Closed
142-
m_Speed: -1
142+
m_Speed: -1.5
143143
m_CycleOffset: 0
144144
m_Transitions:
145145
- {fileID: 2526322587758064571}

‎Assets/BossRoom/Models/CharacterSet.fbx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:4fdb56ee00d0dcb57b36136cc13f5685fc855d71b91d76ee6000a1c3c748c85f
3-
size 10126464
2+
oid sha256:4fbcaaf8053af9eadeba2aaf547b4a882dd10e60b904a1279b87a21e329e6ba8
3+
size 11474720

‎Assets/BossRoom/Models/CharacterSet.fbx.meta

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics_Rogue.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ MonoBehaviour:
167167
- m_AnimatorNodeName: Attack1
168168
m_AnimatorNodeNameHash: -47317214
169169
m_Prefab: {fileID: 2787649059963953560, guid: 5121957b2fabba043a36ec5641e54be7, type: 3}
170-
m_PrefabSpawnDelaySeconds: 0.8
170+
m_PrefabSpawnDelaySeconds: 0.4
171171
m_PrefabCanBeAbortedUntilSecs: 0
172172
m_PrefabParent: {fileID: 0}
173173
m_PrefabParentOffset: {x: 0, y: 0, z: 0}

‎Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/pillar/env_pillar2.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ MeshRenderer:
5959
m_RenderingLayerMask: 1
6060
m_RendererPriority: 0
6161
m_Materials:
62-
- {fileID: 2100000, guid: de7d8b0cdceac8140b98a459d9533db4, type: 2}
62+
- {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2}
6363
m_StaticBatchInfo:
6464
firstSubMesh: 0
6565
subMeshCount: 0

0 commit comments

Comments
 (0)