diff --git a/.gitmodules b/.gitmodules index dd53a29..780a13f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,6 +38,9 @@ path = _Package/com.ultracombos.configuration url = https://github.com/UltraCombos/com.ultracombos.configuration.git branch = master +[submodule "_Package/com.ultracombos.activity"] + path = _Package/com.ultracombos.activity + url = https://github.com/UltraCombos/com.ultracombos.activity.git [submodule "Unity-19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring"] path = Unity-19050-03_RoyalGallery_iPad/Packages/com.ultracombos.coloring url = https://github.com/UltraCombos/com.ultracombos.coloring.git diff --git a/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity b/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity index 7ae7547..6a8c4f2 100644 --- a/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity +++ b/Unity-19050-08-DarkSea/Assets/Scenes/DarkSea.unity @@ -130,7 +130,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &171055055 MeshCollider: m_ObjectHideFlags: 0 @@ -222,7 +222,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!64 &299496351 MeshCollider: m_ObjectHideFlags: 0 @@ -308,12 +308,12 @@ GameObject: - component: {fileID: 503604498} - component: {fileID: 503604497} m_Layer: 5 - m_Name: RawImage + m_Name: Wall_RawImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &503604496 RectTransform: m_ObjectHideFlags: 0 @@ -330,8 +330,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: 0} - m_SizeDelta: {x: 816, y: 460} + m_AnchoredPosition: {x: 0, y: 600} + m_SizeDelta: {x: 2585, y: 1200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &503604497 MonoBehaviour: @@ -366,6 +366,200 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503604495} m_CullTransparentMesh: 0 +--- !u!1 &508356619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 508356622} + - component: {fileID: 508356621} + - component: {fileID: 508356620} + - component: {fileID: 508356623} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &508356620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508356619} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &508356621 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508356619} + m_CullTransparentMesh: 0 +--- !u!224 &508356622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508356619} + 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: 2 + 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: 300, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &508356623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508356619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2f060315d279d141a05deb0236dde0e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] + articulatingActivities: [] + introTime: 0.5 + outroTime: 0.5 +--- !u!1001 &513889829 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1641997025252556, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_Name + value: UCEventSystem + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1221340186} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SwitchTo + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UltraCombos.Activity, UltraCombos.Activity.Runtime + objectReference: {fileID: 0} + - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1056573855} + - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: customRoi.width + value: 2585 + objectReference: {fileID: 0} + - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: customRoi.height + value: 1200 + objectReference: {fileID: 0} + - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + propertyPath: customRoi.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3} --- !u!1 &540220392 GameObject: m_ObjectHideFlags: 0 @@ -379,7 +573,7 @@ GameObject: - component: {fileID: 540220394} - component: {fileID: 540220393} m_Layer: 0 - m_Name: player + m_Name: WallPlayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -514,6 +708,76 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &797223803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 797223804} + - component: {fileID: 797223806} + - component: {fileID: 797223805} + m_Layer: 5 + m_Name: Ground_RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &797223804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797223803} + 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: 2585, y: 1200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &797223805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797223803} + 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: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &797223806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797223803} + m_CullTransparentMesh: 0 --- !u!1 &798465529 GameObject: m_ObjectHideFlags: 0 @@ -605,6 +869,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 503604496} + - {fileID: 797223804} + - {fileID: 508356622} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -613,7 +879,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &861449778 +--- !u!114 &846725642 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114218046520840180, guid: 1f68bf7cec2600e49a46d2f0554453c8, + type: 3} + m_PrefabInstance: {fileID: 513889829} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdf0798800151dc4e813b97f862d3d10, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &914806964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -621,57 +899,333 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 861449781} - - component: {fileID: 861449780} - - component: {fileID: 861449779} + - component: {fileID: 914806965} + - component: {fileID: 914806966} m_Layer: 0 - m_Name: EventSystem + m_Name: TUIO_Event m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &861449779 +--- !u!4 &914806965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914806964} + 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: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &914806966 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861449778} + m_GameObject: {fileID: 914806964} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: e7eda42473bde25468ccb55d2b565cf9, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &861449780 + img: {fileID: 508356619} + tuio_input: {fileID: 846725642} + act_pool: {fileID: 1221340186} + act_in: {fileID: 1136321091} + act_out: {fileID: 1056573855} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + 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} +--- !u!1 &1056573853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1056573854} + - component: {fileID: 1056573855} + m_Layer: 0 + m_Name: State_out + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1056573854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056573853} + 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: 1221340187} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1056573855 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861449778} + m_GameObject: {fileID: 1056573853} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 2af6d95f21a93714e944186ff0e29f68, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &861449781 + m_Delegates: [] + articulatingActivities: + - {fileID: 0} +--- !u!1 &1136321089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1136321090} + - component: {fileID: 1136321091} + m_Layer: 0 + m_Name: State_in + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1136321090 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861449778} + m_GameObject: {fileID: 1136321089} + 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: 1221340187} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1136321091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1136321089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2af6d95f21a93714e944186ff0e29f68, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] + articulatingActivities: + - {fileID: 0} +--- !u!1 &1221340185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221340187} + - component: {fileID: 1221340186} + m_Layer: 0 + m_Name: Activity Pool + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1221340186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221340185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc899c78f8612294097669c6627e2b0f, type: 3} + m_Name: + m_EditorClassIdentifier: + _current: {fileID: 1056573855} +--- !u!4 &1221340187 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221340185} + 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: + - {fileID: 1136321090} + - {fileID: 1056573854} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1395462205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1395462209} + - component: {fileID: 1395462208} + - component: {fileID: 1395462207} + - component: {fileID: 1395462206} + m_Layer: 0 + m_Name: GroundPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1395462206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395462205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03dae28dfe6734f4eb76c922ac72dd34, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 + materials: [] + attributeName: + targetObject: {fileID: 797223803} +--- !u!114 &1395462207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395462205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} + m_Name: + m_EditorClassIdentifier: + VideoAsset: {fileID: 11400000, guid: 232980c200b699741a54e99e165d86a2, type: 2} + LoadOnAwake: 1 + PlayOnStart: 1 + Looping: 1 + AudioVolume: 1 +--- !u!222 &1395462208 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395462205} + m_CullTransparentMesh: 0 +--- !u!224 &1395462209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395462205} 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} @@ -679,7 +1233,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &963194225 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2044104306 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -687,31 +1246,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 963194228} - - component: {fileID: 963194227} - - component: {fileID: 963194226} + - component: {fileID: 2044104309} + - component: {fileID: 2044104308} + - component: {fileID: 2044104307} m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + m_Name: WallCam + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &963194226 +--- !u!81 &2044104307 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 2044104306} m_Enabled: 1 ---- !u!20 &963194227 +--- !u!20 &2044104308 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 2044104306} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -732,7 +1291,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -747,17 +1306,17 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &963194228 +--- !u!4 &2044104309 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963194225} + m_GameObject: {fileID: 2044104306} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + 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_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts.meta b/Unity-19050-08-DarkSea/Assets/Scripts.meta new file mode 100644 index 0000000..f572138 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb87802004dde7f4282821bd9570911d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs b/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs new file mode 100644 index 0000000..5b2a352 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UltraCombos; +public class ScaleActivity : Activity +{ + public float introTime = 1; + public float outroTime = 1; + + protected override IEnumerator OnEnter() + { + yield return DoScaling( 1, introTime); + } + protected override IEnumerator OnLeave() + { + yield return DoScaling( 0, outroTime); + } + IEnumerator DoScaling( float to, float totalTime) + { + float from = transform.localScale.x; + float scale = from; + float startTime = Time.time; + while (scale != to) + { + float duration = Time.time - startTime; + scale = Mathf.Lerp(from, to, duration / totalTime); + transform.localScale = new Vector3(scale, scale, 1); + yield return null; + } + yield break; + } +} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta b/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta new file mode 100644 index 0000000..4e56fb8 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts/ScaleActivity.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2f060315d279d141a05deb0236dde0e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs new file mode 100644 index 0000000..72cf73b --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class tuio_event : MonoBehaviour +{ + // Start is called before the first frame update + public GameObject img; + public UltraCombos.GlobalMKHookInput tuio_input; + public UltraCombos.ActivityPool act_pool; + public UltraCombos.Activity act_in; + public UltraCombos.Activity act_out; + + void Start() + { + + } + + // Update is called once per frame + void Update() + { + int c = tuio_input.touchCount; + Debug.Log(c); + if(c > 0) + { + act_pool.SwitchTo(act_in); + Vector2 pos = tuio_input.GetTouch(0).position; + img.GetComponent().position = new Vector3(pos.x, pos.y, 0); + } else + { + act_pool.SwitchTo(act_out); + } + + } +} diff --git a/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs.meta b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs.meta new file mode 100644 index 0000000..cb796d4 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Scripts/tuio_event.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e7eda42473bde25468ccb55d2b565cf9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture b/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture new file mode 100644 index 0000000..b24638e --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ground_RendTex + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 2585 + m_Height: 1200 + m_AntiAliasing: 1 + m_DepthFormat: 2 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture.meta b/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture.meta new file mode 100644 index 0000000..54337da --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Textures/Ground_RendTex.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 953b304d2b6154d488d141287819ea73 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture b/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture new file mode 100644 index 0000000..7b5df0c --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wall_RendTex + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 2585 + m_Height: 1200 + m_AntiAliasing: 1 + m_DepthFormat: 2 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture.meta b/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture.meta new file mode 100644 index 0000000..8a4e278 --- /dev/null +++ b/Unity-19050-08-DarkSea/Assets/Textures/Wall_RendTex.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 779d680062ea8954ead35ef557729106 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity-19050-08-DarkSea/Packages/manifest.json b/Unity-19050-08-DarkSea/Packages/manifest.json index 2f1b73e..1da477f 100644 --- a/Unity-19050-08-DarkSea/Packages/manifest.json +++ b/Unity-19050-08-DarkSea/Packages/manifest.json @@ -3,6 +3,7 @@ "com.ultracombos.movie-player": "file:/../../../_Package/com.ultracombos.movie-player", "com.ultracombos.tuio": "file:/../../../_Package/com.ultracombos.tuio", "com.ultracombos.osc": "file:/../../../_Package/com.ultracombos.osc", + "com.ultracombos.activity": "file:/../../../_Package/com.ultracombos.activity", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.2.2", "com.unity.collab-proxy": "1.2.15", diff --git a/_Package/com.ultracombos.activity b/_Package/com.ultracombos.activity new file mode 160000 index 0000000..8857c9c --- /dev/null +++ b/_Package/com.ultracombos.activity @@ -0,0 +1 @@ +Subproject commit 8857c9cec174fb3de39801d899d5d81505b9f70c