Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2

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

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: 

08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity

@@ -37,8 +37,8 @@ RenderSettings:
   m_ReflectionBounces: 1
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 705507994}
+  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
+  m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -141,12 +141,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: -1, z: 1}
   m_Children: []
-  m_Father: {fileID: 798465533}
+  m_Father: {fileID: 1781519748}
-  m_RootOrder: 1
+  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: 1260, y: 0}
+  m_AnchoredPosition: {x: 1000, y: 0}
   m_SizeDelta: {x: 2528, y: 2400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &229700561
@@ -182,6 +182,54 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 229700559}
   m_CullTransparentMesh: 0
+--- !u!1 &388490434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 388490436}
+  - component: {fileID: 388490435}
+  m_Layer: 0
+  m_Name: StatManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &388490435
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388490434}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b44ad6717e6ec8641a8aead6800d2fdf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fade_sec: 1
+  loop_to_trigger: 1
+  idle_player: {fileID: 540220394}
+  h_player: {fileID: 1232323602}
+  h_grp: {fileID: 1781519744}
+--- !u!4 &388490436
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388490434}
+  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: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &503604495
 GameObject:
   m_ObjectHideFlags: 0
@@ -293,7 +341,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 4472652550524646, guid: 1f68bf7cec2600e49a46d2f0554453c8, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -371,7 +419,6 @@ GameObject:
   - component: {fileID: 540220395}
   - component: {fileID: 540220394}
   - component: {fileID: 540220393}
-  - component: {fileID: 540220397}
   m_Layer: 0
   m_Name: IdlePlayer
   m_TagString: Untagged
@@ -432,26 +479,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  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: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &540220397
+--- !u!1 &655193970
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 540220392}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b44ad6717e6ec8641a8aead6800d2fdf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -459,67 +494,109 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 705507995}
+  - component: {fileID: 655193971}
-  - component: {fileID: 705507994}
+  - component: {fileID: 655193974}
-  m_Layer: 0
+  - component: {fileID: 655193973}
-  m_Name: Directional Light
+  - 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!108 &705507994
+--- !u!224 &655193971
-Light:
+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: 705507993}
+  m_GameObject: {fileID: 655193970}
   m_Enabled: 1
-  serializedVersion: 8
+  m_EditorHideFlags: 0
-  m_Type: 1
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Name: 
-  m_Intensity: 1
+  m_EditorClassIdentifier: 
-  m_Range: 10
+  m_IgnoreReversedGraphics: 1
-  m_SpotAngle: 30
+  m_BlockingObjects: 0
-  m_CookieSize: 10
+  m_BlockingMask:
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
     serializedVersion: 2
     m_Bits: 4294967295
-  m_Lightmapping: 1
+--- !u!114 &655193973
-  m_LightShadowCasterMode: 0
+MonoBehaviour:
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &705507995
-Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 705507993}
+  m_GameObject: {fileID: 655193970}
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_Enabled: 1
-  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_EditorHideFlags: 0
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Children: []
+  m_Name: 
-  m_Father: {fileID: 0}
+  m_EditorClassIdentifier: 
-  m_RootOrder: 1
+  m_UiScaleMode: 0
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 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
@@ -532,8 +609,9 @@ GameObject:
   - component: {fileID: 798465532}
   - component: {fileID: 798465531}
   - component: {fileID: 798465530}
+  - component: {fileID: 798465534}
   m_Layer: 5
-  m_Name: Canvas
+  m_Name: IdleCanvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -597,7 +675,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_TargetDisplay: 0
 --- !u!224 &798465533
 RectTransform:
@@ -611,8 +689,6 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children:
   - {fileID: 503604496}
-  - {fileID: 229700560}
-  - {fileID: 1959362813}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -621,6 +697,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!225 &798465534
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 798465529}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 0
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &914806964
 GameObject:
   m_ObjectHideFlags: 0
