Skip to content

Commit

Permalink
Changes n stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
ipodtouch0218 committed Oct 10, 2021
1 parent 9f530ef commit 9830b4b
Show file tree
Hide file tree
Showing 29 changed files with 1,952 additions and 401 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

# Visual Studio cache directory
.vs/
.vscode/

# Gradle cache directory
.gradle/
Expand Down
57 changes: 0 additions & 57 deletions .vscode/settings.json

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/Materials/2d.meta

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
127 changes: 127 additions & 0 deletions Assets/Materials/2d/mat_bobomb.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: mat_bobomb
m_Shader: {fileID: -6465566751694194690, guid: f2001a3d11841104cb9ecf04e250b73f,
type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
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: 044577968aa8cbd42a6330af35c59d85, 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:
- FlashAmount: 0
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- FlashColor: {r: 1, g: 0, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &9024204515094923810
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: 4
8 changes: 8 additions & 0 deletions Assets/Materials/2d/mat_bobomb.mat.meta

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
50 changes: 49 additions & 1 deletion Assets/Models/blue_shell/mat_shell.png.meta

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

12 changes: 6 additions & 6 deletions Assets/Models/mario_small/Mario.controller
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,6 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: turnaround
m_EventTreshold: 0
- m_ConditionMode: 4
m_ConditionEvent: velocityX
m_EventTreshold: 0.2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2789775162410364499}
m_Solo: 0
Expand Down Expand Up @@ -3326,6 +3323,9 @@ AnimatorStateTransition:
- m_ConditionMode: 2
m_ConditionEvent: holding
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: crouching
m_EventTreshold: 0
m_DstStateMachine: {fileID: -5603602828417527585}
m_DstState: {fileID: 0}
m_Solo: 0
Expand Down Expand Up @@ -5033,9 +5033,6 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: turnaround
m_EventTreshold: 0
- m_ConditionMode: 4
m_ConditionEvent: velocityX
m_EventTreshold: 0.2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8460236727417704342}
m_Solo: 0
Expand Down Expand Up @@ -6304,6 +6301,9 @@ AnimatorStateTransition:
- m_ConditionMode: 2
m_ConditionEvent: holding
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: crouching
m_EventTreshold: 0
m_DstStateMachine: {fileID: -5095662353818382087}
m_DstState: {fileID: 0}
m_Solo: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Bobomb.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 10963cc4a7b41094fb22281d05e482a8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/PiranhaPlant.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dead: 0
playerDetectSize: {x: 2, y: 2}
playerDetectSize: {x: 1, y: 1.5}
popupTimerRequirement: 5.5
popupTimer: 0
--- !u!114 &3416259037201337410
Expand Down
10 changes: 5 additions & 5 deletions Assets/Scenes/ChrisLevel.unity
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ Camera:
far clip plane: 1000
field of view: 35.971092
orthographic: 1
orthographic size: 4.6982813
orthographic size: 4.7
m_Depth: -3
m_CullingMask:
serializedVersion: 2
Expand Down Expand Up @@ -789,11 +789,11 @@ Camera:
far clip plane: 1000
field of view: 35.971092
orthographic: 1
orthographic size: 4.6982813
orthographic size: 4.7
m_Depth: -2
m_CullingMask:
serializedVersion: 2
m_Bits: 7957
m_Bits: 8085
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
Expand Down Expand Up @@ -1884,11 +1884,11 @@ Camera:
far clip plane: 1000
field of view: 35.971092
orthographic: 1
orthographic size: 4.6982813
orthographic size: 4.7
m_Depth: -2
m_CullingMask:
serializedVersion: 2
m_Bits: 7957
m_Bits: 8085
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
Expand Down
Loading

0 comments on commit 9830b4b

Please sign in to comment.