change vfx parameters

master
tigerchen 6 years ago
parent 0c7e78026d
commit c87f639fd4
  1. 4
      .gitmodules
  2. 8
      Unity-19050-01_ForstCoronation/Assets/Materials/IceMaterial.mat
  3. 513
      Unity-19050-01_ForstCoronation/Assets/Scenes/Ice.unity
  4. 2
      Unity-19050-01_ForstCoronation/Assets/Scenes/Ice/Scene Settings Profile.asset
  5. 13
      Unity-19050-01_ForstCoronation/Assets/Scripts/DebugUI.cs
  6. 46
      Unity-19050-01_ForstCoronation/Assets/Scripts/VFX_Timer.cs
  7. 11
      Unity-19050-01_ForstCoronation/Assets/Scripts/VFX_Timer.cs.meta
  8. BIN
      Unity-19050-01_ForstCoronation/Assets/Textures/ice_pattern.jpg
  9. 91
      Unity-19050-01_ForstCoronation/Assets/Textures/ice_pattern.jpg.meta
  10. 52
      Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/IceShaderGraph.shadergraph
  11. 10529
      Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/frozenVFX.vfx
  12. 1
      Unity-19050-01_ForstCoronation/Packages/com.ultracombos.configuration
  13. 1
      Unity-19050-01_ForstCoronation/Packages/manifest.json
  14. 2
      Unity-19050-01_ForstCoronation/ProjectSettings/TagManager.asset

4
.gitmodules vendored

@ -34,3 +34,7 @@
[submodule "_Package/jp.keijiro.klak.spout"] [submodule "_Package/jp.keijiro.klak.spout"]
path = _Package/jp.keijiro.klak.spout path = _Package/jp.keijiro.klak.spout
url = "https://github.com/keijiro/KlakSpout#upm" url = "https://github.com/keijiro/KlakSpout#upm"
[submodule "Unity-19050-01_ForstCoronation/Packages/com.ultracombos.configuration"]
path = Unity-19050-01_ForstCoronation/Packages/com.ultracombos.configuration
url = https://github.com/UltraCombos/com.ultracombos.configuration.git
branch = master

