Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-04-30 00:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Airboarder Block Layering Fix (#975)

Browse Source 
added a 2nd version of the block texture/material and baked a material change into the animations

(hope this pr is good because it's my first go (ignore #974))
This commit is contained in:
Bjooon 2024-06-14 18:12:32 -04:00 committed by GitHub
parent 6b8693a13e
commit c0be354cf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 28174 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Resources/Games/airboarder.prefab
View File

@ -315,7 +315,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SoundSequences: []
scheduledInputs: []
wantsCrouch: 0
bgMaterial: {fileID: 2100000, guid: d308d6053cbc091489ae82391d36d476, type: 2}
fadeMaterial: {fileID: 2100000, guid: 5ad5f9e65ea02ac4c95e42c36fc8d39e, type: 2}
@ -3360,6 +3359,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0.000061934195
objectReference: {fileID: 0}
- target: {fileID: 9084923555983224672, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
--- !u!4 &8644837133873799696 stripped

19
Assets/Resources/Models/Games/Airboarder/Animations/arch/break.anim
View File

@ -5709,7 +5709,14 @@ AnimationClip:
m_RotationOrder: 4
path: wall_high_model_skeleton/wall_root/sdwPg4
m_FloatCurves: []
m_PPtrCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
attribute: m_Materials.Array.data[0]
path: wall_high_model
classID: 137
script: {fileID: 0}
m_SampleRate: 24
m_WrapMode: 0
m_Bounds:
@ -5871,6 +5878,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3051566205
attribute: 0
script: {fileID: 0}
typeID: 137
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 3191469815
attribute: 1
@ -5955,7 +5969,8 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
pptrCurveMapping:
- {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

22
Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim
View File

@ -318,7 +318,16 @@ AnimationClip:
path: wall_high_model
classID: 137
script: {fileID: 0}
m_PPtrCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- time: 0.06666667
value: {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
attribute: m_Materials.Array.data[0]
path: wall_high_model
classID: 137
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -354,6 +363,13 @@ AnimationClip:
typeID: 137
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 3051566205
attribute: 0
script: {fileID: 0}
typeID: 137
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 3051566205
attribute: 1303350129
@ -375,7 +391,9 @@ AnimationClip:
typeID: 137
customType: 22
isPPtrCurve: 0
pptrCurveMapping: []
pptrCurveMapping:
- {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

19
Assets/Resources/Models/Games/Airboarder/Animations/arch/shake.anim
View File

@ -1755,7 +1755,14 @@ AnimationClip:
m_RotationOrder: 4
path: wall_high_model_skeleton/wall_root/block07Pg
m_FloatCurves: []
m_PPtrCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
attribute: m_Materials.Array.data[0]
path: wall_high_model
classID: 137
script: {fileID: 0}
m_SampleRate: 24
m_WrapMode: 0
m_Bounds:
@ -1861,6 +1868,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3051566205
attribute: 0
script: {fileID: 0}
typeID: 137
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 3191469815
attribute: 1
@ -1980,7 +1994,8 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
pptrCurveMapping:
- {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

22295
Assets/Resources/Models/Games/Airboarder/Animations/wall/break.anim
View File

File diff suppressed because it is too large Load Diff

22
Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
View File

@ -264,7 +264,16 @@ AnimationClip:
path: wall_low_model
classID: 137
script: {fileID: 0}
m_PPtrCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- time: 0.06666667
value: {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
attribute: m_Materials.Array.data[0]
path: wall_low_model
classID: 137
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
@ -300,6 +309,13 @@ AnimationClip:
typeID: 137
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 3301542606
attribute: 0
script: {fileID: 0}
typeID: 137
customType: 21
isPPtrCurve: 1
- serializedVersion: 2
path: 3301542606
attribute: 1303350129
@ -321,7 +337,9 @@ AnimationClip:
typeID: 137
customType: 22
isPPtrCurve: 0
pptrCurveMapping: []
pptrCurveMapping:
- {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
- {fileID: 2100000, guid: c11e8a31fd54eb7458786d9910fd0bd6, type: 2}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}

5577
Assets/Resources/Models/Games/Airboarder/Animations/wall/shake.anim
View File

File diff suppressed because it is too large Load Diff

103
Assets/Resources/Models/Games/Airboarder/Materials/wall_body2.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: wall_body
m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BlendTex:
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: 2800000, guid: ee81d836898ee474a80f704b7a905b0f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: ee81d836898ee474a80f704b7a905b0f, 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: 2800000, guid: ee81d836898ee474a80f704b7a905b0f, type: 3}
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}
- _Ramp:
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}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.317
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.65
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- _BlendColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0.78431374, g: 0.6766883, b: 0.6766883, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _Specular: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []

8
Assets/Resources/Models/Games/Airboarder/Materials/wall_body2.mat.meta Normal file
View File

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

BIN
Assets/Resources/Models/Games/Airboarder/Materials/wall_body2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

123
Assets/Resources/Models/Games/Airboarder/Materials/wall_body2.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: f9239656bfa4369449177c73213a076a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
ignoreMasterTextureLimit: 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
cookieLightType: 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
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: