From 1f743d1010d992ebe16f026c32558c66dca874a0 Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Dec 2019 01:29:34 +0800 Subject: [PATCH] [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] 1. Added oil effect. 2. Draw render texture only once. --- .../Assets/PaintingNavigator.unity | 133 +++++++++++++++--- .../Script/ArtworkGenerator.cs | 3 +- .../Script/PrintingGenerator.cs | 3 + 3 files changed, 121 insertions(+), 18 deletions(-) diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity index 695a848..3e09fdb 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity @@ -1268,7 +1268,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 60 m_FontStyle: 1 m_BestFit: 0 @@ -1557,7 +1557,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 37 m_FontStyle: 1 m_BestFit: 0 @@ -1910,7 +1910,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 36 m_FontStyle: 1 m_BestFit: 0 @@ -2589,7 +2589,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 70 m_FontStyle: 1 m_BestFit: 0 @@ -2834,7 +2834,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 63 m_FontStyle: 1 m_BestFit: 0 @@ -3448,7 +3448,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 @@ -3733,7 +3733,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 36 m_FontStyle: 1 m_BestFit: 0 @@ -4108,7 +4108,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 70 m_FontStyle: 1 m_BestFit: 0 @@ -5466,7 +5466,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -5497,6 +5497,7 @@ GameObject: m_Component: - component: {fileID: 1147096828} - component: {fileID: 1147096827} + - component: {fileID: 1147096829} - component: {fileID: 1147096826} m_Layer: 0 m_Name: Print Camera @@ -5541,7 +5542,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147096825} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} @@ -5591,6 +5592,53 @@ Transform: m_Father: {fileID: 903506351} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1147096829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1147096825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} + m_Name: + m_EditorClassIdentifier: + inputTexture: {fileID: 0} + renderToTexture: 0 + outputTexture: {fileID: 0} + outputMipmap: 0 + EffectFade: 0 + PanFade: 0 + SrcBright: 1 + SrcContrast: 1.4 + SrcColor: 1 + SrcBlur: 0 + BrushDetail: 0.1 + BrushFill: 0.5 + NumStrokes: 32768 + LayerScale: 0.8 + Canvas: 0.4 + FlickerFreq: 15 + FlickerStrength: 0 + LightAng: 135 + LightOffs: 60 + PaintDiff: 0.15 + PaintSpec: 0.15 + PaintShiny: 0.5 + ColorSpread: 0 + ScreenFOV: 0 + StrokeAng: 0 + StrokeBend: -1 + StrokeDir: 0 + StrokeContour: 1 + MultiStroke: 6 + strokeSeed: 10 + Vignette: 1 + CanvasBg: 0.5 + CanvasTint: {r: 1, g: 0.97, b: 0.85, a: 1} + flipY: 0 + geomFlipY: 0 --- !u!1 &1216005037 GameObject: m_ObjectHideFlags: 0 @@ -6899,7 +6947,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -6911,7 +6959,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u522A\u9664" + m_Text: "\u5220\u9664" --- !u!222 &1497926489 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7259,7 +7307,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -7338,6 +7386,7 @@ GameObject: m_Component: - component: {fileID: 1610923707} - component: {fileID: 1610923706} + - component: {fileID: 1610923708} - component: {fileID: 1610923705} m_Layer: 0 m_Name: Artwork Camera @@ -7379,7 +7428,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1610923704} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} @@ -7429,6 +7478,53 @@ Transform: m_Father: {fileID: 903506351} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1610923708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1610923704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} + m_Name: + m_EditorClassIdentifier: + inputTexture: {fileID: 0} + renderToTexture: 0 + outputTexture: {fileID: 0} + outputMipmap: 0 + EffectFade: 0 + PanFade: 0 + SrcBright: 1 + SrcContrast: 1.4 + SrcColor: 1 + SrcBlur: 0 + BrushDetail: 0.1 + BrushFill: 0.5 + NumStrokes: 32768 + LayerScale: 0.8 + Canvas: 0.4 + FlickerFreq: 15 + FlickerStrength: 0 + LightAng: 135 + LightOffs: 60 + PaintDiff: 0.15 + PaintSpec: 0.15 + PaintShiny: 0.5 + ColorSpread: 0 + ScreenFOV: 0 + StrokeAng: 0 + StrokeBend: -1 + StrokeDir: 0 + StrokeContour: 1 + MultiStroke: 6 + strokeSeed: 10 + Vignette: 0 + CanvasBg: 0.5 + CanvasTint: {r: 1, g: 0.97, b: 0.85, a: 1} + flipY: 0 + geomFlipY: 0 --- !u!1 &1637950943 GameObject: m_ObjectHideFlags: 0 @@ -7485,7 +7581,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 66 m_FontStyle: 1 m_BestFit: 0 @@ -8045,6 +8141,9 @@ MonoBehaviour: port: 50052 painting: {fileID: 0} signature: {fileID: 0} + color: + serializedVersion: 2 + rgba: 0 clearPaintings: 0 luggagePrinter: {fileID: 1005367765} onPaintingReceived: @@ -8846,7 +8945,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 36 m_FontStyle: 1 m_BestFit: 0 @@ -9450,7 +9549,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: e3b006f78a69d094c8541f00f92ecd2d, type: 3} + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} m_FontSize: 75 m_FontStyle: 1 m_BestFit: 0 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/ArtworkGenerator.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/ArtworkGenerator.cs index 80218e3..284263d 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/ArtworkGenerator.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/ArtworkGenerator.cs @@ -34,6 +34,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav IEnumerator Generate(Artwork artwork, string paintingPath, string signaturePath, string messagePath) { + cam.enabled = true; paint.UpdateArtwork(artwork); yield return new WaitForEndOfFrame(); @@ -54,7 +55,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav work.thumbnail.ReadPixels(new Rect(0, 0, width, height), 0, 0); work.thumbnail.Apply(true, true); RenderTexture.active = null; - + cam.enabled = false; onArtworkGenerated.Invoke(work); yield return null; diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PrintingGenerator.cs b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PrintingGenerator.cs index 6199188..70b28c6 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PrintingGenerator.cs +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PrintingGenerator.cs @@ -77,6 +77,8 @@ namespace UltraCombos.Minions.GirlsRoom.Nav color = new Color32(255, 255, 255, 255); } + cam.enabled = true; + painting.UpdateArtwork(work.serial, painting_texture, signature_texture, color); yield return new WaitForEndOfFrame(); @@ -86,6 +88,7 @@ namespace UltraCombos.Minions.GirlsRoom.Nav printing_texture.Apply(); RenderTexture.active = null; + cam.enabled = false; // should be replaced with printing process onPrint.Invoke(printing_texture);