@@ -631,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
@@ -650,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:
@@ -666,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
@@ -696,7 +800,7 @@ AudioListener:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 963194225}
-  m_Enabled: 0
+  m_Enabled: 1
 --- !u!20 &963194227
 Camera:
   m_ObjectHideFlags: 0
@@ -815,8 +919,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   VideoAsset: {fileID: 11400000, guid: 31be9f5d93a708246bb085eccb440932, type: 2}
   LoadOnAwake: 1
-  PlayOnStart: 1
+  PlayOnStart: 0
-  Looping: 1
+  Looping: 0
   AudioVolume: 1
 --- !u!222 &1232323603
 CanvasRenderer:
@@ -838,14 +942,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  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: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &1959362812
+--- !u!1 &1781519743
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -853,82 +957,107 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1959362813}
+  - component: {fileID: 1781519748}
-  - component: {fileID: 1959362816}
+  - component: {fileID: 1781519747}
-  - component: {fileID: 1959362815}
+  - component: {fileID: 1781519746}
-  - component: {fileID: 1959362814}
+  - component: {fileID: 1781519745}
+  - component: {fileID: 1781519744}
   m_Layer: 5
-  m_Name: TUIO_Debug
+  m_Name: HorseCanvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
---- !u!224 &1959362813
+--- !u!225 &1781519744
-RectTransform:
+CanvasGroup:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959362812}
+  m_GameObject: {fileID: 1781519743}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Enabled: 1
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_Alpha: 1
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Interactable: 0
-  m_Children: []
+  m_BlocksRaycasts: 1
-  m_Father: {fileID: 798465533}
+  m_IgnoreParentGroups: 0
-  m_RootOrder: 2
+--- !u!114 &1781519745
-  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_GameObject: {fileID: 1781519743}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 62f7dec0b00674947bc631624c21970a, type: 3}
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _nameFilter: Spout DX11 Sender
+  m_IgnoreReversedGraphics: 1
-  _targetTexture: {fileID: 8400000, guid: e567e88d5f268114c873ccbdd25b0557, type: 2}
+  m_BlockingObjects: 0
-  _targetRenderer: {fileID: 0}
+  m_BlockingMask:
-  _targetMaterialProperty: _MainTex
+    serializedVersion: 2
---- !u!114 &1959362815
+    m_Bits: 4294967295
+--- !u!114 &1781519746
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1959362812}
+  m_GameObject: {fileID: 1781519743}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_UiScaleMode: 0
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_ReferencePixelsPerUnit: 100
-  m_RaycastTarget: 1
+  m_ScaleFactor: 1
-  m_OnCullStateChanged:
+  m_ReferenceResolution: {x: 800, y: 600}
-    m_PersistentCalls:
+  m_ScreenMatchMode: 0
-      m_Calls: []
+  m_MatchWidthOrHeight: 0
-  m_Texture: {fileID: 8400000, guid: e567e88d5f268114c873ccbdd25b0557, type: 2}
+  m_PhysicalUnit: 3
-  m_UVRect:
+  m_FallbackScreenDPI: 96
-    serializedVersion: 2
+  m_DefaultSpriteDPI: 96
-    x: 0
+  m_DynamicPixelsPerUnit: 1
-    y: 0
+--- !u!223 &1781519747
-    width: 1
+Canvas:
-    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_GameObject: {fileID: 1781519743}
-  m_CullTransparentMesh: 0
+  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: 2
+  m_TargetDisplay: 0
+--- !u!224 &1781519748
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1781519743}
+  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:
+  - {fileID: 229700560}
+  m_Father: {fileID: 0}
+  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}

08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs

