Skip to content

Commit

Permalink
Merge branch 'main' of github.com:holycanvas/Crazy-Circus
Browse files Browse the repository at this point in the history
  • Loading branch information
moshuying committed Jul 7, 2024
2 parents c3cdfdc + 49f7ab9 commit c077623
Show file tree
Hide file tree
Showing 126 changed files with 8,090 additions and 4,092 deletions.
112 changes: 112 additions & 0 deletions Assets/Materials/BarriersMain_M.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
%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: BarriersMain_M
m_Shader: {fileID: 4800000, guid: e8a820dc9aec7d946a12eaea41e5bffb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
- _EMISSION
m_InvalidKeywords:
- CURVEDWORLD_BEND_ID_1
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: CurvedWorld_Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _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: 4173481d788a86b428367628bc9ebb68, 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}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.15
- _GlossyReflections: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CurvedWorldBendSettings: {r: 27, g: 1, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/BarriersMain_M.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,22 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fog
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _FADING_ON
m_InvalidKeywords: []
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _FADING_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- GRABPASS
m_LockedProperties:
- ALWAYS
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -63,7 +57,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
Expand Down Expand Up @@ -103,4 +96,3 @@ Material:
- _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0.02, b: 0, a: 0}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,22 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SimpleTownLite_Road
m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
- CURVEDWORLD_NORMAL_TRANSFORMATION_ON
m_InvalidKeywords:
- CURVEDWORLD_BEND_ID_1
m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
CURVEDWORLD_NORMAL_TRANSFORMATION_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: CurvedWorld_Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -91,7 +85,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- CurvedWorld_Toggle: 0
- CurvedWorld_Transform_Normal: 0
Expand Down Expand Up @@ -144,4 +137,3 @@ Material:
- _V_CW_MainTex_Scroll: {r: 0, g: 0, b: 0, a: 0}
- _V_CW_ReflectColor: {r: 1, g: 1, b: 1, a: 1}
- _V_CW_Rim_Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,21 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Vehicle_PizzaCar
m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
m_InvalidKeywords:
- CURVEDWORLD_BEND_ID_1
m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: CurvedWorld_Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -90,7 +84,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- CurvedWorld_Toggle: 0
- CurvedWorld_Transform_Normal: 0
Expand Down Expand Up @@ -143,4 +136,3 @@ Material:
- _V_CW_MainTex_Scroll: {r: 0, g: 0, b: 0, a: 0}
- _V_CW_ReflectColor: {r: 1, g: 1, b: 1, a: 1}
- _V_CW_Rim_Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,22 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: YellowLight
m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- CURVEDWORLD_BEND_TYPE_CYLINDRICALROLLOFF_Z
- CURVEDWORLD_NORMAL_TRANSFORMATION_ON
m_InvalidKeywords:
- CURVEDWORLD_BEND_ID_1
m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_CYLINDRICALROLLOFF_Z
CURVEDWORLD_NORMAL_TRANSFORMATION_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: CurvedWorld_Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -67,7 +61,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- CurvedWorld_Transform_Normal: 0
- _BumpScale: 1
Expand Down Expand Up @@ -95,4 +88,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,16 @@ void UpdateShaderDataDisabled()
Shader.SetGlobalVector(materialPropertyID_RotationAxis, Vector3.zero);

Shader.SetGlobalVector(materialPropertyID_BendSize, Vector3.zero);
//Shader.SetGlobalFloat(materialPropertyID_BendSize, 0);
Shader.SetGlobalFloat(materialPropertyID_BendSize, 0);

Shader.SetGlobalVector(materialPropertyID_BendOffset, Vector3.zero);
//Shader.SetGlobalFloat(materialPropertyID_BendOffset, 0);
Shader.SetGlobalFloat(materialPropertyID_BendOffset, 0);

Shader.SetGlobalVector(materialPropertyID_BendAngle, Vector2.zero);
//Shader.SetGlobalFloat(materialPropertyID_BendAngle, 0);
Shader.SetGlobalFloat(materialPropertyID_BendAngle, 0);

Shader.SetGlobalVector(materialPropertyID_BendMinimumRadius, Vector2.zero);
//Shader.SetGlobalFloat(materialPropertyID_BendMinimumRadius, 0);
Shader.SetGlobalFloat(materialPropertyID_BendMinimumRadius, 0);

Shader.SetGlobalFloat(materialPropertyID_BendRolloff, 10);
}
Expand Down
Loading

0 comments on commit c077623

Please sign in to comment.