Skip to content

Commit b14f2eb

Browse files
ciro-unityciro-unity
committed
Graphic work (mostly Cave)
1 parent 27bcf1d commit b14f2eb

34 files changed

+23030
-36319
lines changed

‎UOP1_Project/Assets/Art/Effects/Fire/Halo.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Material:
138138
- _WorkflowMode: 1
139139
- _ZWrite: 0
140140
m_Colors:
141-
- _BaseColor: {r: 0.5849056, g: 0.511276, b: 0, a: 0.03137255}
141+
- _BaseColor: {r: 0.6603774, g: 0.5761682, b: 0, a: 0.03137255}
142142
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
143143
- _CameraFadeParams: {r: 0, g: 0.21321961, b: 0, a: 0}
144144
- _Color: {r: 1, g: 1, b: 1, a: 1}

‎UOP1_Project/Assets/Art/Effects/Fire/HaloStrong.mat

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-9127890310756508240
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: 4
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: HaloStrong
24+
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
25+
m_ShaderKeywords: _FADING_ON _SOFTPARTICLES_ON
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: 3000
30+
stringTagMap:
31+
RenderType: Transparent
32+
disabledShaderPasses:
33+
- SHADOWCASTER
34+
m_SavedProperties:
35+
serializedVersion: 3
36+
m_TexEnvs:
37+
- _BaseMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _BumpMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _DetailAlbedoMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailMask:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _DetailNormalMap:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _EmissionMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MainTex:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _MetallicGlossMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _OcclusionMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _ParallaxMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- _SpecGlossMap:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- unity_Lightmaps:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
- unity_LightmapsInd:
86+
m_Texture: {fileID: 0}
87+
m_Scale: {x: 1, y: 1}
88+
m_Offset: {x: 0, y: 0}
89+
- unity_ShadowMasks:
90+
m_Texture: {fileID: 0}
91+
m_Scale: {x: 1, y: 1}
92+
m_Offset: {x: 0, y: 0}
93+
m_Floats:
94+
- _AlphaClip: 0
95+
- _Blend: 2
96+
- _BlendOp: 0
97+
- _BumpScale: 1
98+
- _CameraFadingEnabled: 1
99+
- _CameraFarFadeDistance: 4.69
100+
- _CameraNearFadeDistance: 0
101+
- _ClearCoatMask: 0
102+
- _ClearCoatSmoothness: 0
103+
- _ColorMode: 0
104+
- _Cull: 2
105+
- _Cutoff: 0.5
106+
- _DetailAlbedoMapScale: 1
107+
- _DetailNormalMapScale: 1
108+
- _DistortionBlend: 0
109+
- _DistortionEnabled: 0
110+
- _DistortionStrength: 4.88
111+
- _DistortionStrengthScaled: 0.488
112+
- _DstBlend: 1
113+
- _EnvironmentReflections: 1
114+
- _FlipbookBlending: 0
115+
- _FlipbookMode: 0
116+
- _GlossMapScale: 0
117+
- _Glossiness: 0
118+
- _GlossinessSource: 0
119+
- _GlossyReflections: 0
120+
- _Metallic: 0
121+
- _Mode: 0
122+
- _OcclusionStrength: 1
123+
- _Parallax: 0.005
124+
- _QueueOffset: 0
125+
- _ReceiveShadows: 1
126+
- _SampleGI: 0
127+
- _Shininess: 0
128+
- _Smoothness: 0.5
129+
- _SmoothnessSource: 0
130+
- _SmoothnessTextureChannel: 0
131+
- _SoftParticlesEnabled: 1
132+
- _SoftParticlesFarFadeDistance: 1.03
133+
- _SoftParticlesNearFadeDistance: 0
134+
- _SpecSource: 0
135+
- _SpecularHighlights: 1
136+
- _SrcBlend: 5
137+
- _Surface: 1
138+
- _WorkflowMode: 1
139+
- _ZWrite: 0
140+
m_Colors:
141+
- _BaseColor: {r: 0.75471693, g: 0.6670774, b: 0.17494783, a: 0.07058824}
142+
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
143+
- _CameraFadeParams: {r: 0, g: 0.21321961, b: 0, a: 0}
144+
- _Color: {r: 1, g: 1, b: 1, a: 1}
145+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
146+
- _SoftParticleFadeParams: {r: 0, g: 0.97087383, b: 0, a: 0}
147+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
148+
m_BuildTextureStacks: []

‎UOP1_Project/Assets/Art/Effects/Fire/HaloStrong.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.

‎UOP1_Project/Assets/Art/Props/Food/CritterEggs/RockCritter_GoldEgg.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Material:
103103
m_Offset: {x: 0, y: 0}
104104
m_Floats:
105105
- Vector1_3e3b6395fabf49c3b4ec6a4211e480d5: 0.7
106-
- Vector1_8606F96E: 7
106+
- Vector1_8606F96E: 10
107107
- _AlphaClip: 0
108108
- _Blend: 0
109109
- _BumpScale: 1

