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

Merge branch 'master' into sorting-rework-i-guess

Browse source
This commit is contained in:
playinful 2024-03-30 15:11:42 -04:00
parent fd54e2bf22 2a6f8d0588
commit 392c601966
8 changed files with 239 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Assets/Resources/Prefabs/Games/FreezeFrame/FarCar.prefab
View file

@ -256,7 +256,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1.6
scalar: 1
minScalar: 5
maxCurve:
serializedVersion: 2
@ -425,8 +425,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 2
minScalar: 0.5
scalar: 1.5
minScalar: 0.8
maxCurve:
serializedVersion: 2
m_Curve:
@ -1503,15 +1503,15 @@ ParticleSystem:
m_NumAlphaKeys: 2
UVModule:
serializedVersion: 2
enabled: 0
mode: 0
enabled: 1
mode: 1
timeMode: 0
fps: 30
frameOverTime:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 0.9999
minScalar: 0.9999
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
@ -1614,15 +1614,18 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
speedRange: {x: 0, y: 1}
tilesX: 1
tilesY: 1
tilesX: 2
tilesY: 2
animationType: 0
rowIndex: 0
cycles: 1
uvChannelMask: -1
rowMode: 1
sprites:
- sprite: {fileID: 0}
- sprite: {fileID: -124740363, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: 1191917677, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: 1218421527, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: -987221058, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
flipU: 0
flipV: 0
VelocityModule:
@ -4901,7 +4904,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 6debacd2e65d0d340acabb2727a92b7f, type: 2}
- {fileID: 2100000, guid: 051f57b0777366c4aa0896dcd30858f1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

21
Assets/Resources/Prefabs/Games/FreezeFrame/NearCar.prefab
View file

@ -116,7 +116,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 1.6
scalar: 1
minScalar: 5
maxCurve:
serializedVersion: 2
@ -285,8 +285,8 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 3
scalar: 2
minScalar: 0.5
scalar: 1.5
minScalar: 0.8
maxCurve:
serializedVersion: 2
m_Curve:
@ -1363,15 +1363,15 @@ ParticleSystem:
m_NumAlphaKeys: 2
UVModule:
serializedVersion: 2
enabled: 0
mode: 0
enabled: 1
mode: 1
timeMode: 0
fps: 30
frameOverTime:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 0.9999
minScalar: 0.9999
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
@ -1482,7 +1482,10 @@ ParticleSystem:
uvChannelMask: -1
rowMode: 1
sprites:
- sprite: {fileID: 0}
- sprite: {fileID: -124740363, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: 1191917677, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: 1218421527, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
- sprite: {fileID: -987221058, guid: eb81210fabe521f498c8af08f7ffd498, type: 3}
flipU: 0
flipV: 0
VelocityModule:
@ -4761,7 +4764,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 6debacd2e65d0d340acabb2727a92b7f, type: 2}
- {fileID: 2100000, guid: 051f57b0777366c4aa0896dcd30858f1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

BIN
Assets/Resources/Sprites/Games/FreezeFrame/CloudParticle.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 84 KiB

94
Assets/Resources/Sprites/Games/FreezeFrame/CloudParticle.png.meta
View file

@ -42,7 +42,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -103,7 +103,91 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
sprites:
- serializedVersion: 2
name: CloudParticle_0
rect:
serializedVersion: 2
x: 2
y: 1366
width: 773
height: 728
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: cec821fd9d2551a49aa8e9ffddcf60e0
internalID: -124740363
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: CloudParticle_1
rect:
serializedVersion: 2
x: 778
y: 1366
width: 772
height: 728
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d4cc4e182be706145839e099f3355e91
internalID: 1191917677
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: CloudParticle_2
rect:
serializedVersion: 2
x: 2
y: 635
width: 773
height: 727
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 16f4b6d7fa9bb3f4b904475fad3a2157
internalID: 1218421527
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: CloudParticle_3
rect:
serializedVersion: 2
x: 778
y: 635
width: 772
height: 727
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5287579a6006bcd43b71c5596d8af24c
internalID: -987221058
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
@ -114,7 +198,11 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
nameFileIdTable:
CloudParticle_0: -124740363
CloudParticle_1: 1191917677
CloudParticle_2: 1218421527
CloudParticle_3: -987221058
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

103
Assets/Resources/Sprites/Games/FreezeFrame/ParticleMaterial.mat Normal file
View file

@ -0,0 +1,103 @@
%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: ParticleMaterial
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _ALPHABLEND_ON
- _COLORADDSUBDIFF_ON
m_InvalidKeywords: []
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- GRABPASS
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: 0}
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: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 10
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _LightingEnabled: 0
- _Metallic: 0
- _Mode: 2
- _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: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []

8
Assets/Resources/Sprites/Games/FreezeFrame/ParticleMaterial.mat.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 051f57b0777366c4aa0896dcd30858f1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Scripts/Games/FreezeFrame/FreezeFrame.cs
View file

@ -204,8 +204,7 @@ namespace HeavenStudio.Games.Loaders
},
},
new List<string>() { "ntr", "normal" },
"ntrcameraman", "en",
chronologicalSortKey: 13
"ntrcameraman", "en"
);
}
}

10
Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
View file

@ -112,6 +112,16 @@ namespace HeavenStudio
{
Debug.LogWarning("Game loader RvlBookLoader failed!");
}
game = NtrFreezeFrameLoader.AddGame(eventCaller);
if (game != null)
{
eventCaller.minigames.Add(game.name, game);
}
else
{
Debug.LogWarning("Game loader NtrCameraManLoader failed!");
}
game = AgbClapLoader.AddGame(eventCaller);
if (game != null)