Skip to content

Commit 260a6a9

Browse files
SamuelBellomoSamuelBellomo
committed
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dogfooding
* feature/bump-2021: auto version bump in package-lock tmp-do-not-push feat: auto reconnect [MTT-2617] (#611) feat: other players loading progress in loading screen [MTT-2239] (#580) adding test constraint to test asmdef (#639) First import of all the vandal imp artwork (#637) feat: connection feedback + IP connection window [MTT-2315] [MTT-3234] (#613) feat: hosting and disconnect smoke test for IP flow (#487) # Conflicts: # Assets/BossRoom/Scenes/Startup.unity
2 parents 9fad5c0 + 1ced2a7 commit 260a6a9

File tree

132 files changed

+8779
-1225
lines changed

Some content is hidden

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

132 files changed

+8779
-1225
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:ef1e1def2bdc708793e780323aef36164a1e85217c13d7e37a6c9bb8f2b93206
3+
size 665

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

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-5970013690206242241
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 5
163
--- !u!21 &2100000
174
Material:
185
serializedVersion: 8
@@ -96,8 +83,6 @@ Material:
9683
- _Mode: 0
9784
- _OcclusionStrength: 1
9885
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10186
- _RimAmount: 0.771
10287
- _RimThreshold: 0
10388
- _SmoothnessTextureChannel: 0
@@ -112,7 +97,7 @@ Material:
11297
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
11398
- _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
11499
m_BuildTextureStacks: []
115-
--- !u!114 &291750459087336187
100+
--- !u!114 &4864082934053653154
116101
MonoBehaviour:
117102
m_ObjectHideFlags: 11
118103
m_CorrespondingSourceObject: {fileID: 0}

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-9751005091268525
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 5
163
--- !u!21 &2100000
174
Material:
185
serializedVersion: 8
@@ -96,8 +83,6 @@ Material:
9683
- _Mode: 0
9784
- _OcclusionStrength: 1
9885
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10186
- _RimAmount: 0.778
10287
- _RimThreshold: 0
10388
- _SmoothnessTextureChannel: 0
@@ -112,7 +97,7 @@ Material:
11297
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
11398
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
11499
m_BuildTextureStacks: []
115-
--- !u!114 &11195970808030904
100+
--- !u!114 &6413572590179603764
116101
MonoBehaviour:
117102
m_ObjectHideFlags: 11
118103
m_CorrespondingSourceObject: {fileID: 0}

‎Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 8
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Hair_Imp_Bomb
11+
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12+
m_ValidKeywords: []
13+
m_InvalidKeywords:
14+
- _EMISSION
15+
- _NORMALMAP
16+
m_LightmapFlags: 2
17+
m_EnableInstancingVariants: 1
18+
m_DoubleSidedGI: 0
19+
m_CustomRenderQueue: -1
20+
stringTagMap: {}
21+
disabledShaderPasses: []
22+
m_SavedProperties:
23+
serializedVersion: 3
24+
m_TexEnvs:
25+
- _BumpMap:
26+
m_Texture: {fileID: 2800000, guid: 72d45c9a8da6ee94cae3fa4b63a43e98, type: 3}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailAlbedoMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailMask:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailNormalMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _EmissionMap:
42+
m_Texture: {fileID: 2800000, guid: 124500397fb3e0343b2f8a6aa5eee25b, type: 3}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MainTex:
46+
m_Texture: {fileID: 2800000, guid: 067fbbfaa3440ea43ae5da97789cee65, type: 3}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _MetallicGlossMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _OcclusionMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _ParallaxMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- unity_Lightmaps:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- unity_LightmapsInd:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- unity_ShadowMasks:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
m_Ints: []
74+
m_Floats:
75+
- _BumpScale: 1
76+
- _Cutoff: 0.5
77+
- _DetailNormalMapScale: 1
78+
- _DstBlend: 0
79+
- _GlossMapScale: 1
80+
- _Glossiness: 2.87
81+
- _GlossyReflections: 1
82+
- _Metallic: 0
83+
- _Mode: 0
84+
- _OcclusionStrength: 1
85+
- _Parallax: 0.02
86+
- _RimAmount: 0.778
87+
- _RimThreshold: 0
88+
- _SmoothnessTextureChannel: 0
89+
- _SpecularHighlights: 1
90+
- _SrcBlend: 1
91+
- _UVSec: 0
92+
- _ZWrite: 1
93+
m_Colors:
94+
- _AmbientColor: {r: 1, g: 1, b: 1, a: 1}
95+
- _Color: {r: 0.128, g: 0.08567467, b: 0.06451201, a: 1}
96+
- _EmissionColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
97+
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
98+
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
99+
m_BuildTextureStacks: []
100+
--- !u!114 &6547934805506010362
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Boy.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-4980724838769866959
3+
--- !u!114 &-6306316136372915674
44
MonoBehaviour:
55
m_ObjectHideFlags: 11
66
m_CorrespondingSourceObject: {fileID: 0}
@@ -96,8 +96,6 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10199
- _RimAmount: 0.778
102100
- _RimThreshold: 0
103101
- _SmoothnessTextureChannel: 0
@@ -112,16 +110,3 @@ Material:
112110
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
113111
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
114112
m_BuildTextureStacks: []
115-
--- !u!114 &3667653722729066752
116-
MonoBehaviour:
117-
m_ObjectHideFlags: 11
118-
m_CorrespondingSourceObject: {fileID: 0}
119-
m_PrefabInstance: {fileID: 0}
120-
m_PrefabAsset: {fileID: 0}
121-
m_GameObject: {fileID: 0}
122-
m_Enabled: 1
123-
m_EditorHideFlags: 0
124-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125-
m_Name:
126-
m_EditorClassIdentifier:
127-
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Girl.mat

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,16 @@ Material:
112112
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
113113
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
114114
m_BuildTextureStacks: []
115+
--- !u!114 &8325592805791008449
116+
MonoBehaviour:
117+
m_ObjectHideFlags: 11
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
m_GameObject: {fileID: 0}
122+
m_Enabled: 1
123+
m_EditorHideFlags: 0
124+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125+
m_Name:
126+
m_EditorClassIdentifier:
127+
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Rogue_Boy.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-2186454493988483094
3+
--- !u!114 &-2096318400469925140
44
MonoBehaviour:
55
m_ObjectHideFlags: 11
66
m_CorrespondingSourceObject: {fileID: 0}
@@ -96,8 +96,6 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10199
- _RimAmount: 0.778
102100
- _RimThreshold: 0
103101
- _SmoothnessTextureChannel: 0
@@ -112,16 +110,3 @@ Material:
112110
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
113111
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
114112
m_BuildTextureStacks: []
115-
--- !u!114 &1089610604387197817
116-
MonoBehaviour:
117-
m_ObjectHideFlags: 11
118-
m_CorrespondingSourceObject: {fileID: 0}
119-
m_PrefabInstance: {fileID: 0}
120-
m_PrefabAsset: {fileID: 0}
121-
m_GameObject: {fileID: 0}
122-
m_Enabled: 1
123-
m_EditorHideFlags: 0
124-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125-
m_Name:
126-
m_EditorClassIdentifier:
127-
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Rogue_Girl.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-1731156720960366395
4-
MonoBehaviour:
5-
m_ObjectHideFlags: 11
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 0}
10-
m_Enabled: 1
11-
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13-
m_Name:
14-
m_EditorClassIdentifier:
15-
version: 5
163
--- !u!21 &2100000
174
Material:
185
serializedVersion: 8
@@ -96,8 +83,6 @@ Material:
9683
- _Mode: 0
9784
- _OcclusionStrength: 1
9885
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10186
- _RimAmount: 0.778
10287
- _RimThreshold: 0
10388
- _SmoothnessTextureChannel: 0
@@ -112,7 +97,7 @@ Material:
11297
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
11398
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
11499
m_BuildTextureStacks: []
115-
--- !u!114 &7370260492650119529
100+
--- !u!114 &8814935330546915290
116101
MonoBehaviour:
117102
m_ObjectHideFlags: 11
118103
m_CorrespondingSourceObject: {fileID: 0}

‎Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Boy.mat

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-2145647639139350329
3+
--- !u!114 &-8757330771333012780
44
MonoBehaviour:
55
m_ObjectHideFlags: 11
66
m_CorrespondingSourceObject: {fileID: 0}
@@ -96,8 +96,6 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
10199
- _RimAmount: 0.778
102100
- _RimThreshold: 0
103101
- _SmoothnessTextureChannel: 0
@@ -112,16 +110,3 @@ Material:
112110
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
113111
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
114112
m_BuildTextureStacks: []
115-
--- !u!114 &5272448003705847202
116-
MonoBehaviour:
117-
m_ObjectHideFlags: 11
118-
m_CorrespondingSourceObject: {fileID: 0}
119-
m_PrefabInstance: {fileID: 0}
120-
m_PrefabAsset: {fileID: 0}
121-
m_GameObject: {fileID: 0}
122-
m_Enabled: 1
123-
m_EditorHideFlags: 0
124-
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125-
m_Name:
126-
m_EditorClassIdentifier:
127-
version: 5

0 commit comments

Comments
 (0)