kindnick/Streamingle_URP
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix : Piloto Studio VFX 손상된 .meta 복구 + prefab conflict 해결

Browse Source 
d8cdf1a4d 커밋에 merge-conflict 마커째 깨져 들어온 .meta 11개(GUID 누락)를 삭제 후 Unity가 유효 GUID로 재생성. 대응 .mat/.prefab은 정상이라 함께 재직렬화됨. Litch_FireComet.prefab 본문의 1줄 conflict(m_ColorSpace 0 vs -1)는 HEAD(0) 채택해 해결. 'GUID cannot be extracted by YAML Parser' / 'does not have a valid GUID' 경고 해소.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
user 2026-05-19 01:47:31 +09:00
parent bb8664c06a
commit 9ac87535e2
19 changed files with 96 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Distorted musical debuff.prefab.meta
View File

@ -1,2 +1,7 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
guid: cbc124570edcbb949b95815174f29fc3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music Tornado.prefab.meta
View File

@ -1,2 +1,7 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
guid: c6cfc5fc22c5d8a41a0e684b6f500432
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Music bomb.prefab.meta
View File

@ -1,2 +1,7 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
guid: 2aeea34373c65384b8c29c523e1f7d0a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical Instruments Update/Sounds Hits.prefab.meta
View File

@ -1,2 +1,7 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Elemental VFX Mega Bundle/Disco/Musical
guid: c843500c9eeb79242b4a02e261b8bdda
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ResourcesData/Etc/Particle/Piloto Studio/Elemental VFX Mega Bundle/Fire/Litch_FireComet.prefab (Stored with Git LFS)
View File

Binary file not shown.

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat
View File

@ -28,7 +28,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -37,8 +37,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NuclearExplosion_Body_Crimson
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -239,6 +238,7 @@ Material:
- _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
- _diff_c: {r: 0.1541919, g: 0.4053115, b: 0.7264151, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5159540176204133117
MonoBehaviour:
m_ObjectHideFlags: 11

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Blood/NuclearExplosion_Body_Crimson.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<<< Updated upstream:Asset Store Build Project/Assets/Piloto Studio/Materials/Blood/Blood
guid: 8da37a7fa86cfbf4d8b5631d45f2a9b1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat
View File

@ -28,7 +28,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -37,8 +37,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AOEDome_Disco 1
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -372,6 +371,7 @@ Material:
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _WhiteColor: {r: 8, g: 0, b: 8, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &3809676810040744887
MonoBehaviour:
m_ObjectHideFlags: 11

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/AOEDome_Disco 1.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/AOEDome_Disco
guid: fb965307c8261f94a970b6ee36cec1fd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat
View File

@ -41,7 +41,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -50,8 +50,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DiscoBase_Desaturated 2
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -228,3 +227,4 @@ Material:
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _WhiteColor: {r: 0.2688679, g: 0.94103533, b: 1, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Disco/DiscoBase_Desaturated 2.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/DiscoBase_Desaturated
guid: d03fb883241065b4dad81719ad1b48a9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat
View File

@ -37,8 +37,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: HON_Panner
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -238,6 +237,7 @@ Material:
- _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
- _diff_c: {r: 0.6320754, g: 0.6320754, b: 0.6320754, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &4221895795381840810
MonoBehaviour:
m_ObjectHideFlags: 11
@ -250,4 +250,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Nature & Fairy/HON_Panner.mat.meta
guid: 6d21b68449113754eaf9158dad2f41f8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat
View File

@ -24,8 +24,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fresnel_Green 1
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -200,6 +199,7 @@ Material:
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _WhiteColor: {r: 1, g: 0.5031939, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5035742818894552809
MonoBehaviour:
m_ObjectHideFlags: 11
@ -225,4 +225,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Roguelike/Fresnel_Green 1.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Roguelike/Fresnel_Green
guid: 4e532bd6a115b954295b7e90117c58bb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat
View File

@ -37,8 +37,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Big_Wave_Alpha
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -240,6 +239,7 @@ Material:
- _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
- _diff_c: {r: 0.1541919, g: 0.4053115, b: 0.7264151, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &4208392637118717686
MonoBehaviour:
m_ObjectHideFlags: 11
@ -252,4 +252,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/Big_Wave_Alpha.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/MusicalWaves_Trail
guid: 03f75c62ba9eb5b459f254c41f7fde6f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

6
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat
View File

@ -25,7 +25,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 10
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -34,8 +34,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WaterBorders_Add
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 7f11fe28133f1a74594785107b98f2fe, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
@ -246,6 +245,7 @@ Material:
- _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _WhiteColor: {r: 1, g: 0.8950032, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &7517111074570784048
MonoBehaviour:
m_ObjectHideFlags: 11

8
Assets/ResourcesData/Etc/Particle/Piloto Studio/Materials/Water/WaterBorders_Add.mat.meta
View File

@ -1,2 +1,8 @@
fileFormatVersion: 2
<<<<<<< HEAD:Asset Store Build Project/Assets/Piloto Studio/Materials/Disco/Wing_MusicalWaves_Trail
guid: 26f26bd3ed981324e925695e09ac4d09
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant: