From 3092d89fe1ac05f1cfc5b5e929be41434154ba3a Mon Sep 17 00:00:00 2001 From: tigerchen Date: Thu, 12 Dec 2019 15:51:59 +0800 Subject: [PATCH 1/7] add touchVisualizer --- .../Assets/Prefabs/TUIO_Debug.prefab | 72 ++++++ .../Assets/Prefabs/TUIO_Debug.prefab.meta | 7 + .../Assets/Scenes/DarkSea.unity | 227 ++++++++++-------- .../Assets/Scripts/movieController.cs | 1 - .../Assets/Scripts/touchVisualizer.cs | 56 +++++ .../Assets/Scripts/touchVisualizer.cs.meta | 11 + .../Assets/Scripts/tuio_event.cs | 8 + 7 files changed, 287 insertions(+), 95 deletions(-) create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab.meta create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs.meta diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab new file mode 100644 index 0000000..da2f46d --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4561369756670910991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2843357119042037495} + - component: {fileID: 8998964087612649377} + - component: {fileID: 3911409587028272619} + m_Layer: 5 + m_Name: TUIO_Debug + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2843357119042037495 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4561369756670910991} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8998964087612649377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4561369756670910991} + m_CullTransparentMesh: 0 +--- !u!114 &3911409587028272619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4561369756670910991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9176218, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 10912, guid: 0000000000000000f000000000000000, type: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab.meta new file mode 100644 index 0000000..638f4e1 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/TUIO_Debug.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e138d516c2f8921419701ebaace6d191 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity index 91027a3..4904e16 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity @@ -228,7 +228,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &503604495 GameObject: @@ -341,7 +341,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -486,6 +486,117 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &655193970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 655193971} + - component: {fileID: 655193974} + - component: {fileID: 655193973} + - component: {fileID: 655193972} + - component: {fileID: 655193975} + m_Layer: 5 + m_Name: Debug_Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &655193971 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655193970} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &655193972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655193970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &655193973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655193970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &655193974 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655193970} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 3 + m_TargetDisplay: 0 +--- !u!225 &655193975 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655193970} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &798465529 GameObject: m_ObjectHideFlags: 0 @@ -578,9 +689,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 503604496} - - {fileID: 1959362813} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -609,6 +719,7 @@ GameObject: m_Component: - component: {fileID: 914806965} - component: {fileID: 914806966} + - component: {fileID: 914806967} m_Layer: 0 m_Name: TUIO_Event m_TagString: Untagged @@ -628,7 +739,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &914806966 MonoBehaviour: @@ -644,10 +755,25 @@ MonoBehaviour: m_EditorClassIdentifier: img: {fileID: 2829506254029656376, guid: 8bbc036a3be21954681613cbe4f0e9a8, type: 3} canvas: {fileID: 798465533} + VisualizeTouches: 1 frame_gap: 20 delta_threshold: 100 img_fade_speed: 0.02 img_wait_sec: 2 +--- !u!114 &914806967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914806964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca88ef87f2450a340a79ce723372f2db, type: 3} + m_Name: + m_EditorClassIdentifier: + debug_canvas: {fileID: 655193971} + _rect: {fileID: 2843357119042037495, guid: e138d516c2f8921419701ebaace6d191, type: 3} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -913,7 +1039,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 3 + m_SortingOrder: 2 m_TargetDisplay: 0 --- !u!224 &1781519748 RectTransform: @@ -928,97 +1054,10 @@ RectTransform: m_Children: - {fileID: 229700560} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1959362812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1959362813} - - component: {fileID: 1959362816} - - component: {fileID: 1959362815} - - component: {fileID: 1959362814} - m_Layer: 5 - m_Name: TUIO_Debug - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1959362813 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959362812} - 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_Children: [] - m_Father: {fileID: 798465533} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -600} - m_SizeDelta: {x: 2527, y: 1200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1959362814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959362812} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62f7dec0b00674947bc631624c21970a, type: 3} - m_Name: - m_EditorClassIdentifier: - _nameFilter: Spout DX11 Sender - _targetTexture: {fileID: 8400000, guid: e567e88d5f268114c873ccbdd25b0557, type: 2} - _targetRenderer: {fileID: 0} - _targetMaterialProperty: _MainTex ---- !u!114 &1959362815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959362812} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 8400000, guid: e567e88d5f268114c873ccbdd25b0557, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1959362816 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959362812} - m_CullTransparentMesh: 0 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs index 66619e8..4c1a27e 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -43,7 +43,6 @@ public class movieController : MonoBehaviour alpha = 1; stat = 2; } - } else if (stat == 2 && force_destroy) { diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs new file mode 100644 index 0000000..76e5fc8 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs @@ -0,0 +1,56 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class touchVisualizer : MonoBehaviour +{ + + public Transform debug_canvas; + public RectTransform _rect; + + Dictionary debug_touches = new Dictionary(); + + // Update is called once per frame + void Update() + { + if (GetComponent().VisualizeTouches) + debug_canvas.GetComponent().alpha = 1f; + else + debug_canvas.GetComponent().alpha = 0f; + + var touches = TUIOManager.Instance.touches; + foreach (var id in touches.Keys) + { + RectTransform tran = null; + if (debug_touches.ContainsKey(id) == false) + { + GameObject t = Instantiate(_rect.gameObject, debug_canvas); + t.name = "debug" + id.ToString(); + tran = t.GetComponent(); + debug_touches.Add(id, tran); + tran.position = touches[id].position; + } + else + { + tran = debug_touches[id]; + tran.position = touches[id].position; + } + } + + var removes = new HashSet(); + foreach (var id in debug_touches.Keys) + { + if (touches.ContainsKey(id) == false) // remove + { + removes.Add(id); + } + } + + foreach (var id in removes) + { + debug_touches.Remove(id); + Destroy(GameObject.Find("debug" + id.ToString())); + } + } +} + diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs.meta new file mode 100644 index 0000000..abcf7ca --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/touchVisualizer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ca88ef87f2450a340a79ce723372f2db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs index 775cf68..0e82605 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/tuio_event.cs @@ -7,9 +7,13 @@ public class tuio_event : MonoBehaviour { public movieController img; public Transform canvas; + Dictionary movies = new Dictionary(); Dictionary pre_pos = new Dictionary(); + [Config] + public bool VisualizeTouches = true; + [Config] [Range(1, 30)] public int frame_gap = 20; @@ -28,9 +32,12 @@ public class tuio_event : MonoBehaviour void Update() { + GetComponent().enabled = VisualizeTouches; + var touches = TUIOManager.Instance.touches; foreach (var id in touches.Keys) { + movieController movie = null; if (movies.ContainsKey(id) == false) // Add { @@ -48,6 +55,7 @@ public class tuio_event : MonoBehaviour else //update { movie = movies[id]; + if (Time.frameCount % frame_gap == 0) { float delta_pos = Vector2.Distance(pre_pos[id], movie.transform.position); From 4057a545e8f4d0c114dff784fc29e6bbf7066f46 Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Dec 2019 16:39:26 +0800 Subject: [PATCH 2/7] [03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC] Disabled Oil Paint Effect. --- .../Assets/PaintingNavigator.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3e09fdb..2655a7e 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 @@ -5599,7 +5599,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147096825} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} m_Name: @@ -7485,7 +7485,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1610923704} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} m_Name: From 0df07a2acdc6e9b7e1b51e760d794fe2845ba971 Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Dec 2019 16:41:10 +0800 Subject: [PATCH 3/7] [03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC] 1. Rollback portrait position 2. Turn off Oil Paint Effect. --- .../Assets/RoyalGalleryPortrait.unity | 24 +++++++++---------- .../UnityConnectSettings.asset | 14 +++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity index 4686e6b..748a6dd 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity @@ -744,14 +744,14 @@ RectTransform: m_GameObject: {fileID: 374925485} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1095845117} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 488, y: -626} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374925487 @@ -1808,15 +1808,15 @@ RectTransform: m_GameObject: {fileID: 820506440} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1953387458} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 564, y: -789} - m_SizeDelta: {x: 1216, y: 1216} + m_AnchoredPosition: {x: 0, y: 78} + m_SizeDelta: {x: 1210, y: 1210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &820506442 MonoBehaviour: @@ -2275,8 +2275,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 30} - m_SizeDelta: {x: 1300, y: 1300} + m_AnchoredPosition: {x: 0, y: 33} + m_SizeDelta: {x: 1290, y: 1290} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &937425705 MonoBehaviour: @@ -2448,7 +2448,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 961139953} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 91a9cabf19a634d2fac557d213b89a59, type: 3} m_Name: @@ -3533,14 +3533,14 @@ RectTransform: m_GameObject: {fileID: 1502836840} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2092843638} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -92, y: -1202} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 1080, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1502836842 @@ -4587,8 +4587,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: count: 1 - width: 1748 - height: 500 + width: 1080 + height: 1920 fps: 60 mode: 1 cursor: 1 diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/UnityConnectSettings.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/UnityConnectSettings.asset index 863581f..06db74a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/UnityConnectSettings.asset +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/UnityConnectSettings.asset @@ -3,25 +3,25 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + serializedVersion: 1 m_Enabled: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events + m_EventUrl: https://cdp.cloud.unity3d.com/v1/events + m_ConfigUrl: https://config.uca.cloud.unity3d.com m_TestInitMode: 0 CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes - m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_EventUrl: https://perf-events.cloud.unity3d.com m_Enabled: 0 + m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 UnityAnalyticsSettings: m_Enabled: 1 - m_InitializeOnStartup: 1 m_TestMode: 0 - m_TestEventUrl: - m_TestConfigUrl: + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 From e0f841daceb624890e4f9d4d533cccfbe8d42c84 Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Dec 2019 16:44:49 +0800 Subject: [PATCH 4/7] [03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad] Updated the version. --- .../Assets/Main-1-Intro.unity | 28 +++++++++---------- .../ProjectSettings/ProjectSettings.asset | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity index d86abda..1c0e80a 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-1-Intro.unity @@ -920,7 +920,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000076293945, y: 9.07} + m_AnchoredPosition: {x: -0.0000076293945, y: -1.7} m_SizeDelta: {x: 322.7, y: 215.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &725555481 @@ -942,8 +942,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} - m_FontSize: 60 + m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} + m_FontSize: 66 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 @@ -954,7 +954,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E2D" + m_Text: EN --- !u!222 &725555482 CanvasRenderer: m_ObjectHideFlags: 0 @@ -975,7 +975,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: "\u4E2D" @@ -990,7 +990,7 @@ MonoBehaviour: fontSize: 66 lineSpacing: 1 baseline: -1.7 - baseX: 0 + baseX: -0.0000076293945 --- !u!1 &746257126 GameObject: m_ObjectHideFlags: 0 @@ -1133,7 +1133,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1, y: 6} + m_AnchoredPosition: {x: 1, y: 32.75} m_SizeDelta: {x: 0, y: 14.73} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &779108442 @@ -1155,8 +1155,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 03ad2e2a2160ef747bf8b8434882a677, type: 3} - m_FontSize: 100 + m_Font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} + m_FontSize: 80 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 @@ -1167,7 +1167,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: START + m_Text: "\u5F00\u59CB" --- !u!222 &779108443 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1188,7 +1188,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d4111d72b538b544860d085f76e5ad8, type: 3} m_Name: m_EditorClassIdentifier: - language: 10 + language: 40 contexts: - language: 10 text: START @@ -1203,7 +1203,7 @@ MonoBehaviour: fontSize: 80 lineSpacing: 1 baseline: 32.75 - baseX: 0 + baseX: 1 --- !u!1 &938718532 GameObject: m_ObjectHideFlags: 0 @@ -3665,7 +3665,7 @@ PrefabInstance: - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a, type: 3} propertyPath: names.Array.data[9] - value: he + value: 10 objectReference: {fileID: 0} - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a, type: 3} @@ -3675,7 +3675,7 @@ PrefabInstance: - target: {fileID: 4352828657788332677, guid: d6764018e72489a4fa2bb9dd376cf95a, type: 3} propertyPath: names.Array.data[8] - value: he + value: 10 objectReference: {fileID: 0} - target: {fileID: 4352828657788332678, guid: d6764018e72489a4fa2bb9dd376cf95a, type: 3} diff --git a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/ProjectSettings/ProjectSettings.asset b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/ProjectSettings/ProjectSettings.asset index 99c38f0..4335ddb 100644 --- a/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/ProjectSettings/ProjectSettings.asset +++ b/03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/ProjectSettings/ProjectSettings.asset @@ -118,7 +118,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.3 + bundleVersion: 0.4 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From 5f8ecc44ea7fe107981475765aa4897cd1b5ad86 Mon Sep 17 00:00:00 2001 From: LH Date: Thu, 12 Dec 2019 16:46:15 +0800 Subject: [PATCH 5/7] [com.ultracombos.flockaroo] Updated it. --- _Package/com.ultracombos.flockaroo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Package/com.ultracombos.flockaroo b/_Package/com.ultracombos.flockaroo index df32609..0d878b6 160000 --- a/_Package/com.ultracombos.flockaroo +++ b/_Package/com.ultracombos.flockaroo @@ -1 +1 @@ -Subproject commit df32609c70bfe811df7a7bbe04c2251c20fcc9e5 +Subproject commit 0d878b63b170d68240983276f951cac7551c0b54 From 6740869a51f441dd92c54eca7c78dbe21000cb60 Mon Sep 17 00:00:00 2001 From: the78ester Date: Thu, 12 Dec 2019 16:51:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=5FSetup/README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _Setup/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_Setup/README.md b/_Setup/README.md index e4fd7de..3e53e4e 100644 --- a/_Setup/README.md +++ b/_Setup/README.md @@ -3,9 +3,9 @@ | Device | Read/Write | Read Only | | ------ | -------- | -------- | | 01 | AR3HNOYJSMWFTY2ABIGEIGVKIPPAPW2VB | BPIRVC4UOSYO2IQEKCULGSFG4WO5NWZYQ | -| 03 | dummy | dummy | -| 03 | dummy | dummy | -| 03 | dummy | dummy | +| 03 P | dummy | dummy | +| 03 N | dummy | dummy | +| 03 iPad| dummy | dummy | | 04 | ATGFQAUSFWHCTSKWZZ7BB23TWTK3BYJQO | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE | | 05 | dummy | dummy | | 06 | dummy | dummy | From f36e78d8e5e17e84a9de7e659b7d8d34dbbcd853 Mon Sep 17 00:00:00 2001 From: the78ester Date: Thu, 12 Dec 2019 17:08:36 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=5FSetup/README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _Setup/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/_Setup/README.md b/_Setup/README.md index 3e53e4e..4959e00 100644 --- a/_Setup/README.md +++ b/_Setup/README.md @@ -1,15 +1,15 @@ # Resilio Sync -| Device | Read/Write | Read Only | -| ------ | -------- | -------- | -| 01 | AR3HNOYJSMWFTY2ABIGEIGVKIPPAPW2VB | BPIRVC4UOSYO2IQEKCULGSFG4WO5NWZYQ | -| 03 P | dummy | dummy | -| 03 N | dummy | dummy | -| 03 iPad| dummy | dummy | -| 04 | ATGFQAUSFWHCTSKWZZ7BB23TWTK3BYJQO | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE | -| 05 | dummy | dummy | -| 06 | dummy | dummy | -| 08 | AJR4HEEZXQ4NFXS2BQA2CCGAHSRTGFCKB | BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH | +| Device | Read/Write | Read Only | +| ------------------------- | --------------------------------- | --------------------------------- | +| 01_ForstCoronation | AR3HNOYJSMWFTY2ABIGEIGVKIPPAPW2VB | BPIRVC4UOSYO2IQEKCULGSFG4WO5NWZYQ | +| 03_RoyalGallery_Portrait | A7LKLFO7YRW533ECKCUMQVA2NY55VKLE5 | BTFJANOLC6YIEWAGYVWTQ5KJ72OMG5SWF | +| 03_RoyalGallery_Navigator | ASBQMD3K6XSHHCVNELTTYKRKHJBDBS3CS | BHVO6SHJWB7P7HJI7HCYW6OX7ZXU2FIGD | +| 03 iPad | ADXCMVZ4RYXZ4GRNN35CJOL4HHIUBJVD6 | BOKTA525FABEL5IRYBT5XWSHJPMP75QN4 | +| 04_IceSlide | ATGFQAUSFWHCTSKWZZ7BB23TWTK3BYJQO | BOVGCXZ5BRD5Z5MQAQWD2PIHUP5A672TE | +| 05_BallPool | AED5Y4EJ6SVVD3GQRJSPZPA4JAXA5EIJR | BKSEQCSBPGPYNBRLPTRPQUZD7EZ674VAC | +| 06 | --------------------------------- | --------------------------------- | +| 08_DarkSea | AJR4HEEZXQ4NFXS2BQA2CCGAHSRTGFCKB | BUDFWE3TYAPFAIZEWWEHD5PCMKQTIUTBH |