diff --git a/Assets/Art/Models/New Folder/TiMaoInit.playable b/Assets/Art/Models/New Folder/TiMaoInit.playable
new file mode 100644
index 00000000..76058d3d
--- /dev/null
+++ b/Assets/Art/Models/New Folder/TiMaoInit.playable
@@ -0,0 +1,155 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2580966567354665839
+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: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+ m_Name: Animation Track
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: -1803449227742727286}
+ m_Duration: 0.8166666666666667
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -2580966567354665839}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: -1
+ m_BlendOutDuration: -1
+ 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: 1
+ m_PreExtrapolationMode: 1
+ m_PostExtrapolationTime: Infinity
+ m_PreExtrapolationTime: 0
+ m_DisplayName: TiMaoAnimInit
+ m_Markers:
+ m_Objects: []
+ m_InfiniteClipPreExtrapolation: 0
+ m_InfiniteClipPostExtrapolation: 0
+ m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+ m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+ m_InfiniteClipTimeOffset: 0
+ m_InfiniteClipRemoveOffset: 0
+ m_InfiniteClipApplyFootIK: 1
+ mInfiniteClipLoop: 0
+ m_MatchTargetFields: 63
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_AvatarMask: {fileID: 0}
+ m_ApplyAvatarMask: 1
+ m_TrackOffset: 0
+ m_InfiniteClip: {fileID: 0}
+ m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+ m_ApplyOffsets: 0
+--- !u!114 &-1803449227742727286
+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: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+ m_Name: AnimationPlayableAsset
+ m_EditorClassIdentifier:
+ m_Clip: {fileID: 7400000, guid: d5f62ef3923d19c4bb984c0877489559, type: 2}
+ m_Position: {x: 0, y: 0, z: 0}
+ m_EulerAngles: {x: 0, y: 0, z: 0}
+ m_UseTrackMatchFields: 1
+ m_MatchTargetFields: 63
+ m_RemoveStartOffset: 1
+ m_ApplyFootIK: 1
+ m_Loop: 0
+ m_Version: 1
+ m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &11400000
+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: bfda56da833e2384a9677cd3c976a436, type: 3}
+ m_Name: TiMaoInit
+ m_EditorClassIdentifier:
+ m_Version: 0
+ m_Tracks:
+ - {fileID: -2580966567354665839}
+ m_FixedDuration: 0
+ m_EditorSettings:
+ m_Framerate: 60
+ m_ScenePreview: 1
+ m_DurationMode: 0
+ m_MarkerTrack: {fileID: 0}
diff --git a/Assets/Art/Models/New Folder/TiMaoInit.playable.meta b/Assets/Art/Models/New Folder/TiMaoInit.playable.meta
new file mode 100644
index 00000000..83badff6
--- /dev/null
+++ b/Assets/Art/Models/New Folder/TiMaoInit.playable.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f9a2a04def1f63498b9fb6fd3023f32
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity
index b40a3774..9d1411b7 100644
--- a/Assets/Scenes/LouDiXuMuQvan.unity
+++ b/Assets/Scenes/LouDiXuMuQvan.unity
@@ -14104,6 +14104,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -1.8423682
objectReference: {fileID: 0}
+ - target: {fileID: 6716391999861567189, guid: bca559baa1f801e4e820f37067cd63f7, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6743561503221195120, guid: bca559baa1f801e4e820f37067cd63f7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -74.3384
@@ -14686,7 +14690,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7770369591733304147, guid: bca559baa1f801e4e820f37067cd63f7, type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7786260124269072527, guid: bca559baa1f801e4e820f37067cd63f7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -16308,6 +16312,42 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 490020475}
m_Modifications:
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.916
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.3173
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.0033387293
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.006502581
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.9978015
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.0658699
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 7.556
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -179.664
+ objectReference: {fileID: 0}
+ - target: {fileID: 142812916626759446, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0.725
+ objectReference: {fileID: 0}
- target: {fileID: 2244343663316115326, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -16348,6 +16388,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3086731022086599349, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.2765
+ objectReference: {fileID: 0}
- target: {fileID: 3445139721741238312, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3}
propertyPath: m_IsActive
value: 0
@@ -18282,143 +18326,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ba60d61d285dce14996c1f204a46e5a3, type: 3}
m_PrefabInstance: {fileID: 758617108}
m_PrefabAsset: {fileID: 0}
---- !u!1 &784370901
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 784370905}
- - component: {fileID: 784370904}
- - component: {fileID: 784370903}
- - component: {fileID: 784370902}
- m_Layer: 0
- m_Name: Main Camera
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &784370902
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 784370901}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_RenderShadows: 1
- m_RequiresDepthTextureOption: 2
- m_RequiresOpaqueTextureOption: 2
- m_CameraType: 0
- m_Cameras: []
- m_RendererIndex: -1
- m_VolumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- m_VolumeTrigger: {fileID: 0}
- m_VolumeFrameworkUpdateModeOption: 2
- m_RenderPostProcessing: 0
- m_Antialiasing: 0
- m_AntialiasingQuality: 2
- m_StopNaN: 0
- m_Dithering: 0
- m_ClearDepth: 1
- m_AllowXRRendering: 1
- m_AllowHDROutput: 1
- m_UseScreenCoordOverride: 0
- m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
- m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
- m_RequiresDepthTexture: 0
- m_RequiresColorTexture: 0
- m_Version: 2
- m_TaaSettings:
- quality: 3
- frameInfluence: 0.1
- jitterScale: 1
- mipBias: 0
- varianceClampScale: 0.9
- contrastAdaptiveSharpening: 0
---- !u!81 &784370903
-AudioListener:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 784370901}
- m_Enabled: 1
---- !u!20 &784370904
-Camera:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 784370901}
- m_Enabled: 1
- serializedVersion: 2
- m_ClearFlags: 1
- m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
- m_projectionMatrixMode: 1
- m_GateFitMode: 2
- m_FOVAxisMode: 0
- m_Iso: 200
- m_ShutterSpeed: 0.005
- m_Aperture: 16
- m_FocusDistance: 10
- m_FocalLength: 50
- m_BladeCount: 5
- m_Curvature: {x: 2, y: 11}
- m_BarrelClipping: 0.25
- m_Anamorphism: 0
- m_SensorSize: {x: 36, y: 24}
- m_LensShift: {x: 0, y: 0}
- m_NormalizedViewPortRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
- near clip plane: 0.3
- far clip plane: 1000
- field of view: 60
- orthographic: 0
- orthographic size: 5
- m_Depth: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingPath: -1
- m_TargetTexture: {fileID: 0}
- m_TargetDisplay: 0
- m_TargetEye: 3
- m_HDR: 1
- m_AllowMSAA: 1
- m_AllowDynamicResolution: 0
- m_ForceIntoRT: 0
- m_OcclusionCulling: 1
- m_StereoConvergence: 10
- m_StereoSeparation: 0.022
---- !u!4 &784370905
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 784370901}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.16258195, y: 1.0720601, z: -0.037676305}
- 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!1001 &799663102
PrefabInstance:
m_ObjectHideFlags: 0
@@ -24600,6 +24507,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2999783213077156870, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
+ propertyPath: TValue
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 5853507596174565926, guid: e1761819aac3ed74682aa8337a23d32e, type: 3}
propertyPath: m_Name
value: TiMao
@@ -24639,7 +24550,7 @@ Animation:
m_Animations:
- {fileID: 7400000, guid: c96594c92af0fa8468145efab826e19f, type: 2}
m_WrapMode: 0
- m_PlayAutomatically: 1
+ m_PlayAutomatically: 0
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!1001 &1051573965
@@ -29820,7 +29731,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 6669da75e54121749895f8a9990e5dcd, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 920198510596765919, guid: 6669da75e54121749895f8a9990e5dcd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -44024,13 +43935,42 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 93f44dac41ec84c45a2f370d264a6340, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1832123125}
m_SourcePrefab: {fileID: 100100000, guid: 93f44dac41ec84c45a2f370d264a6340, type: 3}
--- !u!4 &1832123123 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 93f44dac41ec84c45a2f370d264a6340, type: 3}
m_PrefabInstance: {fileID: 1832123122}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1832123124 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 93f44dac41ec84c45a2f370d264a6340, type: 3}
+ m_PrefabInstance: {fileID: 1832123122}
+ m_PrefabAsset: {fileID: 0}
+--- !u!65 &1832123125
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1832123124}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 0.40149832, y: 0.04919076, z: 0.23313475}
+ m_Center: {x: 0, y: 0.94844675, z: 0.67909145}
--- !u!1001 &1919443411
PrefabInstance:
m_ObjectHideFlags: 0
@@ -52984,4 +52924,3 @@ SceneRoots:
- {fileID: 490020475}
- {fileID: 738442634}
- {fileID: 664206377}
- - {fileID: 784370905}
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index f70fe59e..29fbe83d 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -325,7 +325,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b2c08eae7cce6c9479adebcaad5706c3, type: 3}
m_Name:
m_EditorClassIdentifier:
- animSpeed: 1
+ animSpeed: 2
--- !u!1 &1089184132
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/TiMaoAnimInit.anim b/Assets/TiMaoAnimInit.anim
new file mode 100644
index 00000000..23848b32
--- /dev/null
+++ b/Assets/TiMaoAnimInit.anim
@@ -0,0 +1,95 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: TiMaoAnimInit
+ serializedVersion: 7
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: TValue
+ path:
+ classID: 114
+ script: {fileID: 11500000, guid: 9e31f7b6160cbed41851ac4f758706c8, type: 3}
+ flags: 0
+ m_PPtrCurves: []
+ m_SampleRate: 24
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings: []
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - serializedVersion: 2
+ curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: TValue
+ path:
+ classID: 114
+ script: {fileID: 11500000, guid: 9e31f7b6160cbed41851ac4f758706c8, type: 3}
+ flags: 0
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/TiMaoAnimInit.anim.meta b/Assets/TiMaoAnimInit.anim.meta
new file mode 100644
index 00000000..a5731f55
--- /dev/null
+++ b/Assets/TiMaoAnimInit.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5f62ef3923d19c4bb984c0877489559
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml
index 85401478..4fe21328 100644
--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@@ -359,10 +359,10 @@
耗材/骨蜡.png
- 一次性注射器
+ 一次性输液器
Environment/SM_QvanChangJing/SM_BuLiaoLei/SM_ShuYeQi
- 一次性注射器
+ 一次性输液器
耗材/骨蜡.png
@@ -408,12 +408,13 @@
耗材/骨蜡.png
+
- 一次性注射器1
+ 一次性注射器
Environment/SM_QvanChangJing/SM_BuLiaoLei/zhusheqi
一次性注射器
-
+
耗材/骨蜡.png
@@ -470,7 +471,6 @@
Environment/SM_QvanChangJing/SM_BuLiaoLei/shoufuyi
一次性手术衣
-
耗材/骨蜡.png
@@ -640,10 +640,38 @@
+
+ 手术创巾
+ Models/chuangjinFinished
+
+
+
+ 坏死肠段
+ Models/73ChangZi
+
+
-
-
+
+ 吸引器
+ Environment/SM_QvanChangJing/jingwu/SM_XiYinQi/xyq20
+
+
+
+ 75肠子
+ Models/75changzi
+
+
+
+ 肠系膜缝合
+ Models/CZ_FengXian_Timeline/FengHe_ChangZi_Aim/ChangXiMo1
+
+
+
+ 更换手套
+ Models/zhudao/nan_shoushufu.012
+
+
@@ -689,7 +717,27 @@
-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -717,8 +765,10 @@
-
-
+
+
+
+
@@ -834,8 +884,6 @@
-
@@ -853,19 +901,23 @@
-
+
-
-
-
+
+
+
+
+
+
+
@@ -888,21 +940,39 @@
+
+
+
+
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -910,37 +980,51 @@
-
-
-
+
+
+
+
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
@@ -982,16 +1066,13 @@
-
-
-
+
@@ -1024,40 +1105,42 @@
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -1068,7 +1151,7 @@
-
+
@@ -1076,61 +1159,107 @@
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -1189,6 +1318,8 @@
+
+
@@ -1207,7 +1338,7 @@
-
+
@@ -1253,9 +1384,7 @@
-
-
+
@@ -1289,6 +1418,8 @@
+
+
@@ -1308,7 +1439,7 @@
-
+
@@ -1320,50 +1451,91 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1420,17 +1592,25 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
@@ -1440,17 +1620,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1465,9 +1652,6 @@
-
-
-
@@ -1492,9 +1676,12 @@
+
+
+
@@ -1527,16 +1714,21 @@
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1549,7 +1741,10 @@
-
+
+
+
+
@@ -1591,7 +1786,7 @@
-
+
@@ -1696,6 +1891,8 @@
+
+
@@ -1708,60 +1905,81 @@
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1796,7 +2014,14 @@
-
+
+
+
+
+
+
+
+
@@ -1806,43 +2031,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
-
-
-
-
+
+
+
-
+
+
@@ -1852,22 +2063,16 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1876,65 +2081,59 @@
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
-
-
-
- -->
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
- -->
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
@@ -1964,60 +2163,40 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
@@ -2029,34 +2208,28 @@
-
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
+
-
+
+
-
-
-
-
@@ -2071,20 +2244,18 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
-
@@ -2104,11 +2275,6 @@
-
-
-
-
-
@@ -2124,12 +2290,6 @@
-
-
-
-
-
-
@@ -2140,14 +2300,11 @@
-
-
-
-
-
-
+
+
+
@@ -2156,19 +2313,22 @@
-
+
+
+
+
+
-
@@ -2176,24 +2336,31 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
@@ -2204,56 +2371,32 @@
+
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2265,35 +2408,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
@@ -2303,31 +2426,45 @@
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
@@ -2340,12 +2477,8 @@
+
-
-
-
-
-
@@ -2354,29 +2487,27 @@
-
-
-
-
+
+
+
-
-
+
+
+
-
-
-
+
@@ -2387,13 +2518,22 @@
+
+
+
+
+
+
+
+
-
+
+
@@ -2408,17 +2548,16 @@
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -2436,6 +2575,9 @@
+
+
+
@@ -2464,23 +2606,35 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -2490,21 +2644,15 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
-
@@ -2551,11 +2699,10 @@
-
-
-
+
+
@@ -2568,102 +2715,69 @@
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
-
@@ -2689,35 +2803,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -2730,27 +2828,40 @@
-
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
@@ -2759,52 +2870,75 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2816,30 +2950,29 @@
+
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -2858,85 +2991,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
@@ -2944,17 +3039,19 @@
-
+
-
-
+
+
+
+
@@ -2962,44 +3059,3 @@
-
-
-
-
-
-
-
-
-
-
-
-