修改内容提交

This commit is contained in:
李浩 2025-01-13 18:53:36 +08:00
parent c24f540f15
commit 5b84f9d220
5 changed files with 1418 additions and 1887 deletions

View File

@ -441,10 +441,14 @@ PlayableDirector:
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: 2421554648492608875, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
value: {fileID: 1671566009}
- key: {fileID: 2421554648492608875, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
- key: {fileID: 0}
value: {fileID: 1671566009}
- key: {fileID: -437625694803978534, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
value: {fileID: 541697801}
- key: {fileID: -7618589764545791627, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
value: {fileID: 541697800}
- key: {fileID: -5335991001591107039, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
value: {fileID: 541697799}
m_ExposedReferences:
m_References: []
--- !u!4 &240445009
@ -671,6 +675,84 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &541697796 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 989115040309980543, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
m_PrefabInstance: {fileID: 1671566004}
m_PrefabAsset: {fileID: 0}
--- !u!1 &541697797 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1882915299872507398, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
m_PrefabInstance: {fileID: 1671566004}
m_PrefabAsset: {fileID: 0}
--- !u!1 &541697798 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5397961013624283908, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
m_PrefabInstance: {fileID: 1671566004}
m_PrefabAsset: {fileID: 0}
--- !u!95 &541697799
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 541697796}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!95 &541697800
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 541697797}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!95 &541697801
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 541697798}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &575673780
GameObject:
m_ObjectHideFlags: 0
@ -1175,9 +1257,9 @@ PlayableDirector:
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: 2421554648492608875, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
- key: {fileID: 0}
value: {fileID: 1671566009}
- key: {fileID: 2421554648492608875, guid: 02b05c6e307a0d24ba7c15adebfae51d, type: 2}
- key: {fileID: 0}
value: {fileID: 1671566009}
- key: {fileID: 2421554648492608875, guid: 50068897446bc284494b1c142d69944a, type: 2}
value: {fileID: 1671566009}
@ -10778,9 +10860,18 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 5505629533228902133, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 1671566009}
- targetCorrespondingSourceObject: {fileID: 1882915299872507398, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 541697800}
- targetCorrespondingSourceObject: {fileID: 989115040309980543, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 541697799}
- targetCorrespondingSourceObject: {fileID: 5920165750860062728, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 425271741}
- targetCorrespondingSourceObject: {fileID: 5397961013624283908, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 541697801}
- targetCorrespondingSourceObject: {fileID: 9197810279863276835, guid: 749b015076c3753429774cf3f3daaffe, type: 3}
insertIndex: -1
addedObject: {fileID: 1671566006}

View File

@ -37,19 +37,10 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.8333334
time: 1.15
value: {x: 0.001, y: 0.34, z: 0}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: -0.0020000027, y: -1.5391755, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.9333333
value: {x: 0.0008, y: 0.1860826, z: 0}
inSlope: {x: -0.0020000027, y: -1.5391755, z: -0}
outSlope: {x: 0, y: 0, z: 0}
outSlope: {x: -0.0024000031, y: -1.8470106, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -89,7 +80,25 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5833334
time: 1.3166667
value: {x: 0.292, y: 1.1098, z: 0.0366}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.3333334
value: {x: 0.292, y: 1.1098, z: 0.0366}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.35
value: {x: 0.292, y: 1.1098, z: 0.0366}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -153,14 +162,41 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
genericBindings:
- serializedVersion: 2
path: 2858510753
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 896480316
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 2024168988
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.9333333
m_StopTime: 1.35
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -199,19 +235,10 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.8333334
time: 1.15
value: 0.001
inSlope: -0
outSlope: -0.0020000027
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.9333333
value: 0.0008
inSlope: -0.0020000027
outSlope: 0
outSlope: -0.0024000031
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -247,19 +274,10 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.8333334
time: 1.15
value: 0.34
inSlope: -0
outSlope: -1.5391755
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.9333333
value: 0.1860826
inSlope: -1.5391755
outSlope: 0
outSlope: -1.8470106
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -295,16 +313,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.8333334
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.9333333
time: 1.15
value: 0
inSlope: -0
outSlope: 0
@ -352,7 +361,25 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5833334
time: 1.3166667
value: 0.292
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
value: 0.292
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.35
value: 0.292
inSlope: 0
outSlope: 0
@ -400,7 +427,25 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5833334
time: 1.3166667
value: 1.1098
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
value: 1.1098
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.35
value: 1.1098
inSlope: 0
outSlope: 0
@ -448,7 +493,25 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5833334
time: 1.3166667
value: 0.0366
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.3333334
value: 0.0366
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.35
value: 0.0366
inSlope: 0
outSlope: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -970,21 +970,18 @@
<Action type="HighLight" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_yiyongzhufeiji" isHigh="false" color="0,255,0,255"></Action>
<!--播放动画-->
<!--<Action type="Anim" value="ExamPrefab" animName="XiaoDuQiXie"></Action>-->
<Action type="TimeLine" value="XiaoDuQiXieTimeLie" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="113"></Action>
<Action type="TimeLine" value="XiaoDuQiXieTimeLie" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="90"></Action>
<Action type="TimeTip" value="消毒倒计时&lt;color=#FF00FF&gt;{0}&lt;/color&gt;分钟" time="5" values="15,0" format="{0:F1}" finishedEvent="close" needClick="false" reverse="true" ></Action>
<Action type="Delay" value="5"></Action>
<Action type="Delay" value="6"></Action>
<Action type="Sequence">
<Action type="CameraLock" isMove="false" isRotate="false"></Action>
<Action type="CameraLock" isMove="false" isRotate="false"></Action>
<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定,取消"> </Action>
<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
<Action type="CameraLock" isMove="true" isRotate="true"></Action>
</Action >
</Action >
@ -1667,7 +1664,7 @@
</Action>
<!--播放动画-->
<Action type="TimeLine" value="XiaoDuQiXieTimeLie" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="113"></Action>
<Action type="TimeLine" value="XiaoDuQiXieTimeLie" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="90"></Action>
<Action type="TimeTip" value="消毒倒计时&lt;color=#FF00FF&gt;{0}&lt;/color&gt;分钟" time="5" values="15,0" format="{0:F1}" finishedEvent="close" needClick="false" reverse="true" ></Action>
</Action >