‎UOP1_Project/Assets/Prefabs/Effects/Halo.prefab

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2135585165905556546
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 9010247137273191754}
12+
- component: {fileID: 5331030536156270174}
13+
- component: {fileID: 494031379052716791}
14+
m_Layer: 0
15+
m_Name: Halo
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &9010247137273191754
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 2135585165905556546}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children:
32+
- {fileID: 8501509308383438100}
33+
m_Father: {fileID: 0}
34+
m_RootOrder: 0
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!33 &5331030536156270174
37+
MeshFilter:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 2135585165905556546}
43+
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
44+
--- !u!23 &494031379052716791
45+
MeshRenderer:
46+
m_ObjectHideFlags: 0
47+
m_CorrespondingSourceObject: {fileID: 0}
48+
m_PrefabInstance: {fileID: 0}
49+
m_PrefabAsset: {fileID: 0}
50+
m_GameObject: {fileID: 2135585165905556546}
51+
m_Enabled: 1
52+
m_CastShadows: 0
53+
m_ReceiveShadows: 1
54+
m_DynamicOccludee: 1
55+
m_MotionVectors: 1
56+
m_LightProbeUsage: 0
57+
m_ReflectionProbeUsage: 0
58+
m_RayTracingMode: 2
59+
m_RayTraceProcedural: 0
60+
m_RenderingLayerMask: 1
61+
m_RendererPriority: 0
62+
m_Materials:
63+
- {fileID: 2100000, guid: 6d84105dc7d10da49ba719b7a6f1cec3, type: 2}
64+
m_StaticBatchInfo:
65+
firstSubMesh: 0
66+
subMeshCount: 0
67+
m_StaticBatchRoot: {fileID: 0}
68+
m_ProbeAnchor: {fileID: 0}
69+
m_LightProbeVolumeOverride: {fileID: 0}
70+
m_ScaleInLightmap: 1
71+
m_ReceiveGI: 1
72+
m_PreserveUVs: 0
73+
m_IgnoreNormalsForChartDetection: 0
74+
m_ImportantGI: 0
75+
m_StitchLightmapSeams: 1
76+
m_SelectedEditorRenderState: 3
77+
m_MinimumChartSize: 4
78+
m_AutoUVMaxDistance: 0.5
79+
m_AutoUVMaxAngle: 89
80+
m_LightmapParameters: {fileID: 0}
81+
m_SortingLayerID: 0
82+
m_SortingLayer: 0
83+
m_SortingOrder: 0
84+
m_AdditionalVertexStreams: {fileID: 0}
85+
--- !u!1 &9192644906442211772
86+
GameObject:
87+
m_ObjectHideFlags: 0
88+
m_CorrespondingSourceObject: {fileID: 0}
89+
m_PrefabInstance: {fileID: 0}
90+
m_PrefabAsset: {fileID: 0}
91+
serializedVersion: 6
92+
m_Component:
93+
- component: {fileID: 8501509308383438100}
94+
- component: {fileID: 1912518419084214610}
95+
- component: {fileID: 1355687855981292519}
96+
m_Layer: 0
97+
m_Name: InnerHalo
98+
m_TagString: Untagged
99+
m_Icon: {fileID: 0}
100+
m_NavMeshLayer: 0
101+
m_StaticEditorFlags: 0
102+
m_IsActive: 1
103+
--- !u!4 &8501509308383438100
104+
Transform:
105+
m_ObjectHideFlags: 0
106+
m_CorrespondingSourceObject: {fileID: 0}
107+
m_PrefabInstance: {fileID: 0}
108+
m_PrefabAsset: {fileID: 0}
109+
m_GameObject: {fileID: 9192644906442211772}
110+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
111+
m_LocalPosition: {x: 0, y: 0, z: 0}
112+
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
113+
m_Children: []
114+
m_Father: {fileID: 9010247137273191754}
115+
m_RootOrder: 0
116+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
117+
--- !u!33 &1912518419084214610
118+
MeshFilter:
119+
m_ObjectHideFlags: 0
120+
m_CorrespondingSourceObject: {fileID: 0}
121+
m_PrefabInstance: {fileID: 0}
122+
m_PrefabAsset: {fileID: 0}
123+
m_GameObject: {fileID: 9192644906442211772}
124+
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
125+
--- !u!23 &1355687855981292519
126+
MeshRenderer:
127+
m_ObjectHideFlags: 0
128+
m_CorrespondingSourceObject: {fileID: 0}
129+
m_PrefabInstance: {fileID: 0}
130+
m_PrefabAsset: {fileID: 0}
131+
m_GameObject: {fileID: 9192644906442211772}
132+
m_Enabled: 1
133+
m_CastShadows: 0
134+
m_ReceiveShadows: 1
135+
m_DynamicOccludee: 1
136+
m_MotionVectors: 1
137+
m_LightProbeUsage: 0
138+
m_ReflectionProbeUsage: 0
139+
m_RayTracingMode: 2
140+
m_RayTraceProcedural: 0
141+
m_RenderingLayerMask: 1
142+
m_RendererPriority: 0
143+
m_Materials:
144+
- {fileID: 2100000, guid: 6d84105dc7d10da49ba719b7a6f1cec3, type: 2}
145+
m_StaticBatchInfo:
146+
firstSubMesh: 0
147+
subMeshCount: 0
148+
m_StaticBatchRoot: {fileID: 0}
149+
m_ProbeAnchor: {fileID: 0}
150+
m_LightProbeVolumeOverride: {fileID: 0}
151+
m_ScaleInLightmap: 1
152+
m_ReceiveGI: 1
153+
m_PreserveUVs: 0
154+
m_IgnoreNormalsForChartDetection: 0
155+
m_ImportantGI: 0
156+
m_StitchLightmapSeams: 1
157+
m_SelectedEditorRenderState: 3
158+
m_MinimumChartSize: 4
159+
m_AutoUVMaxDistance: 0.5
160+
m_AutoUVMaxAngle: 89
161+
m_LightmapParameters: {fileID: 0}
162+
m_SortingLayerID: 0
163+
m_SortingLayer: 0
164+
m_SortingOrder: 0
165+
m_AdditionalVertexStreams: {fileID: 0}

‎UOP1_Project/Assets/Prefabs/Effects/Halo.prefab.meta

Lines changed: 7 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)