Skip to content

Commit 5721b55

Browse files
atrakeuratrakeur
committed
Merge branch 'master' of gitlab.com:Atrakeur/noname
2 parents 9164662 + 853b922 commit 5721b55

35 files changed

+1911
-4
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# =============== #
44
Temp/
55
Build/
6+
build/
67
Obj/
78
UnityGenerated/
89
Library/

‎Assets/Materials/C_Tile_256x256_B.mat

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
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: C_Tile_256x256_B
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
12+
m_LightmapFlags: 5
13+
m_CustomRenderQueue: -1
14+
stringTagMap: {}
15+
m_SavedProperties:
16+
serializedVersion: 2
17+
m_TexEnvs:
18+
data:
19+
first:
20+
name: _MainTex
21+
second:
22+
m_Texture: {fileID: 2800000, guid: 7a819a6ef7f6fca47a8947db468ce120, type: 3}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
data:
26+
first:
27+
name: _BumpMap
28+
second:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
data:
33+
first:
34+
name: _DetailNormalMap
35+
second:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
data:
40+
first:
41+
name: _ParallaxMap
42+
second:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
data:
47+
first:
48+
name: _OcclusionMap
49+
second:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
data:
54+
first:
55+
name: _EmissionMap
56+
second:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
data:
61+
first:
62+
name: _DetailMask
63+
second:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
data:
68+
first:
69+
name: _DetailAlbedoMap
70+
second:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
data:
75+
first:
76+
name: _MetallicGlossMap
77+
second:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
m_Floats:
82+
data:
83+
first:
84+
name: _SrcBlend
85+
second: 1
86+
data:
87+
first:
88+
name: _DstBlend
89+
second: 0
90+
data:
91+
first:
92+
name: _Cutoff
93+
second: .5
94+
data:
95+
first:
96+
name: _Parallax
97+
second: .0199999996
98+
data:
99+
first:
100+
name: _ZWrite
101+
second: 1
102+
data:
103+
first:
104+
name: _Glossiness
105+
second: .5
106+
data:
107+
first:
108+
name: _BumpScale
109+
second: 1
110+
data:
111+
first:
112+
name: _OcclusionStrength
113+
second: 1
114+
data:
115+
first:
116+
name: _DetailNormalMapScale
117+
second: 1
118+
data:
119+
first:
120+
name: _UVSec
121+
second: 0
122+
data:
123+
first:
124+
name: _Mode
125+
second: 0
126+
data:
127+
first:
128+
name: _Metallic
129+
second: 0
130+
m_Colors:
131+
data:
132+
first:
133+
name: _EmissionColor
134+
second: {r: 0, g: 0, b: 0, a: 1}
135+
data:
136+
first:
137+
name: _Color
138+
second: {r: .0758619234, g: 0, b: 1, a: 1}

‎Assets/Materials/C_Tile_256x256_B.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/Materials/C_Tile_256x256_G.mat

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
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: C_Tile_256x256_G
10+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11+
m_ShaderKeywords:
12+
m_LightmapFlags: 5
13+
m_CustomRenderQueue: -1
14+
stringTagMap: {}
15+
m_SavedProperties:
16+
serializedVersion: 2
17+
m_TexEnvs:
18+
data:
19+
first:
20+
name: _MainTex
21+
second:
22+
m_Texture: {fileID: 2800000, guid: 7a819a6ef7f6fca47a8947db468ce120, type: 3}
23+
m_Scale: {x: 1, y: 1}
24+
m_Offset: {x: 0, y: 0}
25+
data:
26+
first:
27+
name: _BumpMap
28+
second:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
data:
33+
first:
34+
name: _DetailNormalMap
35+
second:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
data:
40+
first:
41+
name: _ParallaxMap
42+
second:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
data:
47+
first:
48+
name: _OcclusionMap
49+
second:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
data:
54+
first:
55+
name: _EmissionMap
56+
second:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
data:
61+
first:
62+
name: _DetailMask
63+
second:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
data:
68+
first:
69+
name: _DetailAlbedoMap
70+
second:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
data:
75+
first:
76+
name: _MetallicGlossMap
77+
second:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
m_Floats:
82+
data:
83+
first:
84+
name: _SrcBlend
85+
second: 1
86+
data:
87+
first:
88+
name: _DstBlend
89+
second: 0
90+
data:
91+
first:
92+
name: _Cutoff
93+
second: .5
94+
data:
95+
first:
96+
name: _Parallax
97+
second: .0199999996
98+
data:
99+
first:
100+
name: _ZWrite
101+
second: 1
102+
data:
103+
first:
104+
name: _Glossiness
105+
second: .5
106+
data:
107+
first:
108+
name: _BumpScale
109+
second: 1
110+
data:
111+
first:
112+
name: _OcclusionStrength
113+
second: 1
114+
data:
115+
first:
116+
name: _DetailNormalMapScale
117+
second: 1
118+
data:
119+
first:
120+
name: _UVSec
121+
second: 0
122+
data:
123+
first:
124+
name: _Mode
125+
second: 0
126+
data:
127+
first:
128+
name: _Metallic
129+
second: 0
130+
m_Colors:
131+
data:
132+
first:
133+
name: _EmissionColor
134+
second: {r: 0, g: 0, b: 0, a: 1}
135+
data:
136+
first:
137+
name: _Color
138+
second: {r: 0, g: 1, b: .255172491, a: 1}

‎Assets/Materials/C_Tile_256x256_G.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/Resource.meta renamed to ‎Assets/Resources.meta

File renamed without changes.

‎Assets/Resource/Main Camera.prefab renamed to ‎Assets/Resources/Main Camera.prefab

File renamed without changes.

‎Assets/Resource/Main Camera.prefab.meta renamed to ‎Assets/Resources/Main Camera.prefab.meta

File renamed without changes.

‎Assets/Resource/NetworkManager.prefab renamed to ‎Assets/Resources/NetworkManager.prefab

File renamed without changes.

‎Assets/Resource/NetworkManager.prefab.meta renamed to ‎Assets/Resources/NetworkManager.prefab.meta

File renamed without changes.

‎Assets/Resource/Player.prefab renamed to ‎Assets/Resources/Player.prefab

File renamed without changes.

‎Assets/Resource/Player.prefab.meta renamed to ‎Assets/Resources/Player.prefab.meta

File renamed without changes.

‎Assets/Resources/QG.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/QG/Prefabs.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.

0 commit comments

Comments
 (0)