mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Working Dough Polish

Browse source
This commit is contained in:
Rapandrasmus 2023-01-20 16:38:18 +01:00
parent c450c6516d
commit da09f96065
10 changed files with 183 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assets/Resources/Games/tambourine.prefab
View file

@ -434,13 +434,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 468565086624833077}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.03, y: -3.75, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0.06235996, w: 0.9980538}
m_LocalPosition: {x: -0.01, y: -3.86, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 1785929877216428417}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.151}
--- !u!212 &6147789122776347851
SpriteRenderer:
m_ObjectHideFlags: 0
@ -1495,14 +1495,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4015731800377342642}
m_LocalRotation: {x: -0, y: -0, z: 0.08041144, w: 0.9967618}
m_LocalPosition: {x: -0.29, y: -0.05, z: 0}
m_LocalRotation: {x: -0, y: -0, z: 0.12399454, w: 0.992283}
m_LocalPosition: {x: -0.5, y: -0.1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7090997627279392267}
m_Father: {fileID: 1785929877216428417}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 9.224}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14.245}
--- !u!212 &4195672179840370369
SpriteRenderer:
m_ObjectHideFlags: 0

2
Assets/Resources/Games/workingDough.prefab
View file

@ -12813,7 +12813,7 @@ MonoBehaviour:
doughDudesHolderAnim: {fileID: 9020148957407720643}
gandwAnim: {fileID: 2284918768942303106}
intervalStarted: 0
beatInterval: 4
beatInterval: 8
bigMode: 0
bigModePlayer: 0
shouldMiss: 1

BIN
Assets/Resources/Sprites/Editor/GameIcons/tambourine.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 378 B

96
Assets/Resources/Sprites/Editor/GameIcons/tambourine.png.meta Normal file
View file

@ -0,0 +1,96 @@
fileFormatVersion: 2
guid: a4b0597f34bc8d14d931bca83bc7a1c2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
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: 1
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: 2048
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:

BIN
Assets/Resources/Sprites/Editor/GameIcons/workingDough.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 100 KiB

28
Assets/Resources/Sprites/Editor/GameIcons/workingDough.png.meta
View file

@ -46,7 +46,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 32
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@ -65,34 +65,10 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 64
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 64
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0

2
Assets/Scripts/Games/Tambourine/Tambourine.cs
View file

@ -10,7 +10,7 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("tambourine", "Tambourine \n<color=#eb5454>[INITIALIZATION ONLY]</color>", "0058CE", false, false, new List<GameAction>()
return new Minigame("tambourine", "Tambourine \n<color=#eb5454>[INITIALIZATION ONLY]</color>", "812021", false, false, new List<GameAction>()
{
});
}

53
Assets/Scripts/Games/WorkingDough/Bop.anim Normal file
View file

@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Bop
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Scripts/Games/WorkingDough/Bop.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a55240eea497190469a280759b1d9b33
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

24
Assets/Scripts/Games/WorkingDough/WorkingDough.cs
View file

@ -11,12 +11,12 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("workingDough", "Working Dough \n<color=#eb5454>[WIP]</color>", "090909", false, false, new List<GameAction>()
return new Minigame("workingDough", "Working Dough", "090909", false, false, new List<GameAction>()
{
new GameAction("beat intervals", "Start Interval")
{
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSetIntervalStart(e.beat, e.length); },
defaultLength = 4f,
defaultLength = 8f,
resizable = true,
priority = 1
},
@ -24,23 +24,27 @@ namespace HeavenStudio.Games.Loaders
{
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSpawnBall(e.beat, false); },
defaultLength = 0.5f,
priority = 2
},
new GameAction("big ball", "Big Ball")
{
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSpawnBall(e.beat, true); },
defaultLength = 0.5f,
priority = 2
},
new GameAction("launch spaceship", "Launch Spaceship")
{
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.LaunchShip(e.beat, e.length); },
defaultLength = 4f,
resizable = true
resizable = true,
priority = 3
},
new GameAction("rise spaceship", "Rise Up Spaceship")
{
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.RiseUpShip(e.beat, e.length); },
defaultLength = 4f,
resizable = true
resizable = true,
priority = 3
},
new GameAction("lift dough dudes", "Lift Dough Dudes")
{
@ -50,7 +54,8 @@ namespace HeavenStudio.Games.Loaders
{
new Param("toggle", false, "Go Up?", "Toggle to go Up or Down.")
},
resizable = true
resizable = true,
priority = 3
},
new GameAction("instant lift", "Instant Lift")
{
@ -60,6 +65,7 @@ namespace HeavenStudio.Games.Loaders
new Param("toggle", true, "Go Up?", "Toggle to go Up or Down.")
},
defaultLength = 0.5f,
priority = 3
},
new GameAction("mr game and watch enter or exit", "Mr. G&W Enter or Exit")
{
@ -69,7 +75,8 @@ namespace HeavenStudio.Games.Loaders
{
new Param("toggle", false, "Should exit?", "Toggle to make him leave or enter.")
},
resizable = true
resizable = true,
priority = 3
},
new GameAction("instant game and watch", "Instant Mr. G&W Enter or Exit")
{
@ -79,6 +86,7 @@ namespace HeavenStudio.Games.Loaders
new Param("toggle", false, "Exit?", "Toggle to make him leave or enter.")
},
defaultLength = 0.5f,
priority = 3
},
});
}
@ -129,7 +137,7 @@ namespace HeavenStudio.Games
float risingStartBeat;
float liftingLength = 4f;
float liftingStartBeat;
public float beatInterval = 4f;
public float beatInterval = 8f;
float gandMovingLength = 4f;
float gandMovingStartBeat;
public bool bigMode;
@ -153,7 +161,7 @@ namespace HeavenStudio.Games
bool liftingDoughDudes;
string liftingAnimName;
bool ballTriggerSetInterval = true;
bool gandwHasEntered;
bool gandwHasEntered = true;
bool gandwMoving;
string gandwMovingAnimName;