add activation

This commit is contained in:
Chikashi Miyama 2019-08-17 18:17:57 +02:00
parent b9ab16e31b
commit b807feb2a4
3 changed files with 119 additions and 17 deletions

View file

@ -2,11 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6a8ca49-0b91-43c0-a787-44b1fda29c5f" name="Default Changelist" comment=""> <list default="true" id="c6a8ca49-0b91-43c0-a787-44b1fda29c5f" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/MappingControl.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/Mapping.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/Mapping.unity" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/MappingControl.cs.meta" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/MyPiece.playable" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Example1/MyPiece.playable" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -44,7 +41,7 @@
<entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/RmsAnalyzer.cs"> <entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/RmsAnalyzer.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="200">
<caret line="8" column="40" lean-forward="true" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" /> <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
<folding> <folding>
<marker date="1566047198938" expanded="true" signature="6:37" ph="..." /> <marker date="1566047198938" expanded="true" signature="6:37" ph="..." />
<marker date="1566047198938" expanded="true" signature="80:753" ph="{...}" /> <marker date="1566047198938" expanded="true" signature="80:753" ph="{...}" />
@ -61,7 +58,7 @@
<entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/BallMapping.cs"> <entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/BallMapping.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750"> <state relative-caret-position="750">
<caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" /> <caret line="30" selection-start-line="30" selection-end-line="30" />
<folding> <folding>
<marker date="1566053310815" expanded="true" signature="61:855" ph="{...}" /> <marker date="1566053310815" expanded="true" signature="61:855" ph="{...}" />
<marker date="1566053310815" expanded="true" signature="108:853" ph="{...}" /> <marker date="1566053310815" expanded="true" signature="108:853" ph="{...}" />
@ -256,8 +253,8 @@
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="1108" /> <option name="x" value="2036" />
<option name="y" value="117" /> <option name="y" value="878" />
<option name="width" value="1757" /> <option name="width" value="1757" />
<option name="height" value="1617" /> <option name="height" value="1617" />
</component> </component>
@ -372,7 +369,7 @@
<workItem from="1562417897686" duration="5014000" /> <workItem from="1562417897686" duration="5014000" />
<workItem from="1562427566179" duration="10564000" /> <workItem from="1562427566179" duration="10564000" />
<workItem from="1562481324968" duration="27157000" /> <workItem from="1562481324968" duration="27157000" />
<workItem from="1566046428045" duration="4132000" /> <workItem from="1566046428045" duration="4731000" />
</task> </task>
<task id="LOCAL-00001" summary="add Kinect Manager"> <task id="LOCAL-00001" summary="add Kinect Manager">
<created>1562485186899</created> <created>1562485186899</created>
@ -392,7 +389,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46867000" /> <option name="totallyTimeSpent" value="47466000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -404,16 +401,16 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="817" y="426" width="1757" height="1617" extended-state="0" /> <frame x="2036" y="878" width="1757" height="1617" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.83093923" visible="true" weight="0.27460223" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.83093923" visible="true" weight="0.27460223" />
<window_info id="Structure" order="1" sideWeight="0.16906077" side_tool="true" visible="true" weight="0.27460223" /> <window_info id="Structure" order="1" sideWeight="0.16906077" side_tool="true" visible="true" weight="0.27460223" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.39907038" /> <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.39907038" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
@ -1001,7 +998,7 @@
<entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/RmsAnalyzer.cs"> <entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/RmsAnalyzer.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="200">
<caret line="8" column="40" lean-forward="true" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" /> <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
<folding> <folding>
<marker date="1566047198938" expanded="true" signature="6:37" ph="..." /> <marker date="1566047198938" expanded="true" signature="6:37" ph="..." />
<marker date="1566047198938" expanded="true" signature="80:753" ph="{...}" /> <marker date="1566047198938" expanded="true" signature="80:753" ph="{...}" />
@ -1023,7 +1020,7 @@
<entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/BallMapping.cs"> <entry file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Example1/script/BallMapping.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750"> <state relative-caret-position="750">
<caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" /> <caret line="30" selection-start-line="30" selection-end-line="30" />
<folding> <folding>
<marker date="1566053310815" expanded="true" signature="61:855" ph="{...}" /> <marker date="1566053310815" expanded="true" signature="61:855" ph="{...}" />
<marker date="1566053310815" expanded="true" signature="108:853" ph="{...}" /> <marker date="1566053310815" expanded="true" signature="108:853" ph="{...}" />

View file

@ -131,7 +131,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!95 &221635549 --- !u!95 &221635549
Animator: Animator:
serializedVersion: 3 serializedVersion: 3
@ -260,6 +260,8 @@ PlayableDirector:
value: {fileID: 1199216738} value: {fileID: 1199216738}
- key: {fileID: 114317833887755120, guid: e47ef7fc257f2fd469dd545e643bc6b9, type: 2} - key: {fileID: 114317833887755120, guid: e47ef7fc257f2fd469dd545e643bc6b9, type: 2}
value: {fileID: 221635549} value: {fileID: 221635549}
- key: {fileID: 114704940880640000, guid: e47ef7fc257f2fd469dd545e643bc6b9, type: 2}
value: {fileID: 221635548}
m_ExposedReferences: m_ExposedReferences:
m_References: [] m_References: []
--- !u!4 &703952018 --- !u!4 &703952018

View file

@ -16,6 +16,7 @@ MonoBehaviour:
m_Tracks: m_Tracks:
- {fileID: 114479060904044746} - {fileID: 114479060904044746}
- {fileID: 114317833887755120} - {fileID: 114317833887755120}
- {fileID: 114704940880640000}
m_FixedDuration: 0 m_FixedDuration: 0
m_EditorSettings: m_EditorSettings:
m_Framerate: 60 m_Framerate: 60
@ -231,6 +232,108 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0 m_ApplyOffsets: 0
--- !u!114 &114611508007446338
MonoBehaviour:
m_ObjectHideFlags: 1
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: 442072544, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &114704940880640000
MonoBehaviour:
m_ObjectHideFlags: 1
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: 46519060, guid: 6a10b2909283487f913b00d94cd3faf5, type: 3}
m_Name: Activation Track
m_EditorClassIdentifier:
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_AnimClip: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Start: 20.116666666666667
m_ClipIn: 0
m_Asset: {fileID: 114611508007446338}
m_Duration: 9.966666666666669
m_TimeScale: 1
m_ParentTrack: {fileID: 114704940880640000}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Floor
m_Version: 1
m_Version: 2
m_PostPlaybackState: 3
--- !u!114 &114712138302265878 --- !u!114 &114712138302265878
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1