diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index bdebe94..a15850f 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -104,11 +104,11 @@ - - + + - - + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 0120aec..9d52272 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -55,11 +55,11 @@ - - + + - - + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll diff --git a/Assets/FlashTools/Resources/Materials.meta b/Assets/FlashTools/Resources/Materials.meta index 40a3374..9599151 100644 --- a/Assets/FlashTools/Resources/Materials.meta +++ b/Assets/FlashTools/Resources/Materials.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: d9c0a113e9c274efda30bf000cce59ff +guid: ee7c6466110fb4e278e247d3d334450f folderAsset: yes -timeCreated: 1472125740 -licenseType: Pro +timeCreated: 1456948832 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/Assets/FlashTools/Resources/Shaders.meta b/Assets/FlashTools/Resources/Materials/Generated.meta similarity index 67% rename from Assets/FlashTools/Resources/Shaders.meta rename to Assets/FlashTools/Resources/Materials/Generated.meta index 9599151..529b024 100644 --- a/Assets/FlashTools/Resources/Shaders.meta +++ b/Assets/FlashTools/Resources/Materials/Generated.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: ee7c6466110fb4e278e247d3d334450f +guid: f5531c525672e4d2c8b69ccd88f834d2 folderAsset: yes -timeCreated: 1456948832 +timeCreated: 1474796598 licenseType: Free DefaultImporter: userData: diff --git a/Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat similarity index 92% rename from Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat index cac8015..f44aa49 100644 --- a/Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfDecrMaskMat + m_Name: SwfDecrMaskShader m_Shader: {fileID: 4800000, guid: f1e8cd2344e824b6a9b12efcacde262c, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat.meta similarity index 65% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat.meta rename to Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat.meta index b7ae410..2c8cc2c 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat.meta +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfDecrMaskShader.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: c0365155a72824192b8fa80364326f1a -timeCreated: 1474736141 +guid: 1e55da31b025544408094b74e817c653 +timeCreated: 1474796603 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat similarity index 92% rename from Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat index 5ced130..1350a00 100644 --- a/Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfIncrMaskMat + m_Name: SwfIncrMaskShader m_Shader: {fileID: 4800000, guid: 86b3e29b378884f228862fd1170176b5, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat.meta similarity index 65% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat.meta rename to Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat.meta index 190723a..d39dac5 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat.meta +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfIncrMaskShader.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 1ae015b2b04b8406dafdd79ba1e7f372 -timeCreated: 1474736189 +guid: 96255c23ed669493d806b668894da94e +timeCreated: 1474796603 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat index 22ad703..fc33138 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_0.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_0 + m_Name: SwfMaskedShader_Add_0 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat.meta similarity index 65% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat.meta rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat.meta index 3629a94..f6ab1ac 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat.meta +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_0.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 93946f3ec3bb54a1187aaf22005d2bb0 -timeCreated: 1474736189 +guid: a80f356b7b50043659c6793e806c82bb +timeCreated: 1474796601 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat index f7c8162..52d32a2 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_1.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_1 + m_Name: SwfMaskedShader_Add_1 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat.meta similarity index 65% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat.meta rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat.meta index 5802915..67dedf3 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat.meta +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_1.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: f22dcb326b5a5453f87fcad603775bce -timeCreated: 1474736189 +guid: 3e84c4a8a667b44b0b22b04ff559f97e +timeCreated: 1474796601 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat index 2e2edd6..ee8f2e1 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_2.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_2 + m_Name: SwfMaskedShader_Add_2 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat.meta new file mode 100644 index 0000000..401e268 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96f86ddce552b4ab29fd6e1c1cf8195a +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat index 7234717..0c136fe 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_3.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_3 + m_Name: SwfMaskedShader_Add_3 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat.meta new file mode 100644 index 0000000..1921948 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9edeaf7c9c394b9ebb9b16482d9a61e +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat index 6ea185e..b3ca804 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_4 + m_Name: SwfMaskedShader_Add_4 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat.meta new file mode 100644 index 0000000..c7c88cb --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8d12f32b9306412a91308172d3b16c4 +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat index 7c83400..2f2aed6 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_5 + m_Name: SwfMaskedShader_Add_5 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat.meta new file mode 100644 index 0000000..5a405ad --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 735b32db9e0e84c36a5a89e81975063b +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat index 6e55a62..723ad81 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_6 + m_Name: SwfMaskedShader_Add_6 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat.meta new file mode 100644 index 0000000..fbb0da4 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90cc7b27ce35d4108818f04494788492 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat index 347219a..fee3e0c 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_7 + m_Name: SwfMaskedShader_Add_7 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat.meta new file mode 100644 index 0000000..4638d81 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ca6c0fae0257447b988a091b716c478 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat index 30357cf..b13c968 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_8 + m_Name: SwfMaskedShader_Add_8 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat.meta new file mode 100644 index 0000000..05aff42 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2c90da615ac74d19a38d92f630b8870 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat index afdee56..3ccb570 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Add_9 + m_Name: SwfMaskedShader_Add_9 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat.meta new file mode 100644 index 0000000..8013bc9 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Add_9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3113b5cfefe3a42068a7b0ffa9afd2bf +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat index ba2b24d..0f7230c 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_0 + m_Name: SwfMaskedShader_Multiply_0 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat.meta new file mode 100644 index 0000000..859e865 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6b885f15c54d4dcdaac4f5d12ea2daf +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat index e5a2eea..54af197 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_1 + m_Name: SwfMaskedShader_Multiply_1 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat.meta new file mode 100644 index 0000000..f7d32a6 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65314863cb2344d6684f2e4e379614c1 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat index 124f3a5..3f654cc 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_2 + m_Name: SwfMaskedShader_Multiply_2 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat.meta new file mode 100644 index 0000000..d3a4369 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f9652478fc2443ac8a9bba8b95246fc +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat index 4326b33..6bd4852 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_3 + m_Name: SwfMaskedShader_Multiply_3 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat.meta new file mode 100644 index 0000000..7b3d628 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5157cdce10c384235b7f51af91abf29d +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat index 649a94b..4c9ef66 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_4 + m_Name: SwfMaskedShader_Multiply_4 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat.meta new file mode 100644 index 0000000..7ba716f --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f4791a424a104dfeb5ca205bcc6b8ed +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat index ddfc280..93c50da 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_5 + m_Name: SwfMaskedShader_Multiply_5 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat.meta new file mode 100644 index 0000000..c6c8128 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a433813c651e43519d6a2cdfadab1f2 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat index d88f9be..49cd8f5 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_6 + m_Name: SwfMaskedShader_Multiply_6 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat.meta new file mode 100644 index 0000000..a04b852 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4dc514bc36b64cbf9b1b8007973410e +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat index 16b2386..094f586 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_7 + m_Name: SwfMaskedShader_Multiply_7 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat.meta new file mode 100644 index 0000000..ad5c476 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9de9e7f3181cc4b4683053aa554d9be2 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat index 997b7ed..faacba8 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_8 + m_Name: SwfMaskedShader_Multiply_8 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat.meta new file mode 100644 index 0000000..c78279b --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 929a02f2162934ff0904681dec542b45 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat index 9222d5b..6813751 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Multiply_9 + m_Name: SwfMaskedShader_Multiply_9 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat.meta new file mode 100644 index 0000000..e6d9a28 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Multiply_9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c91d602934be47daa8e1851c5f7b766 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat index 233599c..91eb9f8 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_0 + m_Name: SwfMaskedShader_Normal_0 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat.meta new file mode 100644 index 0000000..855a0b4 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0815ed95b49824da8b3815435ef59385 +timeCreated: 1474796598 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat index c843161..95f378b 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_1 + m_Name: SwfMaskedShader_Normal_1 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat.meta new file mode 100644 index 0000000..42aa853 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 72d26c63ad5c247f7adb2724d632283f +timeCreated: 1474796598 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat index 8025e23..008fb42 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_2 + m_Name: SwfMaskedShader_Normal_2 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat.meta new file mode 100644 index 0000000..020608b --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 775f73c7a46654493beba7b9d7f88448 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat index 6d16132..f328cc6 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_3 + m_Name: SwfMaskedShader_Normal_3 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat.meta new file mode 100644 index 0000000..3e05e44 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e504744432d714b0ca7285bc6105e5fd +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat index ecd5f1c..afe4b9e 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_4 + m_Name: SwfMaskedShader_Normal_4 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat.meta new file mode 100644 index 0000000..a84ef1b --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2003d2a7e8c04535aac30f912c47f33 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat index ad10058..0dccdbf 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_5 + m_Name: SwfMaskedShader_Normal_5 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat.meta new file mode 100644 index 0000000..3ccc9db --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5acf9660f00d40e984cac5e02ad9639 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat index c1b4ee6..122c09a 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_6 + m_Name: SwfMaskedShader_Normal_6 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat.meta new file mode 100644 index 0000000..e4ba5dc --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70136110b52e94839bc85a9a75982bed +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat index 4a1a9cc..f54b038 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_7 + m_Name: SwfMaskedShader_Normal_7 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat.meta new file mode 100644 index 0000000..0760c6c --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c2c8c41cfe634a9f83006e556458bfe +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat index 608d441..234095d 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_8 + m_Name: SwfMaskedShader_Normal_8 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat.meta new file mode 100644 index 0000000..55c3a43 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9d7e01e1764c4cf6809634f4c84a0ab +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat index c31ba05..239031a 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Normal_9 + m_Name: SwfMaskedShader_Normal_9 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat.meta new file mode 100644 index 0000000..b5864ba --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Normal_9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c2674aa631154565bce63897c922921 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat index b998688..2ba9083 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_0 + m_Name: SwfMaskedShader_Screen_0 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat.meta new file mode 100644 index 0000000..08dd6cc --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9511d9c33e3b2477cb52f3a05f043d5c +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat index 055a5b4..31a9657 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_1 + m_Name: SwfMaskedShader_Screen_1 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat.meta new file mode 100644 index 0000000..8c0660b --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d067df622cca8442b93004f0bc6ea0a8 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat index abfb25d..94687ad 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_2 + m_Name: SwfMaskedShader_Screen_2 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat.meta new file mode 100644 index 0000000..50bda71 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f1b56f8270ae4faf9ef3c8148522346 +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat index 65342c7..7b675a8 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_3 + m_Name: SwfMaskedShader_Screen_3 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat.meta new file mode 100644 index 0000000..5b7792f --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1aa6b3caf9ea84b998480c0b8735159b +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat index f362cc3..719b53c 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_4 + m_Name: SwfMaskedShader_Screen_4 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat.meta new file mode 100644 index 0000000..c02548e --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95f7248a716a64f6c93e1ddb366f91ab +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat index e841bb6..6708e80 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_5 + m_Name: SwfMaskedShader_Screen_5 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat.meta new file mode 100644 index 0000000..ef8db12 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf1105005313d4b48b030d348ff915f6 +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat index 1a7cae3..2463bea 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_6 + m_Name: SwfMaskedShader_Screen_6 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat.meta new file mode 100644 index 0000000..4716e2c --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f31286c214ac4dc28414dafd64f9b2d +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat index 5684d0c..5a3ab6a 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_7 + m_Name: SwfMaskedShader_Screen_7 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat.meta new file mode 100644 index 0000000..3159859 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b96efb762e254232adea9ad57daa842 +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat index cdb4a8c..fc07dde 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_8 + m_Name: SwfMaskedShader_Screen_8 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat.meta new file mode 100644 index 0000000..9f7e56d --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c09361a11e4b6453cb4152f4314a3183 +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat index 7fba789..7d73275 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Screen_9 + m_Name: SwfMaskedShader_Screen_9 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat.meta new file mode 100644 index 0000000..be3391e --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Screen_9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6eb354f314b2d4d7989561d8ab76f38b +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat index 234e28a..8a6b98d 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_0 + m_Name: SwfMaskedShader_Subtract_0 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat.meta new file mode 100644 index 0000000..052937a --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1de104fbda9fb43e59c205c30d13b6aa +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat index 954dcce..54c0090 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_1 + m_Name: SwfMaskedShader_Subtract_1 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat.meta new file mode 100644 index 0000000..824f328 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5627a912cf6674b568dacf03278f632f +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat index 7d3afa9..aec120d 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_2 + m_Name: SwfMaskedShader_Subtract_2 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat.meta new file mode 100644 index 0000000..2841f1c --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d8e3b7f5956f4c16a5a9cf6415b854a +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat index 08e2ac1..5eeb48e 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_3 + m_Name: SwfMaskedShader_Subtract_3 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat.meta new file mode 100644 index 0000000..ee10cb1 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f84885ad72f3442695844b412cd4731 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat index ddde448..2be06cb 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_4 + m_Name: SwfMaskedShader_Subtract_4 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat.meta new file mode 100644 index 0000000..e283d3c --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5354391af25264904adc90697755a33a +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat index 6c62b4a..00ae577 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_5 + m_Name: SwfMaskedShader_Subtract_5 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat.meta new file mode 100644 index 0000000..93bc29a --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7fe946e973a540cc9f3d074f83611a1 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat index 38c422a..0df5ce2 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_6 + m_Name: SwfMaskedShader_Subtract_6 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat.meta new file mode 100644 index 0000000..efa3142 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65cf82db56104442690eb82f9dc735a8 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat index 10c8899..7edfd1b 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_7 + m_Name: SwfMaskedShader_Subtract_7 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat.meta new file mode 100644 index 0000000..9483914 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4965b9f5b13a5431f82b4681beb6c380 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat index f0b3c29..8c5838e 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_8 + m_Name: SwfMaskedShader_Subtract_8 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat.meta new file mode 100644 index 0000000..7771f6b --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa077e0012d7049aea4b6f63c6fa7098 +timeCreated: 1474796603 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat similarity index 94% rename from Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat index b5d0eda..014546c 100644 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat @@ -3,10 +3,10 @@ --- !u!21 &2100000 Material: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfMaskedMat_Subtract_9 + m_Name: SwfMaskedShader_Subtract_9 m_Shader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat.meta new file mode 100644 index 0000000..d08b9ad --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfMaskedShader_Subtract_9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05f6d05f86a0f4f9b8b8ff058a26488a +timeCreated: 1474796603 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat similarity index 96% rename from Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat index 9819b72..c534130 100644 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfSimpleMat_Add + m_Name: SwfSimpleShader_Add m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat.meta new file mode 100644 index 0000000..d2d14b3 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Add.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66962bb40f9c34b3d894612bbf870a9f +timeCreated: 1474796601 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat similarity index 96% rename from Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat rename to Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat index 5c8625f..c667944 100644 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: SwfSimpleMat_Multiply + m_Name: SwfSimpleShader_Multiply m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat.meta new file mode 100644 index 0000000..b09c555 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Multiply.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f79013a0fbe546b9ba4e35413e78494 +timeCreated: 1474796599 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat new file mode 100644 index 0000000..49e53f4 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SwfSimpleShader_Normal + m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 10 + data: + first: + name: _BlendOp + second: 0 + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat.meta new file mode 100644 index 0000000..62e3503 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Normal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb2a80c6a2b824c0bb2ecd9df903b94c +timeCreated: 1474796598 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat new file mode 100644 index 0000000..55ab4d6 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SwfSimpleShader_Screen + m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 4 + data: + first: + name: _DstBlend + second: 1 + data: + first: + name: _BlendOp + second: 0 + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat.meta new file mode 100644 index 0000000..2b3c9de --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Screen.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f57b07fe19e9e4d15b198d64b7aed4aa +timeCreated: 1474796600 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat new file mode 100644 index 0000000..67b9c21 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat @@ -0,0 +1,42 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SwfSimpleShader_Subtract + m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 1 + data: + first: + name: _BlendOp + second: 2 + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat.meta b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat.meta new file mode 100644 index 0000000..c0bee81 --- /dev/null +++ b/Assets/FlashTools/Resources/Materials/Generated/SwfSimpleShader_Subtract.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07ae932d6ce714cea8ba8e698067f8a7 +timeCreated: 1474796602 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat.meta b/Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat.meta deleted file mode 100644 index fb31a57..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfDecrMaskMat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d63a68532164d470d887fd2603e79ffa -timeCreated: 1472125896 -licenseType: Pro -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Shaders/SwfDecrMask.shader b/Assets/FlashTools/Resources/Materials/SwfDecrMaskShader.shader similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfDecrMask.shader rename to Assets/FlashTools/Resources/Materials/SwfDecrMaskShader.shader diff --git a/Assets/FlashTools/Resources/Shaders/SwfDecrMask.shader.meta b/Assets/FlashTools/Resources/Materials/SwfDecrMaskShader.shader.meta similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfDecrMask.shader.meta rename to Assets/FlashTools/Resources/Materials/SwfDecrMaskShader.shader.meta diff --git a/Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat.meta b/Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat.meta deleted file mode 100644 index 8c49584..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfIncrMaskMat.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e62e8efca5cac42c9a323961b58d05d6 -timeCreated: 1472125761 -licenseType: Pro -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Shaders/SwfIncrMask.shader b/Assets/FlashTools/Resources/Materials/SwfIncrMaskShader.shader similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfIncrMask.shader rename to Assets/FlashTools/Resources/Materials/SwfIncrMaskShader.shader diff --git a/Assets/FlashTools/Resources/Shaders/SwfIncrMask.shader.meta b/Assets/FlashTools/Resources/Materials/SwfIncrMaskShader.shader.meta similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfIncrMask.shader.meta rename to Assets/FlashTools/Resources/Materials/SwfIncrMaskShader.shader.meta diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat.meta deleted file mode 100644 index 8f774de..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f70408d83452c458b9ef6ff2619cc6e9 -timeCreated: 1474736190 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat.meta deleted file mode 100644 index 116cddb..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8a3a5f04eca2d4e27ad120824f102c18 -timeCreated: 1474736190 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat.meta deleted file mode 100644 index db04671..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ee45d6354b80c4d75abcfeac0600fe54 -timeCreated: 1474736190 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat.meta deleted file mode 100644 index e0a6adc..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 456f3992082eb489a83630372020e772 -timeCreated: 1474736191 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat.meta deleted file mode 100644 index a9fe53c..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9fe31dbf79e8e4abdb3b9ecf2a65df33 -timeCreated: 1474736191 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat.meta deleted file mode 100644 index 9accea8..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Add_9.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0187cf6493eb4657826dfceacf2b144 -timeCreated: 1474736192 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat.meta deleted file mode 100644 index 034544f..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_0.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f3286fc330f314ee7967f886b7690f62 -timeCreated: 1474736142 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat.meta deleted file mode 100644 index 7db24f3..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cbc3669e6a7f84bd8a953481feb53a4c -timeCreated: 1474736193 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat.meta deleted file mode 100644 index 79c65a6..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_2.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0a5ddc332417b4447a06954321142581 -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat.meta deleted file mode 100644 index cc223c3..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0fc1097945b3347779df1e164150a37d -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat.meta deleted file mode 100644 index 4d99ad4..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e688f40398fa84f6597e3ced948d4562 -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat.meta deleted file mode 100644 index 5f469ed..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2812e9cc4afc54b67a333444d3c6d738 -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat.meta deleted file mode 100644 index 5c4deff..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 01e7b99a7e4514bc591a016771c16388 -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat.meta deleted file mode 100644 index 8bc082a..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 090fefefe7c794a4f87eb0b6d5c22863 -timeCreated: 1474736194 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat.meta deleted file mode 100644 index fc183bd..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5642224b6fe1248829946f48abf6b3c6 -timeCreated: 1474736197 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat.meta deleted file mode 100644 index c78ac30..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Multiply_9.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 40753316b1efb4d91ae9fcffad1fca48 -timeCreated: 1474736197 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat.meta deleted file mode 100644 index f748015..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_0.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3902e0561ba6046079e975f4b8340dbd -timeCreated: 1472125897 -licenseType: Pro -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat.meta deleted file mode 100644 index ab35aa8..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf1671a075bc542cfa84edbe5c938c73 -timeCreated: 1474736200 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat.meta deleted file mode 100644 index 8e88e84..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_2.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa481a894d3f243b8ac23721f2b585df -timeCreated: 1474736200 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat.meta deleted file mode 100644 index 8753e92..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ef5cc9802382f4f089f69076d34b0c93 -timeCreated: 1474736200 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat.meta deleted file mode 100644 index 72c5cf6..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 00ccbacd4251b426da05e60e317a9762 -timeCreated: 1474736201 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat.meta deleted file mode 100644 index 4d5eaad..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a4542f1ab17634d819f67cca9e4b1677 -timeCreated: 1474736202 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat.meta deleted file mode 100644 index 287eb5d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 80ab14f28dfbe480b90af63c90b9bcd3 -timeCreated: 1474736202 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat.meta deleted file mode 100644 index 315e69c..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ca39fec8a5c784c5083d341913cb7ac9 -timeCreated: 1474736203 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat.meta deleted file mode 100644 index 633608e..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf0247f75d46c4a8aaafc940d0bfa19a -timeCreated: 1474736203 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat.meta deleted file mode 100644 index 40e60c3..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Normal_9.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f67383241d0f94085ba5e58dadd788ed -timeCreated: 1474736204 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat.meta deleted file mode 100644 index 7ef6bb5..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_0.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e4939d588274b44b987bc6fbb8064f04 -timeCreated: 1474781850 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat.meta deleted file mode 100644 index b47420d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68d7e750b4c084e97906e78381ef273c -timeCreated: 1474781902 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat.meta deleted file mode 100644 index 77cd535..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_2.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae9ae6555ec514d60bc46352ec700832 -timeCreated: 1474781902 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat.meta deleted file mode 100644 index 234a9c8..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4bfce7a7aa8d34d7692f73f4c37e6bb8 -timeCreated: 1474781903 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat.meta deleted file mode 100644 index 3708f7d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4435e3c4211f4113b6d844c394af57a -timeCreated: 1474781903 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat.meta deleted file mode 100644 index df6230a..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ccd11b15cd6bb4cd9818e46f7d284512 -timeCreated: 1474781903 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat.meta deleted file mode 100644 index 18b935d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 33755867cc6ac4327bfa1a916f636a16 -timeCreated: 1474781903 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat.meta deleted file mode 100644 index 0a84d6d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e6a0747396b04d5c9f506006b6db5e0 -timeCreated: 1474781905 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat.meta deleted file mode 100644 index b72d023..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b4998fe30d4d346fb9394bbd01089412 -timeCreated: 1474781905 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat.meta deleted file mode 100644 index a88e9c0..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Screen_9.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aa6a26a2c58384673b88c497cd2dbd67 -timeCreated: 1474781906 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat.meta deleted file mode 100644 index 0869837..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_0.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2929c2f6b7dda49968de37a05c8eb474 -timeCreated: 1474781976 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat.meta deleted file mode 100644 index 98a2a2a..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_1.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fd7c9500f999041e5bf9465dcda3df0f -timeCreated: 1474781991 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat.meta deleted file mode 100644 index da102de..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_2.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 92b90642fae9f44d286d3aa8a2e23b03 -timeCreated: 1474781991 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat.meta deleted file mode 100644 index 857c8da..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a9aee470ac54f4517b35dee81dae6880 -timeCreated: 1474781991 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat.meta deleted file mode 100644 index 8278a1e..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_4.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4283ca74e6c2845c9b98f50fef811ae8 -timeCreated: 1474781991 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat.meta deleted file mode 100644 index 208661d..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bbf5582e3bc074bc1ae60724c6e5769f -timeCreated: 1474781992 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat.meta deleted file mode 100644 index e4dbeb6..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 08b4921866b4d41c19c747c165c95776 -timeCreated: 1474781992 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat.meta deleted file mode 100644 index 6ba6507..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_7.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4138efbc8f8f44c68a6881bf4570ad6d -timeCreated: 1474781993 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat.meta deleted file mode 100644 index 4f9f524..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_8.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 858e4ed0cd95c4b71aa58270c866fb5a -timeCreated: 1474781993 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat.meta deleted file mode 100644 index b46e1d6..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfMaskedMat_Subtract_9.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce300594fea484fb1a75c50c97725675 -timeCreated: 1474781994 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Shaders/SwfMasked.shader b/Assets/FlashTools/Resources/Materials/SwfMaskedShader.shader similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfMasked.shader rename to Assets/FlashTools/Resources/Materials/SwfMaskedShader.shader diff --git a/Assets/FlashTools/Resources/Shaders/SwfMasked.shader.meta b/Assets/FlashTools/Resources/Materials/SwfMaskedShader.shader.meta similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfMasked.shader.meta rename to Assets/FlashTools/Resources/Materials/SwfMaskedShader.shader.meta diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat.meta deleted file mode 100644 index 0bf1ab1..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Add.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e91aa3fa30cdc49ca8cc752a0a224b22 -timeCreated: 1474657468 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat.meta deleted file mode 100644 index 4ba8203..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Multiply.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9b40c31e7fb5d46f3b372525cda1aeaf -timeCreated: 1474657468 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat deleted file mode 100644 index 79b6f41..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat +++ /dev/null @@ -1,54 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: SwfSimpleMat_Normal - m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_CustomRenderQueue: -1 - stringTagMap: {} - m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - data: - first: - name: _SrcBlend - second: 1 - data: - first: - name: _DstBlend - second: 10 - data: - first: - name: _BlendOp - second: 0 - data: - first: - name: _BlendOpA - second: 0 - data: - first: - name: _SrcBlendA - second: 2 - data: - first: - name: _DstBlendA - second: 4 - m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat.meta deleted file mode 100644 index 69bbf63..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Normal.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e92fbe00d5b6d4a3aa9355a4b23f107d -timeCreated: 1472125897 -licenseType: Pro -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat deleted file mode 100644 index 71784f7..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat +++ /dev/null @@ -1,54 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: SwfSimpleMat_Screen - m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_CustomRenderQueue: -1 - stringTagMap: {} - m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - data: - first: - name: _SrcBlend - second: 4 - data: - first: - name: _DstBlend - second: 1 - data: - first: - name: _BlendOp - second: 0 - data: - first: - name: _BlendOpA - second: 0 - data: - first: - name: _SrcBlendA - second: 2 - data: - first: - name: _DstBlendA - second: 4 - m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat.meta deleted file mode 100644 index abfa879..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Screen.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b150d30e479444b7c95263518f3745e6 -timeCreated: 1474780810 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat deleted file mode 100644 index 79405c9..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat +++ /dev/null @@ -1,54 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: SwfSimpleMat_Subtract - m_Shader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 - m_CustomRenderQueue: -1 - stringTagMap: {} - m_SavedProperties: - serializedVersion: 2 - m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - data: - first: - name: _SrcBlend - second: 1 - data: - first: - name: _DstBlend - second: 1 - data: - first: - name: _BlendOp - second: 2 - data: - first: - name: _BlendOpA - second: 0 - data: - first: - name: _SrcBlendA - second: 2 - data: - first: - name: _DstBlendA - second: 4 - m_Colors: - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat.meta deleted file mode 100644 index 3c3d6c7..0000000 --- a/Assets/FlashTools/Resources/Materials/SwfSimpleMat_Subtract.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b31598d6c46394391a378a776cf13a68 -timeCreated: 1474781458 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/FlashTools/Resources/Shaders/SwfSimple.shader b/Assets/FlashTools/Resources/Materials/SwfSimpleShader.shader similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfSimple.shader rename to Assets/FlashTools/Resources/Materials/SwfSimpleShader.shader diff --git a/Assets/FlashTools/Resources/Shaders/SwfSimple.shader.meta b/Assets/FlashTools/Resources/Materials/SwfSimpleShader.shader.meta similarity index 100% rename from Assets/FlashTools/Resources/Shaders/SwfSimple.shader.meta rename to Assets/FlashTools/Resources/Materials/SwfSimpleShader.shader.meta diff --git a/Assets/FlashTools/Resources/SwfSettings.asset b/Assets/FlashTools/Resources/SwfSettings.asset index 0239bff..16a679c 100644 --- a/Assets/FlashTools/Resources/SwfSettings.asset +++ b/Assets/FlashTools/Resources/SwfSettings.asset @@ -20,65 +20,7 @@ MonoBehaviour: AtlasForceSquare: 1 AtlasTextureFilter: 1 AtlasTextureFormat: 0 - IncrMaskMat: {fileID: 2100000, guid: e62e8efca5cac42c9a323961b58d05d6, type: 2} - DecrMaskMat: {fileID: 2100000, guid: d63a68532164d470d887fd2603e79ffa, type: 2} - SimpleMat_Add: {fileID: 2100000, guid: e91aa3fa30cdc49ca8cc752a0a224b22, type: 2} - SimpleMat_Normal: {fileID: 2100000, guid: e92fbe00d5b6d4a3aa9355a4b23f107d, type: 2} - SimpleMat_Multiply: {fileID: 2100000, guid: 9b40c31e7fb5d46f3b372525cda1aeaf, type: 2} - SimpleMat_Screen: {fileID: 2100000, guid: b150d30e479444b7c95263518f3745e6, type: 2} - SimpleMat_Subtract: {fileID: 2100000, guid: b31598d6c46394391a378a776cf13a68, type: 2} - MaskedMats_Add: - - {fileID: 2100000, guid: c0365155a72824192b8fa80364326f1a, type: 2} - - {fileID: 2100000, guid: 93946f3ec3bb54a1187aaf22005d2bb0, type: 2} - - {fileID: 2100000, guid: 1ae015b2b04b8406dafdd79ba1e7f372, type: 2} - - {fileID: 2100000, guid: f22dcb326b5a5453f87fcad603775bce, type: 2} - - {fileID: 2100000, guid: f70408d83452c458b9ef6ff2619cc6e9, type: 2} - - {fileID: 2100000, guid: 8a3a5f04eca2d4e27ad120824f102c18, type: 2} - - {fileID: 2100000, guid: ee45d6354b80c4d75abcfeac0600fe54, type: 2} - - {fileID: 2100000, guid: 456f3992082eb489a83630372020e772, type: 2} - - {fileID: 2100000, guid: 9fe31dbf79e8e4abdb3b9ecf2a65df33, type: 2} - - {fileID: 2100000, guid: f0187cf6493eb4657826dfceacf2b144, type: 2} - MaskedMats_Normal: - - {fileID: 2100000, guid: 3902e0561ba6046079e975f4b8340dbd, type: 2} - - {fileID: 2100000, guid: bf1671a075bc542cfa84edbe5c938c73, type: 2} - - {fileID: 2100000, guid: fa481a894d3f243b8ac23721f2b585df, type: 2} - - {fileID: 2100000, guid: ef5cc9802382f4f089f69076d34b0c93, type: 2} - - {fileID: 2100000, guid: 00ccbacd4251b426da05e60e317a9762, type: 2} - - {fileID: 2100000, guid: a4542f1ab17634d819f67cca9e4b1677, type: 2} - - {fileID: 2100000, guid: 80ab14f28dfbe480b90af63c90b9bcd3, type: 2} - - {fileID: 2100000, guid: ca39fec8a5c784c5083d341913cb7ac9, type: 2} - - {fileID: 2100000, guid: bf0247f75d46c4a8aaafc940d0bfa19a, type: 2} - - {fileID: 2100000, guid: f67383241d0f94085ba5e58dadd788ed, type: 2} - MaskedMats_Multiply: - - {fileID: 2100000, guid: f3286fc330f314ee7967f886b7690f62, type: 2} - - {fileID: 2100000, guid: cbc3669e6a7f84bd8a953481feb53a4c, type: 2} - - {fileID: 2100000, guid: 0a5ddc332417b4447a06954321142581, type: 2} - - {fileID: 2100000, guid: 0fc1097945b3347779df1e164150a37d, type: 2} - - {fileID: 2100000, guid: e688f40398fa84f6597e3ced948d4562, type: 2} - - {fileID: 2100000, guid: 2812e9cc4afc54b67a333444d3c6d738, type: 2} - - {fileID: 2100000, guid: 01e7b99a7e4514bc591a016771c16388, type: 2} - - {fileID: 2100000, guid: 090fefefe7c794a4f87eb0b6d5c22863, type: 2} - - {fileID: 2100000, guid: 5642224b6fe1248829946f48abf6b3c6, type: 2} - - {fileID: 2100000, guid: 40753316b1efb4d91ae9fcffad1fca48, type: 2} - MaskedMats_Screen: - - {fileID: 2100000, guid: e4939d588274b44b987bc6fbb8064f04, type: 2} - - {fileID: 2100000, guid: 68d7e750b4c084e97906e78381ef273c, type: 2} - - {fileID: 2100000, guid: ae9ae6555ec514d60bc46352ec700832, type: 2} - - {fileID: 2100000, guid: 4bfce7a7aa8d34d7692f73f4c37e6bb8, type: 2} - - {fileID: 2100000, guid: b4435e3c4211f4113b6d844c394af57a, type: 2} - - {fileID: 2100000, guid: ccd11b15cd6bb4cd9818e46f7d284512, type: 2} - - {fileID: 2100000, guid: 33755867cc6ac4327bfa1a916f636a16, type: 2} - - {fileID: 2100000, guid: 4e6a0747396b04d5c9f506006b6db5e0, type: 2} - - {fileID: 2100000, guid: b4998fe30d4d346fb9394bbd01089412, type: 2} - - {fileID: 2100000, guid: aa6a26a2c58384673b88c497cd2dbd67, type: 2} - MaskedMats_Subtract: - - {fileID: 2100000, guid: 2929c2f6b7dda49968de37a05c8eb474, type: 2} - - {fileID: 2100000, guid: fd7c9500f999041e5bf9465dcda3df0f, type: 2} - - {fileID: 2100000, guid: 92b90642fae9f44d286d3aa8a2e23b03, type: 2} - - {fileID: 2100000, guid: a9aee470ac54f4517b35dee81dae6880, type: 2} - - {fileID: 2100000, guid: 4283ca74e6c2845c9b98f50fef811ae8, type: 2} - - {fileID: 2100000, guid: bbf5582e3bc074bc1ae60724c6e5769f, type: 2} - - {fileID: 2100000, guid: 08b4921866b4d41c19c747c165c95776, type: 2} - - {fileID: 2100000, guid: 4138efbc8f8f44c68a6881bf4570ad6d, type: 2} - - {fileID: 2100000, guid: 858e4ed0cd95c4b71aa58270c866fb5a, type: 2} - - {fileID: 2100000, guid: ce300594fea484fb1a75c50c97725675, type: 2} + SimpleShader: {fileID: 4800000, guid: 71f5f783ce2ab4fc4bf826e4acb105dd, type: 3} + MaskedShader: {fileID: 4800000, guid: 2fb923af3a46a49fdb944d636b6f79e8, type: 3} + IncrMaskShader: {fileID: 4800000, guid: 86b3e29b378884f228862fd1170176b5, type: 3} + DecrMaskShader: {fileID: 4800000, guid: f1e8cd2344e824b6a9b12efcacde262c, type: 3} diff --git a/Assets/FlashTools/Scripts/Internal/Editor/Editors/SwfClipEditor.cs b/Assets/FlashTools/Scripts/Internal/Editor/Editors/SwfClipEditor.cs index 68309a8..e9a6ade 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/Editors/SwfClipEditor.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/Editors/SwfClipEditor.cs @@ -128,35 +128,6 @@ namespace FlashTools.Internal { }); } - void HideMaterials() { - var settings_holder = SwfSettings.GetHolder(); - - settings_holder.IncrMaskMat .hideFlags = HideFlags.HideInInspector; - settings_holder.DecrMaskMat .hideFlags = HideFlags.HideInInspector; - - settings_holder.SimpleMat_Add .hideFlags = HideFlags.HideInInspector; - settings_holder.SimpleMat_Normal .hideFlags = HideFlags.HideInInspector; - settings_holder.SimpleMat_Multiply.hideFlags = HideFlags.HideInInspector; - settings_holder.SimpleMat_Screen .hideFlags = HideFlags.HideInInspector; - settings_holder.SimpleMat_Subtract.hideFlags = HideFlags.HideInInspector; - - foreach ( var material in settings_holder.MaskedMats_Add ) { - material.hideFlags = HideFlags.HideInInspector; - } - foreach ( var material in settings_holder.MaskedMats_Normal ) { - material.hideFlags = HideFlags.HideInInspector; - } - foreach ( var material in settings_holder.MaskedMats_Multiply ) { - material.hideFlags = HideFlags.HideInInspector; - } - foreach ( var material in settings_holder.MaskedMats_Screen ) { - material.hideFlags = HideFlags.HideInInspector; - } - foreach ( var material in settings_holder.MaskedMats_Subtract ) { - material.hideFlags = HideFlags.HideInInspector; - } - } - void SetupPreviews() { _previews.Clear(); foreach ( var clip in _clips.Where(p => !!p.clip) ) { @@ -174,7 +145,6 @@ namespace FlashTools.Internal { void OnEnable() { _clips = targets.OfType().ToList(); - HideMaterials(); SetupPreviews(); } diff --git a/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfAssetPostprocessor.cs b/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfAssetPostprocessor.cs index dcc3f90..95e0db4 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfAssetPostprocessor.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/Postprocessors/SwfAssetPostprocessor.cs @@ -400,10 +400,10 @@ namespace FlashTools.Internal { group.Material = settings_holder.GetIncrMaskMaterial(); break; case SwfInstanceData.Types.Group: - group.Material = FindGroupMaterial(settings_holder, group.BlendType); + group.Material = settings_holder.GetSimpleMaterial(group.BlendType); break; case SwfInstanceData.Types.Masked: - group.Material = FindMaskedMaterial(settings_holder, group.BlendType, group.ClipDepth); + group.Material = settings_holder.GetMaskedMaterial(group.BlendType, group.ClipDepth); break; case SwfInstanceData.Types.MaskReset: group.Material = settings_holder.GetDecrMaskMaterial(); @@ -448,48 +448,6 @@ namespace FlashTools.Internal { return null; } - static Material FindGroupMaterial( - SwfSettings settings_holder, SwfBlendModeData.Types blend_type) - { - switch ( blend_type ) { - case SwfBlendModeData.Types.Add: - return settings_holder.GetSimpleAddMaterial(); - case SwfBlendModeData.Types.Normal: - return settings_holder.GetSimpleNormalMaterial(); - case SwfBlendModeData.Types.Multiply: - return settings_holder.GetSimpleMultiplyMaterial(); - case SwfBlendModeData.Types.Screen: - return settings_holder.GetSimpleScreenMaterial(); - case SwfBlendModeData.Types.Subtract: - return settings_holder.GetSimpleSubtractMaterial(); - default: - throw new UnityException(string.Format( - "SwfAssetPostprocessor. Incorrect blend type: {0}", - blend_type)); - } - } - - static Material FindMaskedMaterial( - SwfSettings settings_holder, SwfBlendModeData.Types blend_type, int stencil_id) - { - switch ( blend_type ) { - case SwfBlendModeData.Types.Add: - return settings_holder.GetMaskedAddMaterial(stencil_id); - case SwfBlendModeData.Types.Normal: - return settings_holder.GetMaskedNormalMaterial(stencil_id); - case SwfBlendModeData.Types.Multiply: - return settings_holder.GetMaskedMultiplyMaterial(stencil_id); - case SwfBlendModeData.Types.Screen: - return settings_holder.GetMaskedScreenMaterial(stencil_id); - case SwfBlendModeData.Types.Subtract: - return settings_holder.GetMaskedSubtractMaterial(stencil_id); - default: - throw new UnityException(string.Format( - "SwfAssetPostprocessor. Incorrect blend type: {0}", - blend_type)); - } - } - static bool IsVisibleInstance(SwfInstanceData inst) { var result_color = inst.ColorTrans.ApplyToColor(Color.white); return result_color.a >= 0.01f; diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs index 72f2c22..954d543 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfTypes/SwfBlendMode.cs @@ -43,12 +43,12 @@ namespace FlashTools.Internal.SwfTools.SwfTypes { switch ( Value ) { case Mode.Normal: return new SwfBlendModeData(SwfBlendModeData.Types.Normal); - case Mode.Add: - return new SwfBlendModeData(SwfBlendModeData.Types.Add); case Mode.Multiply: return new SwfBlendModeData(SwfBlendModeData.Types.Multiply); case Mode.Screen: return new SwfBlendModeData(SwfBlendModeData.Types.Screen); + case Mode.Add: + return new SwfBlendModeData(SwfBlendModeData.Types.Add); case Mode.Subtract: return new SwfBlendModeData(SwfBlendModeData.Types.Subtract); default: diff --git a/Assets/FlashTools/Scripts/Internal/SwfSettings.cs b/Assets/FlashTools/Scripts/Internal/SwfSettings.cs index cd89e02..9922f3b 100644 --- a/Assets/FlashTools/Scripts/Internal/SwfSettings.cs +++ b/Assets/FlashTools/Scripts/Internal/SwfSettings.cs @@ -1,8 +1,9 @@ using UnityEngine; -using System.Collections.Generic; #if UNITY_EDITOR +using System.IO; using UnityEditor; +using UnityEngine.Rendering; #endif namespace FlashTools.Internal { @@ -64,20 +65,10 @@ namespace FlashTools.Internal { public SwfSettingsData Settings; - [HideInInspector] public Material IncrMaskMat; - [HideInInspector] public Material DecrMaskMat; - - [HideInInspector] public Material SimpleMat_Add; - [HideInInspector] public Material SimpleMat_Normal; - [HideInInspector] public Material SimpleMat_Multiply; - [HideInInspector] public Material SimpleMat_Screen; - [HideInInspector] public Material SimpleMat_Subtract; - - [HideInInspector] public List MaskedMats_Add; - [HideInInspector] public List MaskedMats_Normal; - [HideInInspector] public List MaskedMats_Multiply; - [HideInInspector] public List MaskedMats_Screen; - [HideInInspector] public List MaskedMats_Subtract; + [HideInInspector] public Shader SimpleShader; + [HideInInspector] public Shader MaskedShader; + [HideInInspector] public Shader IncrMaskShader; + [HideInInspector] public Shader DecrMaskShader; #if UNITY_EDITOR @@ -87,89 +78,41 @@ namespace FlashTools.Internal { // // --------------------------------------------------------------------- - const string SwfIncrMaskMatName = "SwfIncrMaskMat"; - const string SwfDecrMaskMatName = "SwfDecrMaskMat"; - - const string SwfSimpleMatAddName = "SwfSimpleMat_Add"; - const string SwfSimpleMatNormalName = "SwfSimpleMat_Normal"; - const string SwfSimpleMatMultiplyName = "SwfSimpleMat_Multiply"; - const string SwfSimpleMatScreenName = "SwfSimpleMat_Screen"; - const string SwfSimpleMatSubtractName = "SwfSimpleMat_Subtract"; - - const string SwfMaskedMatAddNameFmt = "SwfMaskedMat_Add_{0}"; - const string SwfMaskedMatNormalNameFmt = "SwfMaskedMat_Normal_{0}"; - const string SwfMaskedMatMultiplyNameFmt = "SwfMaskedMat_Multiply_{0}"; - const string SwfMaskedMatScreenNameFmt = "SwfMaskedMat_Screen_{0}"; - const string SwfMaskedMatSubtractNameFmt = "SwfMaskedMat_Subtract_{0}"; - - void FillMaterialsCache() { - IncrMaskMat = SafeLoadMaterial(SwfIncrMaskMatName, true); - DecrMaskMat = SafeLoadMaterial(SwfDecrMaskMatName, true); - - SimpleMat_Add = SafeLoadMaterial(SwfSimpleMatAddName, true); - SimpleMat_Normal = SafeLoadMaterial(SwfSimpleMatNormalName, true); - SimpleMat_Multiply = SafeLoadMaterial(SwfSimpleMatMultiplyName, true); - SimpleMat_Screen = SafeLoadMaterial(SwfSimpleMatScreenName, true); - SimpleMat_Subtract = SafeLoadMaterial(SwfSimpleMatSubtractName, true); - - MaskedMats_Add = SafeLoadMaterials(SwfMaskedMatAddNameFmt); - MaskedMats_Normal = SafeLoadMaterials(SwfMaskedMatNormalNameFmt); - MaskedMats_Multiply = SafeLoadMaterials(SwfMaskedMatMultiplyNameFmt); - MaskedMats_Screen = SafeLoadMaterials(SwfMaskedMatScreenNameFmt); - MaskedMats_Subtract = SafeLoadMaterials(SwfMaskedMatSubtractNameFmt); + const string SwfSimpleShaderName = "SwfSimpleShader"; + const string SwfMaskedShaderName = "SwfMaskedShader"; + const string SwfIncrMaskShaderName = "SwfIncrMaskShader"; + const string SwfDecrMaskShaderName = "SwfDecrMaskShader"; + void FillShadersCache() { + SimpleShader = SafeLoadShader(SwfSimpleShaderName); + MaskedShader = SafeLoadShader(SwfMaskedShaderName); + IncrMaskShader = SafeLoadShader(SwfIncrMaskShaderName); + DecrMaskShader = SafeLoadShader(SwfDecrMaskShaderName); EditorUtility.SetDirty(this); AssetDatabase.SaveAssets(); } - public Material CheckAndGetMaterial(Material material) { - if ( !material ) { - FillMaterialsCache(); - } - return CheckExistsMaterial(material); - } - - Material GetMaskedMaterial(List materials, int stencil_id) { - if ( materials == null || stencil_id >= materials.Count ) { - FillMaterialsCache(); - } - if ( stencil_id < 0 || stencil_id >= materials.Count ) { - throw new UnityException(string.Format( - "SwfSettings. Unsupported stencil id: {0}", - stencil_id)); - } - return CheckExistsMaterial(materials[stencil_id]); - } - - static Material CheckExistsMaterial(Material material) { - if ( !material ) { - throw new UnityException("SwfSettings. Material not found"); - } - return material; - } - - static List SafeLoadMaterials(string name_fmt) { - var result = new List(); - for ( var i = 0; i < int.MaxValue; ++i ) { - var mat = SafeLoadMaterial(string.Format(name_fmt, i), false); - if ( mat ) { - result.Add(mat); - } else { - break; + void PregenerateMaterials() { + var blend_types = System.Enum.GetValues(typeof(SwfBlendModeData.Types)); + foreach ( SwfBlendModeData.Types blend_type in blend_types ) { + GetSimpleMaterial(blend_type); + for ( var i = 0; i < 10; ++i ) { + GetMaskedMaterial(blend_type, i); } } - return result; + GetIncrMaskMaterial(); + GetDecrMaskMaterial(); } - static Material SafeLoadMaterial(string name, bool exception) { - var filter = string.Format("t:Material {0}", name); - var material = LoadFirstAssetByFilter(filter); - if ( !material && exception ) { + static Shader SafeLoadShader(string shader_name) { + var filter = string.Format("t:Shader {0}", shader_name); + var shader = LoadFirstAssetByFilter(filter); + if ( !shader ) { throw new UnityException(string.Format( - "SwfSettings. Material not found: {0}", - name)); + "SwfSettings. Shader not found: {0}", + shader_name)); } - return material; + return shader; } static T LoadFirstAssetByFilter(string filter) where T : UnityEngine.Object { @@ -184,58 +127,129 @@ namespace FlashTools.Internal { return null; } + static Material LoadOrCreateMaterial( + Shader shader, + System.Func path_factory, + System.Func fill_material) + { + var shader_path = AssetDatabase.GetAssetPath(shader); + var shader_dir = Path.GetDirectoryName(shader_path); + var generated_dir = Path.Combine(shader_dir, "Generated"); + if ( !AssetDatabase.IsValidFolder(generated_dir) ) { + AssetDatabase.CreateFolder(shader_dir, "Generated"); + } + var material_path = path_factory( + generated_dir, + Path.GetFileNameWithoutExtension(shader_path)); + var material = AssetDatabase.LoadAssetAtPath(material_path); + if ( !material ) { + material = fill_material(new Material(shader)); + material.hideFlags = HideFlags.HideInInspector; + AssetDatabase.CreateAsset(material, material_path); + } + return material; + } + + Shader CheckAndGetShader(Shader shader) { + if ( !shader ) { + FillShadersCache(); + } + return CheckExistsShader(shader); + } + + static Shader CheckExistsShader(Shader shader) { + if ( !shader ) { + throw new UnityException("SwfSettings. Shader not found"); + } + return shader; + } + + static Material FillMaterial( + Material material, SwfBlendModeData.Types blend_type, int stencil_id) + { + switch ( blend_type ) { + case SwfBlendModeData.Types.Normal: + material.SetInt("_BlendOp" , (int)BlendOp.Add); + material.SetInt("_SrcBlend", (int)BlendMode.One); + material.SetInt("_DstBlend", (int)BlendMode.OneMinusSrcAlpha); + break; + case SwfBlendModeData.Types.Multiply: + material.SetInt("_BlendOp" , (int)BlendOp.Add); + material.SetInt("_SrcBlend", (int)BlendMode.DstColor); + material.SetInt("_DstBlend", (int)BlendMode.OneMinusSrcAlpha); + break; + case SwfBlendModeData.Types.Screen: + material.SetInt("_BlendOp" , (int)BlendOp.Add); + material.SetInt("_SrcBlend", (int)BlendMode.OneMinusDstColor); + material.SetInt("_DstBlend", (int)BlendMode.One); + break; + case SwfBlendModeData.Types.Add: + material.SetInt("_BlendOp" , (int)BlendOp.Add); + material.SetInt("_SrcBlend", (int)BlendMode.One); + material.SetInt("_DstBlend", (int)BlendMode.One); + break; + case SwfBlendModeData.Types.Subtract: + material.SetInt("_BlendOp" , (int)BlendOp.ReverseSubtract); + material.SetInt("_SrcBlend", (int)BlendMode.One); + material.SetInt("_DstBlend", (int)BlendMode.One); + break; + default: + throw new UnityException(string.Format( + "SwfSettings. Incorrect blend type: {0}", + blend_type)); + } + material.SetInt("_StencilID", stencil_id); + return material; + } + // --------------------------------------------------------------------- // // Functions // // --------------------------------------------------------------------- + public Material GetSimpleMaterial(SwfBlendModeData.Types blend_type) { + return LoadOrCreateMaterial( + CheckAndGetShader(SimpleShader), + (dir_path, filename) => { + return string.Format( + "{0}/{1}_{2}.mat", + dir_path, filename, blend_type); + }, + material => FillMaterial(material, blend_type, 0)); + } + + public Material GetMaskedMaterial(SwfBlendModeData.Types blend_type, int stencil_id) { + return LoadOrCreateMaterial( + CheckAndGetShader(MaskedShader), + (dir_path, filename) => { + return string.Format( + "{0}/{1}_{2}_{3}.mat", + dir_path, filename, blend_type, stencil_id); + }, + material => FillMaterial(material, blend_type, stencil_id)); + } + public Material GetIncrMaskMaterial() { - return CheckAndGetMaterial(IncrMaskMat); + return LoadOrCreateMaterial( + CheckAndGetShader(IncrMaskShader), + (dir_path, filename) => { + return string.Format( + "{0}/{1}.mat", + dir_path, filename); + }, + material => material); } public Material GetDecrMaskMaterial() { - return CheckAndGetMaterial(DecrMaskMat); - } - - public Material GetSimpleAddMaterial() { - return CheckAndGetMaterial(SimpleMat_Add); - } - - public Material GetSimpleNormalMaterial() { - return CheckAndGetMaterial(SimpleMat_Normal); - } - - public Material GetSimpleMultiplyMaterial() { - return CheckAndGetMaterial(SimpleMat_Multiply); - } - - public Material GetSimpleScreenMaterial() { - return CheckAndGetMaterial(SimpleMat_Screen); - } - - public Material GetSimpleSubtractMaterial() { - return CheckAndGetMaterial(SimpleMat_Subtract); - } - - public Material GetMaskedAddMaterial(int stencil_id) { - return GetMaskedMaterial(MaskedMats_Add, stencil_id); - } - - public Material GetMaskedNormalMaterial(int stencil_id) { - return GetMaskedMaterial(MaskedMats_Normal, stencil_id); - } - - public Material GetMaskedMultiplyMaterial(int stencil_id) { - return GetMaskedMaterial(MaskedMats_Multiply, stencil_id); - } - - public Material GetMaskedScreenMaterial(int stencil_id) { - return GetMaskedMaterial(MaskedMats_Screen, stencil_id); - } - - public Material GetMaskedSubtractMaterial(int stencil_id) { - return GetMaskedMaterial(MaskedMats_Subtract, stencil_id); + return LoadOrCreateMaterial( + CheckAndGetShader(DecrMaskShader), + (dir_path, filename) => { + return string.Format( + "{0}/{1}.mat", + dir_path, filename); + }, + material => material); } // --------------------------------------------------------------------- @@ -246,7 +260,8 @@ namespace FlashTools.Internal { void Reset() { Settings = SwfSettingsData.identity; - FillMaterialsCache(); + FillShadersCache(); + PregenerateMaterials(); } public static SwfSettings GetHolder() { diff --git a/Assets/FlashTools/Scripts/SwfAsset.cs b/Assets/FlashTools/Scripts/SwfAsset.cs index c5a935b..a2417c1 100644 --- a/Assets/FlashTools/Scripts/SwfAsset.cs +++ b/Assets/FlashTools/Scripts/SwfAsset.cs @@ -107,11 +107,11 @@ namespace FlashTools { [System.Serializable] public struct SwfBlendModeData { - public enum Types { + public enum Types : byte { Normal, - Add, Multiply, Screen, + Add, Subtract } public Types type;