Assets/External/LEDScreenShader/LEDScreenShader.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "LEDScreenShader",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/External/LEDScreenShader/LEDScreenShader.asmdef.meta

@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: 287b3c7e0c2b25442831694daf39191b
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 229091
+  packageName: LED Screen Shader
+  packageVersion: 1.1.0
+  assetPath: Assets/LEDScreenShader/LEDScreenShader.asmdef
+  uploadId: 540223

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

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

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

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

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

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

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

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

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

@@ -28,7 +28,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -37,7 +37,8 @@ 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:
@@ -238,7 +239,6 @@ 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

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

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

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

@@ -28,7 +28,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -37,7 +37,8 @@ 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:
@@ -371,7 +372,6 @@ 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

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

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

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

@@ -41,7 +41,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -50,7 +50,8 @@ 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:
@@ -227,4 +228,3 @@ 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

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

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

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

@@ -37,7 +37,8 @@ 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:
@@ -237,7 +238,6 @@ 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: 10
+  version: 7

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

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

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

@@ -24,7 +24,8 @@ 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:
@@ -199,7 +200,6 @@ 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: 10
+  version: 7

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

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

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

@@ -37,7 +37,8 @@ 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:
@@ -239,7 +240,6 @@ 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: 10
+  version: 7

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

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

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

@@ -25,7 +25,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -34,7 +34,8 @@ 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:
@@ -245,7 +246,6 @@ 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

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

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

Assets/Scripts/Editor/BoneTools/HumanBoneRenamer.cs.meta

@@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 4f2a65d65a8948d786b8295020eefdc5
+guid: 689308838c332a642889286c26f12e4e