radial bg type

- fix joe surprise face persisting
This commit is contained in:
minenice55 2022-08-14 16:29:39 -04:00
parent 5ee0514874
commit 7d4fbd4522
4 changed files with 215 additions and 13 deletions

View file

@ -30,7 +30,7 @@ Transform:
m_LocalScale: {x: 0.14, y: 0.14, z: 1}
m_Children: []
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2578711457631181227
SpriteRenderer:
@ -5298,7 +5298,7 @@ Transform:
- {fileID: 1823940461699441785}
- {fileID: 7998296216023943797}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &5835591724531542630
SortingGroup:
@ -5549,7 +5549,7 @@ Transform:
- {fileID: 607707502233677433}
- {fileID: 3542369029029140826}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 14
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1089457186893806244
GameObject:
@ -20905,7 +20905,7 @@ Transform:
- {fileID: 7721752935214517217}
- {fileID: 7422225348526634591}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2133099716162141502
GameObject:
@ -36567,7 +36567,7 @@ Transform:
- {fileID: 79217107384843364}
- {fileID: 4570176829701856741}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &7426437971534503015
SortingGroup:
@ -36680,7 +36680,7 @@ Transform:
- {fileID: 6607715910393405022}
- {fileID: 6402550105555280064}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3121129389948568248
GameObject:
@ -51894,7 +51894,7 @@ Transform:
- {fileID: 4580764379744752145}
- {fileID: 6153427326708225474}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3868604044228909325
GameObject:
@ -62061,7 +62061,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
inList: 0
lastState: 0
state:
gameObject: {fileID: 0}
early: 0
@ -67349,7 +67348,7 @@ Transform:
- {fileID: 5398479681583471366}
- {fileID: 4697915430287191595}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3856490809560069226
MonoBehaviour:
@ -87477,7 +87476,7 @@ Transform:
m_Children:
- {fileID: 7344154808606932117}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5641315844638892119
GameObject:
@ -97414,6 +97413,7 @@ Transform:
- {fileID: 570774704746437793}
- {fileID: 602434937145741663}
- {fileID: 24004413385253441}
- {fileID: 5676230901552016494}
- {fileID: 4080187570081243032}
- {fileID: 9024347347759729766}
- {fileID: 504328619051278505}
@ -97482,6 +97482,7 @@ MonoBehaviour:
currentBgEffect: 0
BGGradient: {fileID: 2790469215453043610}
BGBlood: {fileID: 5404947306895237780}
BGRadial: {fileID: 8238140095837895901}
Wind: {fileID: 9003203273337395302}
SnowEffect: {fileID: 6887086164110906535}
SnowEffectGO: {fileID: 1216083719847348373}
@ -103551,7 +103552,7 @@ Transform:
- {fileID: 7797479191699406299}
- {fileID: 5150790184898265248}
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7724750281891176066
GameObject:
@ -108765,6 +108766,88 @@ Transform:
m_Father: {fileID: 769274001585151052}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8238140095837895901
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5676230901552016494}
- component: {fileID: 4189433424192044813}
m_Layer: 0
m_Name: BGradial
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5676230901552016494
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8238140095837895901}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.16, y: 1.66, z: 0}
m_LocalScale: {x: 2.64, y: 2.64, z: 1}
m_Children: []
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4189433424192044813
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8238140095837895901}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -5001
m_Sprite: {fileID: 21300000, guid: 2732dce07c5cccb4e82de9c5e84c8f93, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 10.24, y: 10.24}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &8608989639834320249
GameObject:
m_ObjectHideFlags: 0
@ -113663,7 +113746,7 @@ Transform:
m_LocalScale: {x: 256, y: 100, z: 1}
m_Children: []
m_Father: {fileID: 1483789816297415762}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!212 &819146809661568170
SpriteRenderer:

View file

@ -0,0 +1,108 @@
fileFormatVersion: 2
guid: 2732dce07c5cccb4e82de9c5e84c8f93
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 2
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 1024
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -279,6 +279,8 @@ namespace HeavenStudio.Games
SpriteRenderer bgGradientRenderer;
public GameObject BGBlood;
SpriteRenderer bgBloodRenderer;
public GameObject BGRadial;
SpriteRenderer bgRadialRenderer;
[Header("Shadows")]
int currentShadowType = (int) ShadowType.Tinted;
@ -314,6 +316,7 @@ namespace HeavenStudio.Games
bgGradientRenderer = BGGradient.GetComponent<SpriteRenderer>();
bgBloodRenderer = BGBlood.GetComponent<SpriteRenderer>();
bgRadialRenderer = BGRadial.GetComponent<SpriteRenderer>();
SetBgAndShadowCol(0f, 0f, bgType, (int) currentShadowType, BackgroundColors[bgType], customShadowColour, (int)currentBgEffect);
UpdateMaterialColour(BodyColor, HighlightColor, ItemColor);
@ -727,14 +730,22 @@ namespace HeavenStudio.Games
case (int) BackgroundTextureType.Blood:
BGBlood.SetActive(true);
BGGradient.SetActive(false);
BGRadial.SetActive(false);
break;
case (int) BackgroundTextureType.Gradient:
BGGradient.SetActive(true);
BGBlood.SetActive(false);
BGRadial.SetActive(false);
break;
case (int) BackgroundTextureType.Radial:
BGRadial.SetActive(true);
BGBlood.SetActive(false);
BGGradient.SetActive(false);
break;
default:
BGGradient.SetActive(false);
BGBlood.SetActive(false);
BGRadial.SetActive(false);
break;
}
UpdateFilterColour(bgColour, filterColour);
@ -757,6 +768,7 @@ namespace HeavenStudio.Games
bgGradientRenderer.color = col;
bgBloodRenderer.color = col;
bgRadialRenderer.color = col;
}
public static Color ShadowBlendColor = new Color(195 / 255f, 48 / 255f, 2 / 255f);

View file

@ -325,7 +325,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public void SetFaceExpressionForced(int face)
{
wantFace = -2;
FaceAnim.DoScaledAnimationAsync("Face" + face.ToString("D2"));
}