diff --git a/Assets/DevTests/Animations/BugTests/Joshua Sagar_Mail.meta b/Assets/DevTests/Animations/BugTests/Joshua Sagar_Mail.meta new file mode 100644 index 0000000..6e34448 --- /dev/null +++ b/Assets/DevTests/Animations/BugTests/Joshua Sagar_Mail.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17783bd6570e64369be75efbc13e8620 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DevTests/Scene.unity b/Assets/DevTests/Scene.unity index 33d5be5..b3c92cb 100644 --- a/Assets/DevTests/Scene.unity +++ b/Assets/DevTests/Scene.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -37,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 11 m_GIWorkflowMode: 1 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -53,50 +54,76 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 m_TextureHeight: 1024 + m_AO: 0 m_AOMaxDistance: 1 - m_Padding: 2 m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &1173114888 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1173114893} - - 20: {fileID: 1173114892} - - 92: {fileID: 1173114891} - - 124: {fileID: 1173114890} - - 81: {fileID: 1173114889} + - component: {fileID: 1173114893} + - component: {fileID: 1173114892} + - component: {fileID: 1173114890} + - component: {fileID: 1173114889} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -112,13 +139,6 @@ AudioListener: m_GameObject: {fileID: 1173114888} m_Enabled: 1 --- !u!124 &1173114890 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1173114888} - m_Enabled: 1 ---- !u!92 &1173114891 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -155,10 +175,12 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &1173114893 Transform: m_ObjectHideFlags: 0 @@ -168,7 +190,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/FlashTools/Docs/CHANGELOG.md b/Assets/FlashTools/Docs/CHANGELOG.md index 1697a34..d888302 100644 --- a/Assets/FlashTools/Docs/CHANGELOG.md +++ b/Assets/FlashTools/Docs/CHANGELOG.md @@ -1,3 +1,7 @@ +###### Version 1.3.17 +* Fix 2019 warnings +* Force swf asset binary serialization + ###### Version 1.3.16 * Minor promo fixes diff --git a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla._Stage_.asset b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla._Stage_.asset index 36806dd..2109c08 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla._Stage_.asset and b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla._Stage_.asset differ diff --git a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.asset b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.asset index 355c83e..0a15966 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.asset and b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.asset differ diff --git a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.bureaucrat.asset b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.bureaucrat.asset index 3cfef79..6573ede 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.bureaucrat.asset and b/Assets/FlashTools/Example/Animations/npc_bureaucrat.fla_export/npc_bureaucrat.fla.bureaucrat.asset differ diff --git a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla._Stage_.asset b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla._Stage_.asset index f0379d9..143b03e 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla._Stage_.asset and b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla._Stage_.asset differ diff --git a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.asset b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.asset index ba52f38..d4fc80b 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.asset and b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.asset differ diff --git a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.smuggler.asset b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.smuggler.asset index da3144c..ac6f4fe 100644 Binary files a/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.smuggler.asset and b/Assets/FlashTools/Example/Animations/npc_smuggler.fla_export/npc_smuggler.fla.smuggler.asset differ diff --git a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla._Stage_.asset b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla._Stage_.asset index fc5f7a2..4da86ba 100644 Binary files a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla._Stage_.asset and b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla._Stage_.asset differ diff --git a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.asset b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.asset index 367f9da..8ca5bea 100644 Binary files a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.asset and b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.asset differ diff --git a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.purpleFlower.asset b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.purpleFlower.asset index 33dac63..8aa5bdd 100644 Binary files a/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.purpleFlower.asset and b/Assets/FlashTools/Example/Animations/purple_apparition.fla_export/purple_apparition.fla.purpleFlower.asset differ diff --git a/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla._Stage_.asset b/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla._Stage_.asset index 5173351..277d503 100644 Binary files a/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla._Stage_.asset and b/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla._Stage_.asset differ diff --git a/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla.asset b/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla.asset index cf8b8ff..1d6ee99 100644 Binary files a/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla.asset and b/Assets/FlashTools/Example/Animations/rainbow_100coinstoday.fla_export/rainbow_100coinstoday.fla.asset differ diff --git a/Assets/FlashTools/Example/Scene.unity b/Assets/FlashTools/Example/Scene.unity index bf78396..eb10095 100644 --- a/Assets/FlashTools/Example/Scene.unity +++ b/Assets/FlashTools/Example/Scene.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -37,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 11 m_GIWorkflowMode: 1 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -53,51 +54,79 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 m_TextureHeight: 1024 + m_AO: 0 m_AOMaxDistance: 1 - m_Padding: 2 m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &58420233 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 58420238} - - 33: {fileID: 58420237} - - 23: {fileID: 58420236} - - 114: {fileID: 58420235} - - 114: {fileID: 58420234} - - 114: {fileID: 58420239} + - component: {fileID: 58420238} + - component: {fileID: 58420237} + - component: {fileID: 58420236} + - component: {fileID: 58420235} + - component: {fileID: 58420234} + - component: {fileID: 58420239} + - component: {fileID: 58420240} m_Layer: 0 m_Name: purple_apparition.fla.purpleFlower m_TagString: Untagged @@ -148,22 +177,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d58d9a5e482e8429f8d7d18a9538d94a, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &58420237 MeshFilter: @@ -181,10 +218,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &58420239 MonoBehaviour: m_ObjectHideFlags: 0 @@ -196,15 +233,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59eb8a1569d5d49c2a71ee09aabc647e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!210 &58420240 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 58420233} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &919052529 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 919052531} - - 114: {fileID: 919052530} + - component: {fileID: 919052531} + - component: {fileID: 919052530} m_Layer: 0 m_Name: '[SwfManager]' m_TagString: Untagged @@ -232,22 +279,23 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &944418756 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 944418761} - - 33: {fileID: 944418760} - - 23: {fileID: 944418759} - - 114: {fileID: 944418758} - - 114: {fileID: 944418757} + - component: {fileID: 944418761} + - component: {fileID: 944418760} + - component: {fileID: 944418759} + - component: {fileID: 944418758} + - component: {fileID: 944418757} + - component: {fileID: 944418762} m_Layer: 0 m_Name: npc_smuggler.fla.smuggler m_TagString: Untagged @@ -298,6 +346,10 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d58d9a5e482e8429f8d7d18a9538d94a, type: 2} - {fileID: 2100000, guid: 3c29e337d2fa54be7af8d125c34562b7, type: 2} @@ -306,20 +358,24 @@ MeshRenderer: - {fileID: 2100000, guid: 3c29e337d2fa54be7af8d125c34562b7, type: 2} - {fileID: 2100000, guid: fd62ebda9455442f4a7861e78484f3b6, type: 2} - {fileID: 2100000, guid: 69837dba6d9e9419a8e22a6b25de0008, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &944418760 MeshFilter: @@ -337,22 +393,33 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1, y: -1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &944418762 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 944418756} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1036351690 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1036351695} - - 33: {fileID: 1036351694} - - 23: {fileID: 1036351693} - - 114: {fileID: 1036351692} - - 114: {fileID: 1036351691} + - component: {fileID: 1036351695} + - component: {fileID: 1036351694} + - component: {fileID: 1036351693} + - component: {fileID: 1036351692} + - component: {fileID: 1036351691} + - component: {fileID: 1036351696} m_Layer: 0 m_Name: npc_bureaucrat.fla.bureaucrat m_TagString: Untagged @@ -403,22 +470,30 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d58d9a5e482e8429f8d7d18a9538d94a, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1036351694 MeshFilter: @@ -436,22 +511,31 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1, z: 1} m_LocalScale: {x: -1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &1036351696 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1036351690} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1173114888 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1173114893} - - 20: {fileID: 1173114892} - - 92: {fileID: 1173114891} - - 124: {fileID: 1173114890} - - 81: {fileID: 1173114889} + - component: {fileID: 1173114893} + - component: {fileID: 1173114892} + - component: {fileID: 1173114890} + - component: {fileID: 1173114889} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -467,13 +551,6 @@ AudioListener: m_GameObject: {fileID: 1173114888} m_Enabled: 1 --- !u!124 &1173114890 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1173114888} - m_Enabled: 1 ---- !u!92 &1173114891 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -510,10 +587,12 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &1173114893 Transform: m_ObjectHideFlags: 0 @@ -523,22 +602,23 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1441265966 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1441265971} - - 33: {fileID: 1441265970} - - 23: {fileID: 1441265969} - - 114: {fileID: 1441265968} - - 114: {fileID: 1441265967} + - component: {fileID: 1441265971} + - component: {fileID: 1441265970} + - component: {fileID: 1441265969} + - component: {fileID: 1441265968} + - component: {fileID: 1441265967} + - component: {fileID: 1441265972} m_Layer: 0 m_Name: rainbow_100coinstoday.fla._Stage_ m_TagString: Untagged @@ -589,25 +669,33 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 3c29e337d2fa54be7af8d125c34562b7, type: 2} - {fileID: 2100000, guid: fd62ebda9455442f4a7861e78484f3b6, type: 2} - {fileID: 2100000, guid: 69837dba6d9e9419a8e22a6b25de0008, type: 2} - {fileID: 2100000, guid: d58d9a5e482e8429f8d7d18a9538d94a, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1441265970 MeshFilter: @@ -625,22 +713,33 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.578, y: 1.537, z: 1} m_LocalScale: {x: 0.5, y: 0.5, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &1441265972 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1441265966} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1893990126 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1893990131} - - 33: {fileID: 1893990130} - - 23: {fileID: 1893990129} - - 114: {fileID: 1893990128} - - 114: {fileID: 1893990127} + - component: {fileID: 1893990131} + - component: {fileID: 1893990130} + - component: {fileID: 1893990129} + - component: {fileID: 1893990128} + - component: {fileID: 1893990127} + - component: {fileID: 1893990132} m_Layer: 0 m_Name: npc_smuggler.fla.smuggler (1) m_TagString: Untagged @@ -691,6 +790,10 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: d58d9a5e482e8429f8d7d18a9538d94a, type: 2} - {fileID: 2100000, guid: 3c29e337d2fa54be7af8d125c34562b7, type: 2} @@ -699,20 +802,24 @@ MeshRenderer: - {fileID: 2100000, guid: 3c29e337d2fa54be7af8d125c34562b7, type: 2} - {fileID: 2100000, guid: fd62ebda9455442f4a7861e78484f3b6, type: 2} - {fileID: 2100000, guid: 69837dba6d9e9419a8e22a6b25de0008, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!33 &1893990130 MeshFilter: @@ -730,7 +837,17 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: -1, z: 1} m_LocalScale: {x: -1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &1893990132 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1893990126} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 diff --git a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs index cf36777..36506aa 100644 --- a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs +++ b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfClipAssetEditor.cs @@ -57,14 +57,12 @@ namespace FTEditor.Editors { if ( clip_go ) { var prefab_path = GetPrefabPath(clip); if ( !string.IsNullOrEmpty(prefab_path) ) { - var prefab = AssetDatabase.LoadMainAssetAtPath(prefab_path); - if ( !prefab ) { - prefab = PrefabUtility.CreateEmptyPrefab(prefab_path); - } - result = PrefabUtility.ReplacePrefab( - clip_go, - prefab, - ReplacePrefabOptions.ConnectToPrefab); + prefab_path = AssetDatabase.GenerateUniqueAssetPath(prefab_path); + #if UNITY_2018_3_OR_NEWER + result = PrefabUtility.SaveAsPrefabAsset(clip_go, prefab_path); + #else + result = PrefabUtility.CreatePrefab(prefab_path, clip_go); + #endif } GameObject.DestroyImmediate(clip_go, true); } diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfAsset.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfAsset.cs index 5418af7..1673072 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfAsset.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfAsset.cs @@ -3,6 +3,7 @@ using FTRuntime.Internal; using System.Collections.Generic; namespace FTRuntime { + [PreferBinarySerialization] public class SwfAsset : ScriptableObject { [HideInInspector] public byte[] Data; diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfClip.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfClip.cs index 090336c..b3c02a0 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfClip.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfClip.cs @@ -3,6 +3,7 @@ using UnityEngine.Rendering; using FTRuntime.Internal; namespace FTRuntime { + [AddComponentMenu("FlashTools/SwfClip")] [ExecuteInEditMode, DisallowMultipleComponent] [RequireComponent(typeof(MeshFilter), typeof(MeshRenderer), typeof(SortingGroup))] public class SwfClip : MonoBehaviour { diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfClipAsset.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfClipAsset.cs index afd0f39..df0f818 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfClipAsset.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfClipAsset.cs @@ -3,6 +3,7 @@ using FTRuntime.Internal; using System.Collections.Generic; namespace FTRuntime { + [PreferBinarySerialization] public class SwfClipAsset : ScriptableObject { [System.Serializable] public class SubMeshData { diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfClipController.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfClipController.cs index 4ee1251..480ca77 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfClipController.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfClipController.cs @@ -2,6 +2,7 @@ using FTRuntime.Internal; namespace FTRuntime { + [AddComponentMenu("FlashTools/SwfClipController")] [ExecuteInEditMode, DisallowMultipleComponent] [RequireComponent(typeof(SwfClip))] public class SwfClipController : MonoBehaviour { diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs index fabe133..6b110ec 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs @@ -3,6 +3,7 @@ using FTRuntime.Internal; using System.Collections.Generic; namespace FTRuntime { + [AddComponentMenu("FlashTools/SwfManager")] [ExecuteInEditMode, DisallowMultipleComponent] public class SwfManager : MonoBehaviour { SwfAssocList _clips = new SwfAssocList(); diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfSettings.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfSettings.cs index 8b9150c..9491395 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfSettings.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfSettings.cs @@ -57,6 +57,10 @@ namespace FTRuntime { } } + [CreateAssetMenu( + fileName = "SwfSettings", + menuName = "FlashTools/SwfSettings", + order = 100)] public class SwfSettings : ScriptableObject { public SwfSettingsData Settings;