-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into drum_sp
- Loading branch information
Showing
183 changed files
with
7,972 additions
and
1,812 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!21 &2100000 | ||
| Material: | ||
| serializedVersion: 8 | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: MP Ring FC | ||
| m_Shader: {fileID: -6465566751694194690, guid: f234a0dbfe313d94697e5acc4c227a98, | ||
| type: 3} | ||
| m_ValidKeywords: [] | ||
| m_InvalidKeywords: [] | ||
| m_LightmapFlags: 4 | ||
| m_EnableInstancingVariants: 0 | ||
| m_DoubleSidedGI: 0 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| disabledShaderPasses: [] | ||
| m_SavedProperties: | ||
| serializedVersion: 3 | ||
| m_TexEnvs: | ||
| - _BaseMap: | ||
| m_Texture: {fileID: 2800000, guid: e0e03ff8e82d4bd4eaed85a2b0789904, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _BaseTexture: | ||
| m_Texture: {fileID: 2800000, guid: a41ac8340d2ec134d98edeabf7a11631, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _BumpMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailAlbedoMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailMask: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _DetailNormalMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _EmissionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MainTex: | ||
| m_Texture: {fileID: 2800000, guid: e0e03ff8e82d4bd4eaed85a2b0789904, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _MetallicGlossMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _OcclusionMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _ParallaxMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - _SpecGlossMap: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_Lightmaps: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_LightmapsInd: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - unity_ShadowMasks: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Ints: [] | ||
| m_Floats: | ||
| - Vector1_ea440a03db96485e85275973f7eb77f2: 0.2 | ||
| - _AlphaClip: 0 | ||
| - _Blend: 0 | ||
| - _BumpScale: 1 | ||
| - _ClearCoatMask: 0 | ||
| - _ClearCoatSmoothness: 0 | ||
| - _Coat_Mask: 0 | ||
| - _Coat_Smoothness: 0 | ||
| - _Cull: 2 | ||
| - _Cutoff: 0.5 | ||
| - _DetailAlbedoMapScale: 1 | ||
| - _DetailNormalMapScale: 1 | ||
| - _DstBlend: 0 | ||
| - _Emission: 0 | ||
| - _EnvironmentReflections: 1 | ||
| - _GlossMapScale: 0 | ||
| - _Glossiness: 0 | ||
| - _GlossyReflections: 0 | ||
| - _Metallic: 0 | ||
| - _NoiseScale: -2.8 | ||
| - _NoiseStrength: -1.06 | ||
| - _OcclusionStrength: 1 | ||
| - _Parallax: 0.005 | ||
| - _QueueControl: 0 | ||
| - _QueueOffset: 0 | ||
| - _RandomFloat: 0 | ||
| - _ReceiveShadows: 1 | ||
| - _Smoothness: 0.5 | ||
| - _SmoothnessTextureChannel: 0 | ||
| - _SpecularHighlights: 1 | ||
| - _SrcBlend: 1 | ||
| - _Surface: 0 | ||
| - _WorkflowMode: 1 | ||
| - _ZWrite: 1 | ||
| m_Colors: | ||
| - _BaseColor: {r: 1, g: 0.90009195, b: 0.023584902, a: 1} | ||
| - _Color: {r: 1, g: 0.71509355, b: 0.02352941, a: 1} | ||
| - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
| - _RandomVector: {r: 0, g: 0, b: 0, a: 0} | ||
| - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | ||
| m_BuildTextureStacks: [] | ||
| --- !u!114 &2678127010475715759 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 11 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 0} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| version: 5 |
2 changes: 1 addition & 1 deletion
2
...rt/Meshes/Track_Elements_Default.mat.meta → ...rt/Materials/PlayMode/MP Ring FC.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...layMode/Materials/Track_Shadow 2.mat.meta → ...s/Art/Materials/PlayMode/MP Ring.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...layMode/Materials/Track_Shadow 1.mat.meta → ...rials/PlayMode/Track_Combo_Meter.mat.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.