@@ -1,35 +1,83 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 using UltraCombos;
+using UltraCombos.Configuration;
+
 
 public class StatManager : MonoBehaviour
 {
+    [Config]
+    [Range(0.1f, 3f)]
+    public float fade_sec = 1f;
+
+    [Config]
+    [Range(1, 10)]
+    public int loop_to_trigger = 1;
 
-    DShowMoviePlayer player;
+    public DShowMoviePlayer idle_player;
+    public DShowMoviePlayer h_player;
+    public CanvasGroup h_grp;
     
     int loop_count;
-    int loop_to_trigger = 3;
+    float lerp_val = 1f;
 
     void Start()
     {
-        player = GetComponent<DShowMoviePlayer>();
+        h_grp.alpha = 0f;
         loop_count = 0;
+        lerp_val = 0;
     }
 
-    // Update is called once per frame
     void Update()
     {
+        if(h_player.IsPlaying == false){
+            if (idle_player.Frame == idle_player.TotalNumFrames)
+            {
+                loop_count += 1;
+            }
+            if (loop_count >= loop_to_trigger)
+            {
+                Debug.Log("horse fade in");
+                h_player.Play();
+                StartCoroutine("fade_in");
+                loop_count = 0;
+            }
+        }
 
-        if(player.GetCurrentTime >= 30f)
+        else
         {
-            loop_count += 1;
+            if(h_player.Frame == h_player.TotalNumFrames - fade_sec * 30)
+            {
+                idle_player.Frame = 0;
+                Debug.Log("horse fade out");
+                StartCoroutine("fade_out");
+            }
         }
-        if (loop_count >= 3)
+    }
+
+    IEnumerator fade_in()
+    {
+        lerp_val = 0f;
+        while (h_grp.alpha <= 1f)
         {
-            Debug.Log("Horse!!");
+            lerp_val += Time.deltaTime / fade_sec;
-            loop_count = 0;
+            h_grp.alpha = Mathf.Lerp(0f, 1f, lerp_val);
+            yield return null;
         }
+        yield break;
+    }
 
+    IEnumerator fade_out()
+    {
+        lerp_val = 1f;
+        while (h_grp.alpha >= 0f)
+        {
+            lerp_val -= Time.deltaTime / fade_sec;
+            h_grp.alpha = Mathf.Lerp(0f, 1f, lerp_val);
+            yield return null;
+        }
+        yield break;
     }
 }

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)
         {

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<int, RectTransform> debug_touches = new Dictionary<int, RectTransform>();
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (GetComponent<tuio_event>().VisualizeTouches)
+            debug_canvas.GetComponent<CanvasGroup>().alpha = 1f;
+        else
+            debug_canvas.GetComponent<CanvasGroup>().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<RectTransform>();
+                debug_touches.Add(id, tran);
+                tran.position = touches[id].position;
+            }
+            else
+            {
+                tran = debug_touches[id];
+                tran.position = touches[id].position;
+            }
+        }
+
+        var removes = new HashSet<int>();
+        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()));
+        }
+    }
+}
+

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: 

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<int, movieController> movies = new Dictionary<int, movieController>();
     Dictionary<int, Vector2> pre_pos = new Dictionary<int, Vector2>();
 
+    [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<touchVisualizer>().enabled = VisualizeTouches;
+
         var touches = TUIOManager.Instance.touches;
         foreach (var id in touches.Keys)
         {
+            
             movieController movie = null;
             if (movies.ContainsKey(id) == false) // Add
             {
@@ -48,11 +55,10 @@ 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);
-                    //float delta_pos = 199;
-                    //Debug.Log("delta pos = " + delta_pos);
                     if (delta_pos > delta_threshold)
                     {
                         movie.force_destroy = true;
@@ -62,17 +68,12 @@ public class tuio_event : MonoBehaviour
                     pre_pos[id] = touches[id].position;
                 } 
             }
-            //update or after adding
-            //Debug.Log("Update");
-            //movie.transform.position = touches[id].position;
         }
         var removes = new HashSet<int>();
         foreach (var id in movies.Keys)
         {
             if (touches.ContainsKey(id) == false) // remove
             {               
-                //Destroy(movies[id].gameObject);
-                //movies.Remove(id);
                 removes.Add(id);
             }
         }
@@ -83,7 +84,6 @@ public class tuio_event : MonoBehaviour
                 movies[id].stat = 3;
                 movies[id].destroy_timer = Time.time;
                 movies.Remove(id);
-                //Debug.Log("Remove");
             }
         }
     }