提交场景跳转,修复360视频播放,更新场景播放效果
This commit is contained in:
@@ -4133,6 +4133,12 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 386026518160299567}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &437741113 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1997430245209971286, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 386026518160299567}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &445628933 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7835869260577205006, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
|
||||
@@ -4420,6 +4426,54 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 715840963}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &727651628
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 727651630}
|
||||
- component: {fileID: 727651629}
|
||||
m_Layer: 0
|
||||
m_Name: (singleton)SceneMgr
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &727651629
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 727651628}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d89d4601da9843641a59d17ae1f87e9b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
nowSceneId: 0
|
||||
isCanMove: 1
|
||||
isTrigger: 0
|
||||
handisactive: 0
|
||||
--- !u!4 &727651630
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 727651628}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &728740010 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3737267972083659301, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
|
||||
@@ -5384,10 +5438,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 83d04a9fa17e22640874b9566dc9a890, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
leaveBoxObj: {fileID: 1631858368}
|
||||
box360: {fileID: 2014401109}
|
||||
sceneTitle: {fileID: 494711790}
|
||||
Volume: {fileID: 0}
|
||||
--- !u!1 &1186176946
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5615,6 +5666,12 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1278419029}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1278419032 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6300795867342810639, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1278419029}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1309877262 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 588539698535713068, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
|
||||
@@ -5703,53 +5760,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 35bed5e2884b6cb4a8f47d89e0bc7401, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
trackType: 2
|
||||
config: {fileID: 11400000, guid: eaa2c42315f6272428f35e6c76b28a57, type: 2}
|
||||
handPoseStart:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: RightHandPosCatch
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
handPoseUpdate:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: RightHandPosCatchStay
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
handPoseEnd:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: RightHandPosCatchEnd
|
||||
m_Mode: 6
|
||||
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 &1363925556
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5762,53 +5772,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 35bed5e2884b6cb4a8f47d89e0bc7401, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
trackType: 1
|
||||
config: {fileID: 11400000, guid: eaa2c42315f6272428f35e6c76b28a57, type: 2}
|
||||
handPoseStart:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: LeftHandPosCatch
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
handPoseUpdate:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: LeftHandPosCatchStay
|
||||
m_Mode: 6
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 1
|
||||
m_CallState: 2
|
||||
handPoseEnd:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 78603131}
|
||||
m_TargetAssemblyTypeName: HandCatchFontCtr, Assembly-CSharp
|
||||
m_MethodName: LeftHandPosCatchEnd
|
||||
m_Mode: 6
|
||||
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!1 &1375147206 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8052361413573644016, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
@@ -7526,9 +7489,9 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2014401107}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2014401109 stripped
|
||||
--- !u!1 &2014401111 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7573511408971368562, guid: 50ca7fef2a098434f98b8604cbe309d8,
|
||||
m_CorrespondingSourceObject: {fileID: 1389767798045452339, guid: 50ca7fef2a098434f98b8604cbe309d8,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2014401107}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -7554,8 +7517,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 2091649695}
|
||||
- component: {fileID: 2091649698}
|
||||
- component: {fileID: 2091649697}
|
||||
- component: {fileID: 2091649696}
|
||||
m_Layer: 0
|
||||
m_Name: TimeLine_Player
|
||||
m_TagString: Untagged
|
||||
@@ -7579,30 +7540,6 @@ Transform:
|
||||
- {fileID: 1159147081}
|
||||
m_Father: {fileID: 1985881132}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2091649696
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2091649694}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c2a10d02c00da1e4b832a42ea17a9445, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &2091649697
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2091649694}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a01799c1b53cf514f92a7612ec7711da, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!320 &2091649698
|
||||
PlayableDirector:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -7978,6 +7915,12 @@ PlayableDirector:
|
||||
value: {fileID: 1175713837}
|
||||
- key: {fileID: 3978606930230759815, guid: cf1918105f4339e4c9153e7e11e0cb48, type: 2}
|
||||
value: {fileID: 6141066472073512229}
|
||||
- key: {fileID: -5597652733095494746, guid: cf1918105f4339e4c9153e7e11e0cb48, type: 2}
|
||||
value: {fileID: 1278419032}
|
||||
- key: {fileID: -2945349423980844075, guid: cf1918105f4339e4c9153e7e11e0cb48, type: 2}
|
||||
value: {fileID: 2014401111}
|
||||
- key: {fileID: 9100741192073689852, guid: cf1918105f4339e4c9153e7e11e0cb48, type: 2}
|
||||
value: {fileID: 437741113}
|
||||
m_ExposedReferences:
|
||||
m_References: []
|
||||
--- !u!1 &2091879077 stripped
|
||||
@@ -8286,6 +8229,11 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6168315484107353282, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6519346914003169435, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_Mesh
|
||||
@@ -9174,6 +9122,46 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: guidePoint.x
|
||||
value: -0.29999995
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: guidePoint.z
|
||||
value: 0.23333335
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[0].z
|
||||
value: 4.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[1].x
|
||||
value: 3.7000003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[1].z
|
||||
value: 4.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[2].x
|
||||
value: 3.7000003
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[2].z
|
||||
value: -5.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2764891479747624117, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: plotBoundary.Array.data[3].z
|
||||
value: -5.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925730077110153010, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -9224,6 +9212,36 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: actAreaPoints.Array.data[0].z
|
||||
value: 4.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: actAreaPoints.Array.data[1].z
|
||||
value: 4.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: actAreaPoints.Array.data[2].z
|
||||
value: -5.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: actAreaPoints.Array.data[3].z
|
||||
value: -5.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: arrivalAreaPoints.Array.data[2].z
|
||||
value: 4.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5291596647546287392, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: arrivalAreaPoints.Array.data[3].z
|
||||
value: 4.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7247911268958157251, guid: f21606bf15cf5754e84d54f16c35858a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@@ -9322,3 +9340,4 @@ SceneRoots:
|
||||
- {fileID: 1186176948}
|
||||
- {fileID: 6746980536325675313}
|
||||
- {fileID: 4388910604662587619}
|
||||
- {fileID: 727651630}
|
||||
|
||||
Reference in New Issue
Block a user