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
SantyWang committed Jul 7, 2024
2 parents 4e02c93 + d5c5101 commit d449846
Show file tree
Hide file tree
Showing 67 changed files with 9,123 additions and 119 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,27 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: light_mesh
m_Shader: {fileID: 4800000, guid: 08ed0d9dfc7b9d54480990896ab62fe8, type: 3}
m_ShaderKeywords: CURVEDWORLD_BEND_ID_1 CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- CURVEDWORLD_BEND_TYPE_TWISTEDSPIRAL_X_POSITIVE
m_InvalidKeywords:
- CURVEDWORLD_BEND_ID_1
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
stringTagMap:
RenderType: CurvedWorld_Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand Down Expand Up @@ -87,6 +94,7 @@ 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 @@ -138,3 +146,4 @@ 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: []

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

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 @@ -78,7 +78,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotation: 95.649025
- _Rotation: 2.4328818
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Expand Down
Loading

0 comments on commit d449846

Please sign in to comment.