@ -13,7 +13,7 @@ Material:
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 1 m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0 m_DoubleSidedGI: 1
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap:
MotionVector: User MotionVector: User
@ -82,6 +82,10 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SampleTexture2D_389513AD_Texture_1:
m_Texture: {fileID: 2800000, guid: 958cfbda296458c4faf115404e562d73, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SampleTexture2D_983A7761_Texture_1: - _SampleTexture2D_983A7761_Texture_1:
m_Texture: {fileID: 2800000, guid: fbfffb30efcdb1543aeb718469e1e665, type: 3} m_Texture: {fileID: 2800000, guid: fbfffb30efcdb1543aeb718469e1e665, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -115,7 +119,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
- Vector1_30AC6A9E: 6 - Vector1_30AC6A9E: -0.32
- _AORemapMax: 1 - _AORemapMax: 1
- _AORemapMin: 0 - _AORemapMin: 0
- _ATDistance: 1 - _ATDistance: 1

@ -138,7 +138,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!64 &154044455 --- !u!64 &154044455
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -208,7 +208,7 @@ Transform:
m_GameObject: {fileID: 154044454} m_GameObject: {fileID: 154044454}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -3.08} m_LocalPosition: {x: 0, y: 0, z: -3.08}
m_LocalScale: {x: 2, y: 1, z: 2} m_LocalScale: {x: 1.5, y: 1, z: 1.5}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 11
@ -245,7 +245,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1859907172} - {fileID: 1859907172}
m_Father: {fileID: 1473451374} m_Father: {fileID: 1473451374}
m_RootOrder: 2 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -295,17 +295,6 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1111578220}
m_MethodName: SendEvent
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: MouseUp
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1482770260} - m_Target: {fileID: 1482770260}
m_MethodName: switchStat m_MethodName: switchStat
m_Mode: 1 m_Mode: 1
@ -626,7 +615,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 590248846} m_GameObject: {fileID: 590248846}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.55, y: 6.62, z: -4.99} m_LocalPosition: {x: -0.21, y: 6.62, z: -4.99}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -745,82 +734,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_sourceTexture: {fileID: 0} _sourceTexture: {fileID: 0}
_alphaSupport: 1 _alphaSupport: 1
--- !u!114 &633193832
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3}
m_Name:
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
rotation:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
skyIntensityMode:
m_OverrideState: 0
m_Value: 0
exposure:
m_OverrideState: 0
m_Value: 0
multiplier:
m_OverrideState: 0
m_Value: 1
min: 0
upperHemisphereLuxValue:
m_OverrideState: 0
m_Value: 1
min: 0
desiredLuxValue:
m_OverrideState: 0
m_Value: 20000
updateMode:
m_OverrideState: 0
m_Value: 0
updatePeriod:
m_OverrideState: 0
m_Value: 0
min: 0
includeSunInBaking:
m_OverrideState: 0
m_Value: 0
sunSize:
m_OverrideState: 0
m_Value: 0.04
min: 0
max: 1
sunSizeConvergence:
m_OverrideState: 0
m_Value: 5
min: 1
max: 10
atmosphereThickness:
m_OverrideState: 0
m_Value: 1
min: 0
max: 5
skyTint:
m_OverrideState: 0
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
hdr: 0
showAlpha: 1
showEyeDropper: 1
groundColor:
m_OverrideState: 0
m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1}
hdr: 0
showAlpha: 1
showEyeDropper: 1
enableSunDisk:
m_OverrideState: 0
m_Value: 1
--- !u!1 &706372899 --- !u!1 &706372899
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -913,146 +826,82 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &775993667 --- !u!114 &782403102
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 775993668}
- component: {fileID: 775993671}
- component: {fileID: 775993670}
- component: {fileID: 775993669}
m_Layer: 5
m_Name: Grow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &775993668
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 775993667}
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: 2022895806}
m_Father: {fileID: 1473451374}
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: 850, y: -420}
m_SizeDelta: {x: 160, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &775993669
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 775993667}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.3186632, g: 0.71655226, b: 0.8773585, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 775993670}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1111578220}
m_MethodName: SendEvent
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: MouseDown
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1482770260}
m_MethodName: enterGrow
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &775993670
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 775993667} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} active: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_AdvancedMode: 0
m_RaycastTarget: 1 rotation:
m_OnCullStateChanged: m_OverrideState: 0
m_PersistentCalls: m_Value: 0
m_Calls: [] min: 0
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} max: 360
m_Type: 1 skyIntensityMode:
m_PreserveAspect: 0 m_OverrideState: 0
m_FillCenter: 1 m_Value: 0
m_FillMethod: 4 exposure:
m_FillAmount: 1 m_OverrideState: 0
m_FillClockwise: 1 m_Value: 0
m_FillOrigin: 0 multiplier:
m_UseSpriteMesh: 0 m_OverrideState: 0
m_PixelsPerUnitMultiplier: 1 m_Value: 1
--- !u!222 &775993671 min: 0
CanvasRenderer: upperHemisphereLuxValue:
m_ObjectHideFlags: 0 m_OverrideState: 0
m_CorrespondingSourceObject: {fileID: 0} m_Value: 1
m_PrefabInstance: {fileID: 0} min: 0
m_PrefabAsset: {fileID: 0} desiredLuxValue:
m_GameObject: {fileID: 775993667} m_OverrideState: 0
m_CullTransparentMesh: 0 m_Value: 20000
updateMode:
m_OverrideState: 0
m_Value: 0
updatePeriod:
m_OverrideState: 0
m_Value: 0
min: 0
includeSunInBaking:
m_OverrideState: 0
m_Value: 0
sunSize:
m_OverrideState: 0
m_Value: 0.04
min: 0
max: 1
sunSizeConvergence:
m_OverrideState: 0
m_Value: 5
min: 1
max: 10
atmosphereThickness:
m_OverrideState: 0
m_Value: 1
min: 0
max: 5
skyTint:
m_OverrideState: 0
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
hdr: 0
showAlpha: 1
showEyeDropper: 1
groundColor:
m_OverrideState: 0
m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1}
hdr: 0
showAlpha: 1
showEyeDropper: 1
enableSunDisk:
m_OverrideState: 0
m_Value: 1
--- !u!1 &1111578216 --- !u!1 &1111578216
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1070,7 +919,6 @@ GameObject:
- component: {fileID: 1111578225} - component: {fileID: 1111578225}
- component: {fileID: 1111578224} - component: {fileID: 1111578224}
- component: {fileID: 1111578223} - component: {fileID: 1111578223}
- component: {fileID: 1111578226}
- component: {fileID: 1111578227} - component: {fileID: 1111578227}
m_Layer: 0 m_Layer: 0
m_Name: frozenVFX m_Name: frozenVFX
@ -1108,9 +956,9 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_ExecuteInEditor: 1 m_ExecuteInEditor: 1
m_Bindings: m_Bindings:
- {fileID: 1111578222}
- {fileID: 1111578227} - {fileID: 1111578227}
- {fileID: 1111578217} - {fileID: 1111578217}
- {fileID: 1111578222}
m_VisualEffect: {fileID: 1111578220} m_VisualEffect: {fileID: 1111578220}
--- !u!73398921 &1111578219 --- !u!73398921 &1111578219
VFXRenderer: VFXRenderer:
@ -1131,7 +979,6 @@ VFXRenderer:
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 0}
- {fileID: 0} - {fileID: 0}
- {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
@ -1176,7 +1023,7 @@ VisualEffect:
- m_Value: {x: 0.94, y: 0, z: 0} - m_Value: {x: 0.94, y: 0, z: 0}
m_Name: _Emitter m_Name: _Emitter
m_Overridden: 1 m_Overridden: 1
- m_Value: {x: -4.39, y: 0, z: -5.12} - m_Value: {x: -3.32, y: 0, z: -5.12}
m_Name: _Target m_Name: _Target
m_Overridden: 1 m_Overridden: 1
- m_Value: {x: 2.46, y: 0, z: -5.01} - m_Value: {x: 2.46, y: 0, z: -5.01}
@ -1273,18 +1120,6 @@ MeshCollider:
m_Convex: 0 m_Convex: 0
m_CookingOptions: 14 m_CookingOptions: 14
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1111578226
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1111578216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a68e2dc3e3b971e44a78a9b57bc67337, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1111578227 --- !u!114 &1111578227
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 2 m_ObjectHideFlags: 2
@ -1440,17 +1275,22 @@ PrefabInstance:
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.size propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.size
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: blobFilters.Array.size propertyPath: blobFilters.Array.size
value: 0 value: 0
objectReference: {fileID: 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, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
@ -1461,11 +1301,11 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value: value:
objectReference: {fileID: 1111578220} objectReference: {fileID: 1482770260}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SendEvent value: switchStat
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
@ -1475,13 +1315,38 @@ PrefabInstance:
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument propertyPath: AddTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: MouseDown value:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: blobFilters.Array.data[0] propertyPath: blobFilters.Array.data[0]
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3}
propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
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: 1482770260}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3}
propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: switchStat
objectReference: {fileID: 0}
- target: {fileID: 114540009425154000, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3}
propertyPath: RemoveTuioBlobEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8, - target: {fileID: 114872970294644716, guid: 1f68bf7cec2600e49a46d2f0554453c8,
type: 3} type: 3}
propertyPath: customRoi.height propertyPath: customRoi.height
@ -1579,8 +1444,6 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 1661572663}
- {fileID: 775993668}
- {fileID: 159340526} - {fileID: 159340526}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 8
@ -1626,7 +1489,7 @@ MonoBehaviour:
target: {fileID: 2032731583} target: {fileID: 2032731583}
emitter: {fileID: 1324214445} emitter: {fileID: 1324214445}
button: {fileID: 1859907171} button: {fileID: 1859907171}
growingSpeed: 0.006 growingSpeed: 0.015
stat: stat:
--- !u!4 &1482770261 --- !u!4 &1482770261
Transform: Transform:
@ -1642,83 +1505,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1661572662
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1661572663}
- component: {fileID: 1661572665}
- component: {fileID: 1661572664}
m_Layer: 5
m_Name: Stat
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1661572663
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661572662}
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: 1473451374}
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: 850, y: -350}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1661572664
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661572662}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: New Text
--- !u!222 &1661572665
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661572662}
m_CullTransparentMesh: 0
--- !u!1 &1743590121 --- !u!1 &1743590121
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2022,7 +1808,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2} m_Profile: {fileID: 11400000, guid: 61403f0eeedb6b84fafb386b66e1edae, type: 2}
m_StaticLightingSkyUniqueID: 2 m_StaticLightingSkyUniqueID: 2
m_SkySettings: {fileID: 633193832} m_SkySettings: {fileID: 782403102}
m_SkySettingsFromProfile: {fileID: -3409118194237871670, guid: 61403f0eeedb6b84fafb386b66e1edae, m_SkySettingsFromProfile: {fileID: -3409118194237871670, guid: 61403f0eeedb6b84fafb386b66e1edae,
type: 2} type: 2}
--- !u!114 &1937584651 --- !u!114 &1937584651
@ -2056,83 +1842,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2022895805
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2022895806}
- component: {fileID: 2022895808}
- component: {fileID: 2022895807}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2022895806
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022895805}
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: 775993668}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2022895807
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022895805}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Grow
--- !u!222 &2022895808
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022895805}
m_CullTransparentMesh: 0
--- !u!1 &2032731583 --- !u!1 &2032731583
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2219,7 +1928,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2032731583} m_GameObject: {fileID: 2032731583}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.39, y: 0, z: -5.12} m_LocalPosition: {x: -3.32, y: 0, z: -5.12}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}

@ -350,7 +350,7 @@ MonoBehaviour:
m_AdvancedMode: 0 m_AdvancedMode: 0
intensity: intensity:
m_OverrideState: 1 m_OverrideState: 1
m_Value: 0.421 m_Value: 0.281
min: 0 min: 0
max: 1 max: 1
scatter: scatter:

@ -62,7 +62,8 @@ public class DebugUI : MonoBehaviour
{ {
lerp_val = 1; lerp_val = 1;
stat = "completed"; stat = "completed";
vfx.SendEvent("Completed"); //vfx.SendEvent("Completed");
StartCoroutine("sendCompleted");
setButtonInteractable(true); setButtonInteractable(true);
button.GetComponent<Text>().text = stat; button.GetComponent<Text>().text = stat;
Debug.Log(stat); Debug.Log(stat);
@ -111,6 +112,12 @@ public class DebugUI : MonoBehaviour
*/ */
} }
IEnumerator sendCompleted()
{
yield return new WaitForSeconds(0.5f);
vfx.SendEvent("Completed");
}
public void switchStat() public void switchStat()
{ {
if(stat == "wait") if(stat == "wait")
@ -131,7 +138,7 @@ public class DebugUI : MonoBehaviour
spawn_t = total_t; spawn_t = total_t;
stat = "growing"; stat = "growing";
vfx.SendEvent("MouseDown"); vfx.SendEvent("MouseDown");
vfx.SetBool("growing", true); vfx.SetBool("isGrowing", true);
Debug.Log(stat); Debug.Log(stat);
} }
@ -141,7 +148,7 @@ public class DebugUI : MonoBehaviour
vfx.SetBool("isEnteringVanish", true); vfx.SetBool("isEnteringVanish", true);
stat = "vanishing"; stat = "vanishing";
vfx.SendEvent("MouseUp"); vfx.SendEvent("MouseUp");
vfx.SetBool("growing", false); vfx.SetBool("isGrowing", false);
Debug.Log(stat); Debug.Log(stat);
} }

