Skip to content

Commit 54d2516

Browse files
committed
Merge branch 'osse101-master'
2 parents e5121fa + 846fdf0 commit 54d2516

39 files changed

+1254
-0
lines changed

Assets/Resources/entities.meta

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

Assets/Resources/entities/powers.meta

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

Assets/Resources/entities/powers/Materials.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: obscuration
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
12+
m_LightmapFlags: 4
13+
m_EnableInstancingVariants: 0
14+
m_CustomRenderQueue: -1
15+
stringTagMap: {}
16+
disabledShaderPasses: []
17+
m_SavedProperties:
18+
serializedVersion: 3
19+
m_TexEnvs:
20+
- _BumpMap:
21+
m_Texture: {fileID: 0}
22+
m_Scale: {x: 1, y: 1}
23+
m_Offset: {x: 0, y: 0}
24+
- _DetailAlbedoMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _DetailMask:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailNormalMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _EmissionMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _MainTex:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _MetallicGlossMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _OcclusionMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _ParallaxMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
m_Floats:
57+
- _BumpScale: 1
58+
- _Cutoff: 0.5
59+
- _DetailNormalMapScale: 1
60+
- _DstBlend: 0
61+
- _GlossMapScale: 1
62+
- _Glossiness: 0
63+
- _GlossyReflections: 1
64+
- _Metallic: 0.534
65+
- _Mode: 0
66+
- _OcclusionStrength: 1
67+
- _Parallax: 0.02
68+
- _SmoothnessTextureChannel: 0
69+
- _SpecularHighlights: 1
70+
- _SrcBlend: 1
71+
- _UVSec: 0
72+
- _ZWrite: 1
73+
m_Colors:
74+
- _Color: {r: 0, g: 0, b: 0, a: 1}
75+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/entities/powers/Materials/obscuration.mat.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: obstruction
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
12+
m_LightmapFlags: 4
13+
m_EnableInstancingVariants: 0
14+
m_CustomRenderQueue: -1
15+
stringTagMap: {}
16+
disabledShaderPasses: []
17+
m_SavedProperties:
18+
serializedVersion: 3
19+
m_TexEnvs:
20+
- _BumpMap:
21+
m_Texture: {fileID: 0}
22+
m_Scale: {x: 1, y: 1}
23+
m_Offset: {x: 0, y: 0}
24+
- _DetailAlbedoMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _DetailMask:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailNormalMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _EmissionMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _MainTex:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _MetallicGlossMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _OcclusionMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _ParallaxMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
m_Floats:
57+
- _BumpScale: 1
58+
- _Cutoff: 0.5
59+
- _DetailNormalMapScale: 1
60+
- _DstBlend: 0
61+
- _GlossMapScale: 1
62+
- _Glossiness: 0.12
63+
- _GlossyReflections: 1
64+
- _Metallic: 0
65+
- _Mode: 0
66+
- _OcclusionStrength: 1
67+
- _Parallax: 0.02
68+
- _SmoothnessTextureChannel: 0
69+
- _SpecularHighlights: 1
70+
- _SrcBlend: 1
71+
- _UVSec: 0
72+
- _ZWrite: 1
73+
m_Colors:
74+
- _Color: {r: 0.50735295, g: 0.50735295, b: 0.50735295, a: 1}
75+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/entities/powers/Materials/obstruction.mat.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: slow_zone
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
12+
m_LightmapFlags: 4
13+
m_EnableInstancingVariants: 0
14+
m_CustomRenderQueue: 3000
15+
stringTagMap:
16+
RenderType: Transparent
17+
disabledShaderPasses: []
18+
m_SavedProperties:
19+
serializedVersion: 3
20+
m_TexEnvs:
21+
- _BumpMap:
22+
m_Texture: {fileID: 0}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
- _DetailAlbedoMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _DetailMask:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailNormalMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _EmissionMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _MainTex:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _MetallicGlossMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _OcclusionMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _ParallaxMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
m_Floats:
58+
- _BumpScale: 1
59+
- _Cutoff: 0.5
60+
- _DetailNormalMapScale: 1
61+
- _DstBlend: 10
62+
- _GlossMapScale: 1
63+
- _Glossiness: 0.5
64+
- _GlossyReflections: 1
65+
- _Metallic: 0
66+
- _Mode: 3
67+
- _OcclusionStrength: 1
68+
- _Parallax: 0.02
69+
- _SmoothnessTextureChannel: 0
70+
- _SpecularHighlights: 1
71+
- _SrcBlend: 1
72+
- _UVSec: 0
73+
- _ZWrite: 0
74+
m_Colors:
75+
- _Color: {r: 0.29411763, g: 0.2989859, b: 1, a: 0.365}
76+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Resources/entities/powers/Materials/slow_zone.mat.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &100100000
4+
Prefab:
5+
m_ObjectHideFlags: 1
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications: []
10+
m_RemovedComponents: []
11+
m_ParentPrefab: {fileID: 0}
12+
m_RootGameObject: {fileID: 1021690674191732}
13+
m_IsPrefabParent: 1
14+
--- !u!1 &1021690674191732
15+
GameObject:
16+
m_ObjectHideFlags: 0
17+
m_PrefabParentObject: {fileID: 0}
18+
m_PrefabInternal: {fileID: 100100000}
19+
serializedVersion: 5
20+
m_Component:
21+
- component: {fileID: 4722695156566624}
22+
- component: {fileID: 33945105312945662}
23+
- component: {fileID: 64644908670006818}
24+
- component: {fileID: 23597967409518666}
25+
m_Layer: 0
26+
m_Name: obscuration
27+
m_TagString: Untagged
28+
m_Icon: {fileID: 0}
29+
m_NavMeshLayer: 0
30+
m_StaticEditorFlags: 0
31+
m_IsActive: 1
32+
--- !u!4 &4722695156566624
33+
Transform:
34+
m_ObjectHideFlags: 1
35+
m_PrefabParentObject: {fileID: 0}
36+
m_PrefabInternal: {fileID: 100100000}
37+
m_GameObject: {fileID: 1021690674191732}
38+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
39+
m_LocalPosition: {x: -3.1561263, y: -14.292994, z: 7.005636}
40+
m_LocalScale: {x: 1, y: 1, z: 1}
41+
m_Children: []
42+
m_Father: {fileID: 0}
43+
m_RootOrder: 0
44+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
45+
--- !u!23 &23597967409518666
46+
MeshRenderer:
47+
m_ObjectHideFlags: 1
48+
m_PrefabParentObject: {fileID: 0}
49+
m_PrefabInternal: {fileID: 100100000}
50+
m_GameObject: {fileID: 1021690674191732}
51+
m_Enabled: 1
52+
m_CastShadows: 1
53+
m_ReceiveShadows: 1
54+
m_MotionVectors: 1
55+
m_LightProbeUsage: 1
56+
m_ReflectionProbeUsage: 1
57+
m_Materials:
58+
- {fileID: 2100000, guid: 32df4bc437c51474bad8656ecba092b2, type: 2}
59+
m_StaticBatchInfo:
60+
firstSubMesh: 0
61+
subMeshCount: 0
62+
m_StaticBatchRoot: {fileID: 0}
63+
m_ProbeAnchor: {fileID: 0}
64+
m_LightProbeVolumeOverride: {fileID: 0}
65+
m_ScaleInLightmap: 1
66+
m_PreserveUVs: 1
67+
m_IgnoreNormalsForChartDetection: 0
68+
m_ImportantGI: 0
69+
m_SelectedEditorRenderState: 3
70+
m_MinimumChartSize: 4
71+
m_AutoUVMaxDistance: 0.5
72+
m_AutoUVMaxAngle: 89
73+
m_LightmapParameters: {fileID: 0}
74+
m_SortingLayerID: 0
75+
m_SortingLayer: 0
76+
m_SortingOrder: 0
77+
--- !u!33 &33945105312945662
78+
MeshFilter:
79+
m_ObjectHideFlags: 1
80+
m_PrefabParentObject: {fileID: 0}
81+
m_PrefabInternal: {fileID: 100100000}
82+
m_GameObject: {fileID: 1021690674191732}
83+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
84+
--- !u!64 &64644908670006818
85+
MeshCollider:
86+
m_ObjectHideFlags: 1
87+
m_PrefabParentObject: {fileID: 0}
88+
m_PrefabInternal: {fileID: 100100000}
89+
m_GameObject: {fileID: 1021690674191732}
90+
m_Material: {fileID: 0}
91+
m_IsTrigger: 0
92+
m_Enabled: 1
93+
serializedVersion: 2
94+
m_Convex: 0
95+
m_InflateMesh: 0
96+
m_SkinWidth: 0.01
97+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}

0 commit comments

Comments
 (0)