Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions Assets/Materials/ShinyParticleEffect.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
%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: ShinyParticleEffect
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHABLEND_ON
m_InvalidKeywords: []
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- GRABPASS
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: 1bf7079096e7ce64897a955662d3d65c, 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}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 1
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _InvFade: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 4
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: -1, g: 1, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _TintColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 0.5}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Materials/ShinyParticleEffect.mat.meta

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

14 changes: 1 addition & 13 deletions Assets/Prefabs/HUD Prefabs/Ship Builder.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -5562,19 +5562,7 @@ MonoBehaviour:
m_Calls: []
m_OnValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8776915232209613947}
m_TargetAssemblyTypeName:
m_MethodName: ChangePartImage
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_CustomCaretColor: 0
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
Expand Down
51 changes: 21 additions & 30 deletions Assets/Prefabs/Shellcore Prefabs/Part Prefabs/BasePartPrefab.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ MonoBehaviour:
craft: {fileID: 0}
partHealth: 500
partMass: 0.2
detachible: 1
weapon: 0
detachable: 1
shooter: {fileID: 0}
info:
location: {x: -0.2, y: 0.6}
Expand Down Expand Up @@ -137,7 +138,6 @@ MonoBehaviour:
e31: 0
e32: 0
e33: 0
weapon: 0
--- !u!198 &5915238074567533318
ParticleSystem:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -389,9 +389,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.15
minScalar: 1
minMaxState: 3
scalar: 0.35
minScalar: 0.1
maxCurve:
serializedVersion: 2
m_Curve:
Expand Down Expand Up @@ -442,7 +442,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
Expand Down Expand Up @@ -495,7 +495,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
Expand Down Expand Up @@ -1082,38 +1082,29 @@ ParticleSystem:
curve:
serializedVersion: 2
minMaxState: 1
scalar: 1
scalar: 0.96762455
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
- serializedVersion: 3
time: 0.6473296
value: 1
inSlope: -0.4047008
outSlope: -0.4047008
value: 0.5405392
inSlope: 2.6181443
outSlope: 2.6181443
tangentMode: 0
weightedMode: 0
inWeight: 0.07919627
outWeight: 0.1514359
inWeight: 0
outWeight: 0.16316672
- serializedVersion: 3
time: 1
time: 0.99328613
value: 0
inSlope: -4.1076946
outSlope: -4.1076946
inSlope: -2.5718505
outSlope: -2.5718505
tangentMode: 0
weightedMode: 0
inWeight: 0.0835512
outWeight: 0.33333334
inWeight: 0.4277069
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Expand Down Expand Up @@ -1249,7 +1240,7 @@ ParticleSystem:
m_RotationOrder: 4
separateAxes: 0
RotationModule:
enabled: 1
enabled: 0
x:
serializedVersion: 2
minMaxState: 3
Expand Down Expand Up @@ -2298,7 +2289,7 @@ ParticleSystem:
m_RotationOrder: 4
m_Range: {x: 0, y: 1}
ForceModule:
enabled: 1
enabled: 0
x:
serializedVersion: 2
minMaxState: 0
Expand Down Expand Up @@ -4887,7 +4878,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 37f63c819ae6c274d8ed924fc281a206, type: 2}
- {fileID: 2100000, guid: fd6a02fc212211047ba40ac4c71242ac, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
30 changes: 24 additions & 6 deletions Assets/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -12746,7 +12745,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 1, b: 0, a: 1}
m_Color: {r: 0, g: 0.5019608, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
Expand Down Expand Up @@ -16572,6 +16571,7 @@ GameObject:
- component: {fileID: 1296363338}
- component: {fileID: 1296363340}
- component: {fileID: 1296363339}
- component: {fileID: 1296363341}
m_Layer: 5
m_Name: Tally
m_TagString: Untagged
Expand Down Expand Up @@ -16640,6 +16640,21 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1296363337}
m_CullTransparentMesh: 0
--- !u!114 &1296363341
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1296363337}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &1299087295
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -22980,6 +22995,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2077927833
InScenePlacedSourceGlobalObjectIdHash: 0
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
Expand Down Expand Up @@ -23666,8 +23682,8 @@ MonoBehaviour:
stealthGasBoosted: 0
flatDamageIncrease: 0
absorptions: 0
invertTractors: 0
canUseAbilities: 1
tractorSwitched: 0
sectorMngr: {fileID: 0}
entityName:
isStandardTractorTarget: 0
Expand Down Expand Up @@ -23710,8 +23726,10 @@ MonoBehaviour:
missions: []
reputation: 0
episode: 0
partyLock: 0
unlockedPartyIDs: []
disabledPartyIDs: []
currentPartyMembers: []
abilityHotkeys:
skills:
spawns: []
Expand Down Expand Up @@ -27564,12 +27582,12 @@ PrefabInstance:
- target: {fileID: 4076859594884605426, guid: 32a32bac7ec6ea947bc6f2b367fb7171,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4076859594884605426, guid: 32a32bac7ec6ea947bc6f2b367fb7171,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4076859594884605426, guid: 32a32bac7ec6ea947bc6f2b367fb7171,
type: 3}
Expand All @@ -27584,7 +27602,7 @@ PrefabInstance:
- target: {fileID: 4076859594884605426, guid: 32a32bac7ec6ea947bc6f2b367fb7171,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -10
objectReference: {fileID: 0}
- target: {fileID: 4076859596742077408, guid: 32a32bac7ec6ea947bc6f2b367fb7171,
type: 3}
Expand Down
Loading