@ -1,46 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Experimental.VFX;
public class VFX_Timer : MonoBehaviour
{
float spawn_t;
float total_t;
VisualEffect vfx;
// Start is called before the first frame update
void Start()
{
spawn_t = 0;
total_t = 0;
vfx = GetComponent<VisualEffect>();
}
// Update is called once per frame
void Update()
{
if(Input.GetMouseButton(0) == false && total_t > 0)
{
//total_t -= Time.deltaTime;
}
}
void OnMouseEnter()
{
spawn_t = total_t;
vfx.SetFloat("_spawnTime", spawn_t);
}
void OnMouseDrag()
{
total_t += Time.deltaTime;
vfx.SetFloat("_totalTime", total_t);
}
void OnMouseUp()
{
spawn_t = 0;
}
}

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a68e2dc3e3b971e44a78a9b57bc67337
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 KiB

@ -0,0 +1,91 @@
fileFormatVersion: 2
guid: 958cfbda296458c4faf115404e562d73
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
Subproject commit a8ad1b65b2e045723be77687a036e6bfb4ddec1f

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"com.ultracombos.grpc": "file:<project>/../../../_Package/com.ultracombos.grpc",
"com.unity.collab-proxy": "1.2.16", "com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0", "com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.0", "com.unity.ide.rider": "1.1.0",

@ -16,7 +16,7 @@ TagManager:
- -
- -
- PostProcessing - PostProcessing
- - ClippingMask
- -
- -
- -

Loading…
Cancel
Save