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
SantyWang committed Jul 7, 2024
2 parents e0c75a7 + d2e9453 commit 3400f9a
Show file tree
Hide file tree
Showing 8 changed files with 6,578 additions and 2,343 deletions.
9 changes: 0 additions & 9 deletions Assets/Epic Toon FX.meta
View file

This file was deleted.

19 changes: 14 additions & 5 deletions Assets/Plugins/Epic Toon FX/Materials/Basics/ring_ADD.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,28 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ring_ADD
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHABLEND_ON
- _FADING_ON
m_InvalidKeywords: []
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
- GRABPASS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
Expand All @@ -32,6 +39,7 @@ Material:
m_Texture: {fileID: 2800000, guid: a4280d58393322842afb10bcbcfc2a83, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
Expand Down Expand Up @@ -63,3 +71,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 2, b: 0, a: 0}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
72 changes: 72 additions & 0 deletions Assets/Prefabs/Player1.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7073775970261609424}
- {fileID: 4100858253843357255}
- {fileID: 4141091013941135979}
m_Father: {fileID: 0}
Expand Down Expand Up @@ -301,6 +302,10 @@ MonoBehaviour:
initialCrateNum: 3
jumpForce: 500
footStepVFX: {fileID: 104829970813648393, guid: ed6cc4c75e58f5149a2d68d77b22a53d, type: 3}
collisonVFX: {fileID: 7073775970261708292}
boxVFX: {fileID: 0}
magnetVFX: {fileID: 0}
boomVFX: {fileID: 0}
leftFootAnchor: {fileID: 7842989981183608988}
rightFootAnchor: {fileID: 7319513830124477421}
leftFootAudio: {fileID: 8300000, guid: 74dfebaa0141bcf47baeb7f4e6683a44, type: 3}
Expand Down Expand Up @@ -2972,3 +2977,70 @@ Transform:
- {fileID: 8850253056578927114}
m_Father: {fileID: 5768256293332176069}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &7073775970261736672
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 239934697658315765}
m_Modifications:
- target: {fileID: 111332, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_Name
value: collision
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
--- !u!4 &7073775970261609424 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
m_PrefabInstance: {fileID: 7073775970261736672}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7073775970261708292 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 111332, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
m_PrefabInstance: {fileID: 7073775970261736672}
m_PrefabAsset: {fileID: 0}
72 changes: 72 additions & 0 deletions Assets/Prefabs/Player2.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1953,6 +1953,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1902303436179093734}
- {fileID: 527088981002415547}
- {fileID: 6168107734994214149}
m_Father: {fileID: 0}
Expand Down Expand Up @@ -2051,6 +2052,10 @@ MonoBehaviour:
initialCrateNum: 3
jumpForce: 500
footStepVFX: {fileID: 104829970813648393, guid: ed6cc4c75e58f5149a2d68d77b22a53d, type: 3}
collisonVFX: {fileID: 1902303436178865458}
boxVFX: {fileID: 0}
magnetVFX: {fileID: 0}
boomVFX: {fileID: 0}
leftFootAnchor: {fileID: 7716673296229013943}
rightFootAnchor: {fileID: 2098970189250627752}
leftFootAudio: {fileID: 8300000, guid: 74dfebaa0141bcf47baeb7f4e6683a44, type: 3}
Expand Down Expand Up @@ -2972,3 +2977,70 @@ Transform:
- {fileID: 6827230629022116929}
m_Father: {fileID: 8436004183176956273}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1902303436178952150
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5682284001636570856}
m_Modifications:
- target: {fileID: 111332, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_Name
value: collision
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
--- !u!1 &1902303436178865458 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 111332, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
m_PrefabInstance: {fileID: 1902303436178952150}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1902303436179093734 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 407344, guid: 95eeba4aacd1f5b499900e6f0515b924, type: 3}
m_PrefabInstance: {fileID: 1902303436178952150}
m_PrefabAsset: {fileID: 0}
Loading

0 comments on commit 3400f9a

Please sign in to comment.