diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx b/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx new file mode 100644 index 0000000..937ca2a Binary files /dev/null and b/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx differ diff --git a/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx.meta b/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx.meta new file mode 100644 index 0000000..ed46100 --- /dev/null +++ b/Assets/Art/Models/LouDi/SM_Niu_GongJu/cashixiguan.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 179bcaabaf459e040b44d716ac1c8160 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 718d533..e90a8a4 100644 Binary files a/Assets/StreamingAssets/Excel/NiuData.xlsx and b/Assets/StreamingAssets/Excel/NiuData.xlsx differ diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index 66cc744..ee41f8b 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -3079,7 +3079,7 @@ "ProcessDescription": "用长柄镊子迅速（不超过 5 秒钟）取出 1 支冻精，投入准备好的温水中，摇晃 15 秒左右后取出", "SoundPath": "N043", "VideoPath": "", - "TimelineLength": 1280, + "TimelineLength": 1100, "CameraDefaultTR": "2.001848_-2.213458_-0.9590518|10.725_1.040002_0", "CameraNearTR": "2.198567_-2.51265_0.1442735|22.295_1.690001_0", "CameraNearTR2": "", @@ -3105,7 +3105,7 @@ "ProcessDescription": "用消毒纸巾擦干水珠", "SoundPath": "N044", "VideoPath": "", - "TimelineLength": 180, + "TimelineLength": 300, "CameraDefaultTR": "2.001848_-2.213458_-0.9590518|10.725_1.040002_0", "CameraNearTR": "1.569078_-2.51265_0.1643406|22.295_0.520002_0", "CameraNearTR2": "", @@ -3157,7 +3157,7 @@ "ProcessDescription": "将冻精细管的棉塞端插入输精枪的前端", "SoundPath": "N046", "VideoPath": "", - "TimelineLength": 180, + "TimelineLength": 240, "CameraDefaultTR": "2.001848_-2.213458_-0.9590518|10.725_1.040002_0", "CameraNearTR": "1.569078_-2.51265_0.1643406|22.295_0.520002_0", "CameraNearTR2": "", diff --git a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable index 946fd50..796673d 100644 --- a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable +++ b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable @@ -2120,7 +2120,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: {x: 0.02, y: 0, z: 0.02} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -2186,7 +2186,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0.02 inSlope: 0 outSlope: 0 @@ -2207,7 +2207,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -2237,7 +2237,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.16666667 value: 0.02 inSlope: 0 outSlope: 0 diff --git a/Assets/TimeLine/RGSJTimeLineCtrl.playable b/Assets/TimeLine/RGSJTimeLineCtrl.playable index 0ba0d39..3cafbfc 100644 --- a/Assets/TimeLine/RGSJTimeLineCtrl.playable +++ b/Assets/TimeLine/RGSJTimeLineCtrl.playable @@ -664,25 +664,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 25 - value: {x: 0, y: 0, z: 90} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 25.083334 + time: 21 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -690,9 +672,36 @@ AnimationClip: 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: 23 + value: {x: 0, y: -198.23, z: 180} + 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: 24.883333 + value: {x: 0, y: -198.23, z: 180} + 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: 25 + value: {x: 0, y: -198.23, z: 0} + 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: 56 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: -198.23, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -708,7 +717,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 + time: 21 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -717,25 +726,43 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 24 + time: 22 value: {x: 0.22169998, y: 0.20899999, z: 0.13170001} - inSlope: {x: 0.2217, y: 0, z: 0.1317} - outSlope: {x: 0.2217, y: 0, z: 0.1317} + inSlope: {x: 0.28653333, y: 0.19680007, z: 0.12533332} + outSlope: {x: 0.28653333, y: 0.19680007, z: 0.12533332} + 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: 22.5 + value: {x: 0.4298, y: 0.2952001, z: 0.188} + inSlope: {x: 0, y: 0, z: 0.1699} + outSlope: {x: 0, y: 0, z: 0.1699} + 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: 23 + value: {x: 0.3833, y: 0.18190002, z: 0.3016} + inSlope: {x: 0, y: -0.07560844, z: 0} + outSlope: {x: 0, y: -0.07560844, 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: 24.883333 + value: {x: 0.3833, y: 0.11500001, z: 0.3016} + inSlope: {x: 0, y: -0.09095001, z: 0} + outSlope: {x: 0, y: -0.09095001, 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: 25 - value: {x: 0.4434, y: 0.19279999, z: 0.2634} - inSlope: {x: 0, y: -0.059815373, z: 0} - outSlope: {x: 0, y: -0.059815373, 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: 25.083334 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -779,7 +806,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23.5 + time: 21.5 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -788,7 +815,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 25 + time: 22.5 value: {x: 0.3765004, y: 0.3765004, z: 0.3765004} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -797,7 +824,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: {x: 0.3765004, y: 0.3765004, z: 0.3765004} + 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: 25 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -818,7 +854,124 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: "\u5BF9\u8C61004" + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_XiaoDuZhi01 + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: cashixiguan + classID: 1 + script: {fileID: 0} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -854,6 +1007,33 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2832649892 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1036489978 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 435063451 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -881,7 +1061,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 + time: 21 value: 0 inSlope: 0 outSlope: 0 @@ -890,17 +1070,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 + time: 22 value: 0.22169998 - inSlope: 0.2217 - outSlope: 0.2217 + inSlope: 0.28653333 + outSlope: 0.28653333 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0.4434 + time: 22.5 + value: 0.4298 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -908,7 +1088,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 23 + value: 0.3833 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.883333 + value: 0.3833 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 0 inSlope: 0 outSlope: 0 @@ -956,7 +1154,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 + time: 21 value: 0 inSlope: 0 outSlope: 0 @@ -965,8 +1163,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 + time: 22 value: 0.20899999 + inSlope: 0.19680007 + outSlope: 0.19680007 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 22.5 + value: 0.2952001 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -974,16 +1181,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0.19279999 - inSlope: -0.059815373 - outSlope: -0.059815373 + time: 23 + value: 0.18190002 + inSlope: -0.07560844 + outSlope: -0.07560844 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 0.11500001 + inSlope: -0.09095001 + outSlope: -0.09095001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 0 inSlope: 0 outSlope: 0 @@ -1031,7 +1247,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 + time: 21 value: 0 inSlope: 0 outSlope: 0 @@ -1040,17 +1256,26 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 24 + time: 22 value: 0.13170001 - inSlope: 0.1317 - outSlope: 0.1317 + inSlope: 0.12533332 + outSlope: 0.12533332 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 0.2634 + time: 22.5 + value: 0.188 + inSlope: 0.1699 + outSlope: 0.1699 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 23 + value: 0.3016 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1058,7 +1283,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 0.3016 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 0 inSlope: 0 outSlope: 0 @@ -1106,14 +1340,23 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 25 + time: 23 value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.883333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1127,14 +1370,32 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 25 + time: 21 value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 23 + value: -198.23 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.883333 + value: -198.23 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1148,7 +1409,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23 + time: 21 value: 0 inSlope: 0 outSlope: 0 @@ -1157,8 +1418,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 - value: 90 + time: 23 + value: 180 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1166,7 +1427,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 0 inSlope: 0 outSlope: 0 @@ -1196,7 +1466,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23.5 + time: 21.5 value: 1 inSlope: 0 outSlope: 0 @@ -1205,7 +1475,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 22.5 value: 0.3765004 inSlope: 0 outSlope: 0 @@ -1214,7 +1484,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 0.3765004 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 1 inSlope: 0 outSlope: 0 @@ -1244,7 +1523,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23.5 + time: 21.5 value: 1 inSlope: 0 outSlope: 0 @@ -1253,7 +1532,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 22.5 value: 0.3765004 inSlope: 0 outSlope: 0 @@ -1262,7 +1541,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 0.3765004 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 1 inSlope: 0 outSlope: 0 @@ -1292,7 +1580,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 23.5 + time: 21.5 value: 1 inSlope: 0 outSlope: 0 @@ -1301,7 +1589,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 22.5 value: 0.3765004 inSlope: 0 outSlope: 0 @@ -1310,7 +1598,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25.083334 + time: 24.883333 + value: 0.3765004 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 25 value: 1 inSlope: 0 outSlope: 0 @@ -1335,6 +1632,123 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: "\u5BF9\u8C61004" + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_XiaoDuZhi01 + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 20.983334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 21 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: cashixiguan + classID: 1 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: @@ -1397,6 +1811,7 @@ MonoBehaviour: m_Children: - {fileID: -1734217418171090058} - {fileID: 5156819014519987594} + - {fileID: -4947500475265522958} m_Clips: [] m_Markers: m_Objects: [] @@ -3650,14 +4065,14 @@ AnimationClip: - serializedVersion: 3 time: 16.216667 value: {x: 43.208, y: 90, z: 90} - inSlope: {x: -1.2827563, y: 0, z: 0} - outSlope: {x: -1.2827563, y: 0, z: 0} + inSlope: {x: -1.1534861, y: 0, z: 0} + outSlope: {x: -1.1534861, 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: 17.5 + time: 17.716667 value: {x: 29.629, y: 90, z: 90} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -3666,34 +4081,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 18.783333 - value: {x: 43.828, y: 90, z: 90} - 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: 19.433332 - value: {x: 43.208, y: 90, z: 90} - inSlope: {x: -1.2827557, y: 0, z: 0} - outSlope: {x: -1.2827557, 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: 20.716667 - value: {x: 29.629, y: 90, z: 90} - 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: 22 + time: 19 value: {x: 43.828, y: 90, z: 90} inSlope: {x: 9.7370825, y: 0, z: 0} outSlope: {x: 9.7370825, y: 0, z: 0} @@ -3702,7 +4090,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 23 + time: 20 value: {x: 51.862, y: 90, z: 90} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -3711,7 +4099,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 25 + time: 21 value: {x: 51.862, y: 62.156, z: 90} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -3901,32 +4289,32 @@ AnimationClip: - serializedVersion: 3 time: 16.216667 value: {x: -0.018571038, y: 0.09606153, z: -0.17396528} - inSlope: {x: 0, y: 0, z: -0.026181787} - outSlope: {x: 0, y: 0, z: -0.026181787} + inSlope: {x: 0, y: 0, z: -0.02344184} + outSlope: {x: 0, y: 0, z: -0.02344184} 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: 16.85 + time: 17 value: {x: -0.0019710362, y: 0.09606153, z: -0.18966526} - inSlope: {x: 0.041610405, y: 0, z: 0} - outSlope: {x: 0.041610405, y: 0, z: 0} + inSlope: {x: 0.0356, y: 0, z: 0} + outSlope: {x: 0.0356, 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: 17.5 + time: 17.716667 value: {x: 0.03482896, y: 0.09606153, z: -0.1586653} - inSlope: {x: 0, y: 0, z: 0.052923087} - outSlope: {x: 0, y: 0, z: 0.052923087} + inSlope: {x: 0, y: 0, z: 0.05096293} + outSlope: {x: 0, y: 0, z: 0.05096293} 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: 18.15 + time: 18.35 value: {x: 0.016128965, y: 0.09606153, z: -0.120865285} inSlope: {x: -0.032649364, y: 0, z: 0} outSlope: {x: -0.032649364, y: 0, z: 0} @@ -3935,52 +4323,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 18.783333 - value: {x: -0.0070710406, y: 0.09606153, z: -0.15606529} - inSlope: {x: -0.027038973, y: 0, z: -0.04137663} - outSlope: {x: -0.027038973, y: 0, z: -0.04137663} - 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: 19.433332 - value: {x: -0.018571038, y: 0.09606153, z: -0.17396528} - inSlope: {x: 0, y: 0, z: -0.026181769} - outSlope: {x: 0, y: 0, z: -0.026181769} - 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: 20.066668 - value: {x: -0.0019710362, y: 0.09606153, z: -0.18966526} - inSlope: {x: 0.04161034, y: 0, z: 0} - outSlope: {x: 0.04161034, 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: 20.716667 - value: {x: 0.03482896, y: 0.09606153, z: -0.1586653} - inSlope: {x: 0, y: 0, z: 0.05361039} - outSlope: {x: 0, y: 0, z: 0.05361039} - 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: 21.35 - value: {x: 0.016128965, y: 0.09606153, z: -0.120865285} - inSlope: {x: -0.032649364, y: 0, z: 0} - outSlope: {x: -0.032649364, 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: 22 + time: 19 value: {x: -0.0070710406, y: 0.09606153, z: -0.15606529} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -3989,7 +4332,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 23 + time: 20 value: {x: -0.0070710406, y: 0.18856156, z: -0.15606529} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -3998,7 +4341,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 25 + time: 21 value: {x: 0.29092896, y: 0.18856156, z: -0.5267653} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -4050,7 +4393,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 22 + time: 19 value: {x: -0.00255, y: 0.00023, z: 0.00259} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -4130,7 +4473,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 22 + time: 19 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -4173,7 +4516,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 22 + time: 19 value: {x: 2, y: 2, z: 1.5} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -4446,16 +4789,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16.85 + time: 17 value: -0.0019710362 - inSlope: 0.041610405 - outSlope: 0.041610405 + inSlope: 0.0356 + outSlope: 0.0356 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: 0.03482896 inSlope: 0 outSlope: 0 @@ -4464,7 +4807,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.15 + time: 18.35 value: 0.016128965 inSlope: -0.032649364 outSlope: -0.032649364 @@ -4473,52 +4816,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 - value: -0.0070710406 - inSlope: -0.027038973 - outSlope: -0.027038973 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 19.433332 - value: -0.018571038 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.066668 - value: -0.0019710362 - inSlope: 0.04161034 - outSlope: 0.04161034 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.716667 - value: 0.03482896 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 21.35 - value: 0.016128965 - inSlope: -0.032649364 - outSlope: -0.032649364 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 + time: 19 value: -0.0070710406 inSlope: 0 outSlope: 0 @@ -4527,7 +4825,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 + time: 20 value: -0.0070710406 inSlope: 0 outSlope: 0 @@ -4536,7 +4834,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 21 value: 0.29092896 inSlope: 0 outSlope: 0 @@ -4737,7 +5035,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16.85 + time: 17 value: 0.09606153 inSlope: 0 outSlope: 0 @@ -4746,7 +5044,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: 0.09606153 inSlope: 0 outSlope: 0 @@ -4755,7 +5053,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.15 + time: 18.35 value: 0.09606153 inSlope: 0 outSlope: 0 @@ -4764,7 +5062,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 + time: 19 value: 0.09606153 inSlope: 0 outSlope: 0 @@ -4773,52 +5071,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 19.433332 - value: 0.09606153 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.066668 - value: 0.09606153 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.716667 - value: 0.09606153 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 21.35 - value: 0.09606153 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 - value: 0.09606153 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 23 + time: 20 value: 0.18856156 inSlope: 0 outSlope: 0 @@ -4827,7 +5080,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 21 value: 0.18856156 inSlope: 0 outSlope: 0 @@ -5021,14 +5274,14 @@ AnimationClip: - serializedVersion: 3 time: 16.216667 value: -0.17396528 - inSlope: -0.026181787 - outSlope: -0.026181787 + inSlope: -0.02344184 + outSlope: -0.02344184 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 16.85 + time: 17 value: -0.18966526 inSlope: 0 outSlope: 0 @@ -5037,16 +5290,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: -0.1586653 - inSlope: 0.052923087 - outSlope: 0.052923087 + inSlope: 0.05096293 + outSlope: 0.05096293 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.15 + time: 18.35 value: -0.120865285 inSlope: 0 outSlope: 0 @@ -5055,52 +5308,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 - value: -0.15606529 - inSlope: -0.04137663 - outSlope: -0.04137663 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 19.433332 - value: -0.17396528 - inSlope: -0.026181769 - outSlope: -0.026181769 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.066668 - value: -0.18966526 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.716667 - value: -0.1586653 - inSlope: 0.05361039 - outSlope: 0.05361039 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 21.35 - value: -0.120865285 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 + time: 19 value: -0.15606529 inSlope: 0 outSlope: 0 @@ -5109,7 +5317,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 + time: 20 value: -0.15606529 inSlope: 0 outSlope: 0 @@ -5118,7 +5326,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 21 value: -0.5267653 inSlope: 0 outSlope: 0 @@ -5258,14 +5466,14 @@ AnimationClip: - serializedVersion: 3 time: 16.216667 value: 43.208 - inSlope: -1.2827563 - outSlope: -1.2827563 + inSlope: -1.1534861 + outSlope: -1.1534861 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: 29.629 inSlope: 0 outSlope: 0 @@ -5274,34 +5482,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 - value: 43.828 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 19.433332 - value: 43.208 - inSlope: -1.2827557 - outSlope: -1.2827557 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 20.716667 - value: 29.629 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 + time: 19 value: 43.828 inSlope: 9.7370825 outSlope: 9.7370825 @@ -5310,7 +5491,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 23 + time: 20 value: 51.862 inSlope: 0 outSlope: 0 @@ -5319,7 +5500,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 25 + time: 21 value: 51.862 inSlope: 0 outSlope: 0 @@ -5466,7 +5647,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: 90 inSlope: 0 outSlope: 0 @@ -5475,7 +5656,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 + time: 19 value: 90 inSlope: 0 outSlope: 0 @@ -5484,7 +5665,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 19.433332 + time: 20 value: 90 inSlope: 0 outSlope: 0 @@ -5493,34 +5674,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.716667 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 23 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 25 + time: 21 value: 62.156 inSlope: 0 outSlope: 0 @@ -5667,7 +5821,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 17.5 + time: 17.716667 value: 90 inSlope: 0 outSlope: 0 @@ -5676,7 +5830,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 18.783333 + time: 19 value: 90 inSlope: 0 outSlope: 0 @@ -5685,7 +5839,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 19.433332 + time: 20 value: 90 inSlope: 0 outSlope: 0 @@ -5694,34 +5848,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 20.716667 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 22 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 23 - value: 90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 25 + time: 21 value: 90 inSlope: 0 outSlope: 0 @@ -5853,7 +5980,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 1 inSlope: 0 outSlope: 0 @@ -5940,7 +6067,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: -0.00255 inSlope: 0 outSlope: 0 @@ -5997,7 +6124,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 0.00023 inSlope: 0 outSlope: 0 @@ -6054,7 +6181,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 0.00259 inSlope: 0 outSlope: 0 @@ -6120,7 +6247,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 2 inSlope: 0 outSlope: 0 @@ -6186,7 +6313,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 2 inSlope: 0 outSlope: 0 @@ -6252,7 +6379,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 22 + time: 19 value: 1.5 inSlope: 0 outSlope: 0 @@ -6701,6 +6828,116 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 +--- !u!114 &-4947500475265522958 +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: -8058474261416697963} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 22 + m_ClipIn: 0 + m_Asset: {fileID: -3204325399910750087} + m_Duration: 1.0166666666666657 + m_TimeScale: 2.5 + m_ParentTrack: {fileID: -4947500475265522958} + 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: 22 + m_DisplayName: Take 001 + 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 &-4813085301129353564 MonoBehaviour: m_ObjectHideFlags: 1 @@ -8230,6 +8467,28 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 +--- !u!114 &-3204325399910750087 +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: 1827226128182048838, guid: 179bcaabaf459e040b44d716ac1c8160, type: 3} + 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 &-3133681269842147399 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index f17c656..8b97b3b 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -14325,7 +14325,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -14895,6 +14895,8 @@ PlayableDirector: value: {fileID: 1308918986} - key: {fileID: -2703544339307601112, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} value: {fileID: 1152043225} + - key: {fileID: -4947500475265522958, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} + value: {fileID: 1515605968} m_ExposedReferences: m_References: - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863} @@ -23051,6 +23053,131 @@ Transform: - {fileID: 946627456} m_Father: {fileID: 907206932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1515605965 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1409546836574083339} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalScale.x + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalScale.y + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalScale.z + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.1179993 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9042003 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalPosition.z + value: 4.575 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalRotation.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 359.7529 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + propertyPath: m_Name + value: cashixiguan + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1515605968} + m_SourcePrefab: {fileID: 100100000, guid: 179bcaabaf459e040b44d716ac1c8160, type: 3} +--- !u!1 &1515605966 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + m_PrefabInstance: {fileID: 1515605965} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1515605967 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 179bcaabaf459e040b44d716ac1c8160, + type: 3} + m_PrefabInstance: {fileID: 1515605965} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1515605968 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515605966} + 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 &1519533097 GameObject: m_ObjectHideFlags: 0 @@ -35314,6 +35441,7 @@ Transform: m_Children: - {fileID: 485346365682168043} - {fileID: 276637868620739945} + - {fileID: 1515605967} m_Father: {fileID: 985674199115698890} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1409546836574083340 diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index a326384..d53d3de 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -230,6 +230,10 @@ namespace ZXK.LouDiXvMuNiu InitFirstState(); if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL)) { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 2.47f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); + _TQFQTran.Find("SM_Niu_CaShi_an01").gameObject.SetActive(true); } else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CSPLCL)) @@ -360,14 +364,16 @@ namespace ZXK.LouDiXvMuNiu } if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) {//ѵģʽ£ƷչʾʱʾƷ + SetTimeLineCtrl(curObj, previousObj, _CPTimeLineClip, 0); if (curObj.ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo) { foreach (Transform item in toolTemp) { item.gameObject.SetActive(false); } + GameObject geoTemp = UtilitiesMng.GetGeoByName(_toolContain, "baodingjiaJH", true); + geoTemp.SetActive(true); } - SetTimeLineCtrl(curObj, previousObj, _CPTimeLineClip, 0); } else { diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index d62b533..0623807 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -225,6 +225,18 @@ namespace ZXK.LouDiXvMuNiu { if (obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName) {//ǰֲͬ + + List tempData = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType]; + int prepareGeoID = 0; + for (int i = 0; i < tempData.Count; i++) + { + if (tempData[i].ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo) + { + prepareGeoID = tempData[i].id; + } + } + _nextBtn.gameObject.SetActive(obj.id <= prepareGeoID); + NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue); } UodateCameraTRID(obj); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index c3a434d..4069d40 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 59131 + controlID: 6278 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 470 + y: 340 width: 907 - height: 521 + height: 651 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -105,22 +105,22 @@ MonoBehaviour: x: 0 y: 21 width: 907 - height: 500 - m_Scale: {x: 0.46296296, y: 0.46296296} - m_Translation: {x: 453.5, y: 250} + height: 630 + m_Scale: {x: 0.47239584, y: 0.47239584} + m_Translation: {x: 453.5, y: 315} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -979.56 - y: -540 - width: 1959.12 - height: 1080 + x: -960 + y: -666.81366 + width: 1920 + height: 1333.6273 m_MinimalGUI: 1 - m_defaultScale: 0.46296296 - m_LastWindowPixelSize: {x: 907, y: 521} + m_defaultScale: 0.47239584 + m_LastWindowPixelSize: {x: 907, y: 651} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -140,7 +140,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 59132 + controlID: 6279 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,7 +161,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: TimelineWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -169,14 +169,15 @@ MonoBehaviour: x: 0 y: 0 width: 908 - height: 397 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 5} + height: 267 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 7} m_Panes: - {fileID: 5} - {fileID: 6} - m_Selected: 0 + - {fileID: 7} + m_Selected: 2 m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: @@ -202,7 +203,7 @@ MonoBehaviour: x: 0 y: 73 width: 907 - height: 376 + height: 246 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -639,9 +640,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.6948256, y: -2.8033533, z: 2.058277} + m_Target: {x: 1.6347224, y: -2.5084803, z: 0.68781173} speed: 2 - m_Value: {x: 1.6948256, y: -2.8033533, z: 2.058277} + m_Value: {x: 1.6347224, y: -2.5084803, z: 0.68781173} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +688,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.23303734, y: -0.048698734, z: 0.011685226, w: 0.9711804} + m_Target: {x: 0.26167488, y: 0.25117496, z: -0.07073281, w: 0.929214} speed: 2 - m_Value: {x: 0.23307067, y: -0.045784846, z: 0.01098603, w: 0.97131926} + m_Value: {x: 0.2616743, y: 0.25117442, z: -0.07073266, w: 0.92921203} m_Size: - m_Target: 1.2549326 + m_Target: 0.14483654 speed: 2 - m_Value: 1.3140656 + m_Value: 0.14483654 m_Ortho: m_Target: 0 speed: 2 @@ -711,8 +712,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.07372163, y: -0.3706749, z: 0.029530907, w: 0.9253626} - m_LastSceneViewOrtho: 1 + m_LastSceneViewRotation: {x: 0.1868545, y: 0.5160025, z: -0.116471924, w: 0.8278125} + m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 @@ -792,33 +793,6 @@ MonoBehaviour: m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 397 - width: 908 - height: 542 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 2} - - {fileID: 8} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -840,9 +814,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 464 + y: 73 width: 907 - height: 527 + height: 246 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -860,8 +834,34 @@ MonoBehaviour: m_IsLocked: 0 m_SequenceHierarchy: {fileID: 0} m_SequencePath: - m_SelectionRoot: 0 + m_SelectionRoot: 204774 m_SubElements: [] +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 267 + width: 908 + height: 672 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -879,7 +879,7 @@ MonoBehaviour: serializedVersion: 2 x: 908 y: 0 - width: 431 + width: 279 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -911,7 +911,7 @@ MonoBehaviour: serializedVersion: 2 x: 908 y: 73 - width: 429 + width: 277 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec8f0a00 - m_LastClickedID: 692204 - m_ExpandedIDs: 5ca0e7ffa2a5e7ffcccbe7ffd0cbe7ff94cce7ff3aebe7fffaebe7ff1efce7ff4421e8ff4821e8ff0c22e8ffac3de8ffb03de8ff6c3ee8ffda4fe8ff9e54e8ff4aa3e8ff26a7e8ff1ecae8ffe40ee9fffe5ce9ffa29fe9ff0cb1e9ff08e4e9ff1eece9ff3609eaff2286eaff2886eaff6088eaff2a14ebffa058ebff6cf9ebffd246edffe463edff4836eeffdc79eeff7ac5eeff8a50efff9895efff5c27f0ff1e75f0ff90bdf0ff7401f1ff304af1ffc688f1ffacc7f1ffbecef1ffe000f2ffe400f2fff401f2ff9619f2ff5e1ef2ff3a7bf2ff12c4f2ff9ee3f2ff5ae4f2ffe41bf3ff0843f4ff0085f4ff10cbf4ff8a5af5ffaae9f5ff623bf6ff283cf6ff5285f6ff5a85f6ff7686f6ff60b8f6ffe0cdf6ff2e0ef7ff6857f7ffc4e3f7ff80e4f7ff6ce9f7ff7651f9ff309af9ffbaa0f9ffb2fdf9ffe096faff702ffbff46bdfbff48bdfbff1ecdfbff22cdfbff1ecefbff22cefbff2acefbff2ecefbffe4d2fbffe8d2fbff7cf0fbff7af1fbff8037fcff043efcff9a7afcff0ac8fcff8823fdff2ed8feff2efbffffba260100de2c01006e2e010050310100f23101003aae010096ae0100f6b20100940b02006e380200ca380200263d02006a5002006e5002008c510200e8510200ac5402004456020066ac020086b2020014b40200e8b60200f0d902004cda020010dd0200a8de0200b6a4030050a50300d0a503002eaa0300ecab0300f2ab030054b0030048b303004ae8030000e9030080e90300deed0300e2ed030078fc030064fe03001aff03009aff0300d002040082030400f0030400f8030400fc030400f42a04002a2c04004c320400ae3604004e37040000b304005eb70400d4db040014e0040036e6040098ea040038eb0400f8f40400aef504002ef6040050fc0400b2000500520105007c7b0500327c0500b27c0500108105003087050044bb05001cbd0500d4bf050052c2050032c40500f6c50500f0ca05007aea050032ed050090f1050042ff05001a010600d20306005006060030080600f4090600500e0600ee0e0600161a0600941c06003820060094240600322506001c5d06009a5f06003e6306009a67060038680600bcb3060074b60600d2ba06000acd06002cd3060088d7060026d806001af9060050fa0600aefe06000c6a07002e700700ba7107008a740700287507007606080074070800640b080054a4080076aa0800d2ae080070af080020bb080042c108009ec508003cc6080020c90800ace40800cce70800b4eb08002aec0800eeed08004af20800e8f2080072280900ca2b09000030090084300900c04209004e490900aa4d0900484e0900d69e0900d6a1090064a50900c0a909005eaa0900a4b20900fcb5090032ba0900b6ba09008abc0900e6c00900c20c0a00360e0a00a20e0a008e110a00c4150a0048160a00b2230a007e280a00b42c0a00382d0a0052840a00f28a0a007e8c0a004e8f0a00 + m_SelectedIDs: 34750000 + m_LastClickedID: 0 + m_ExpandedIDs: 14edf7ff1a3cf8ff84cef8ffc016f9ffeeaef9ff4050faffa6a2faff8411fbff6457fbff3060fbffee73fcffaa07fdff4e1cfdffe054fdff0a56fdffd092fdfffe3efeff2647fefff258ffff62a2ffff2efbffffdee60000b4ea00009aed0000faf100009af2000082fe00003e050100cc0601009e090100245c010000610100d6a20100e0ed01009cf401002cf50100fcf801009cf90100c63402008a3b02001a3c0200ea3f02008a400200a27a020066810200f6810200c685020066860200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -967,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1339 + x: 1187 y: 0 - width: 122 + width: 286 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -999,9 +999,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1339 + x: 1187 y: 73 - width: 120 + width: 284 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/_Scenes + - Assets/StreamingAssets/Excel m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1040,7 +1040,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: ffffffff00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000022750000247500002675000028750000c4770000ce770000e4770000ee7700009cc001009ec00100006302000263020004630200 + m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000e67700000c780000a28501007c8a01007e8a0100808a0100828a0100b48a0100eeff0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1065,10 +1065,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec8f0a00 - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000022750000247500002675000028750000c4770000ce770000e4770000ee7700009cc001009ec00100006302000263020004630200 + scrollPos: {x: 0, y: 660} + m_SelectedIDs: 34750000 + m_LastClickedID: 30004 + m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000e67700000c780000a28501007c8a01007e8a0100808a0100828a0100b48a0100eeff0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1093,8 +1093,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: ec8f0a00 - m_LastClickedInstanceID: 692204 + m_SelectedInstanceIDs: 34750000 + m_LastClickedInstanceID: 30004 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1139,12 +1139,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1461 + x: 1473 y: 0 - width: 459 + width: 447 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -1171,9 +1171,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1461 + x: 1473 y: 73 - width: 458 + width: 446 height: 918 m_SerializedDataModeController: m_DataMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 8f53638..5f2c581 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 51 + controlID: 59564 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 963 + width: 908 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 20 + controlID: 59510 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,8 +164,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 963 - height: 461 + width: 908 + height: 407 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -190,9 +190,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 461 - width: 963 - height: 478 + y: 407 + width: 908 + height: 532 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -216,9 +216,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 963 + x: 908 y: 0 - width: 357 + width: 385 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -242,9 +242,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1320 + x: 1293 y: 0 - width: 226 + width: 306 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -268,9 +268,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1546 + x: 1599 y: 0 - width: 374 + width: 321 height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -301,9 +301,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 534 - width: 962 - height: 457 + y: 480 + width: 907 + height: 511 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -356,23 +356,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 962 - height: 436 - m_Scale: {x: 0.4037037, y: 0.4037037} - m_Translation: {x: 481, y: 218} + width: 907 + height: 490 + m_Scale: {x: 0.4537037, y: 0.4537037} + m_Translation: {x: 453.5, y: 245} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1191.4679 + x: -999.551 y: -540 - width: 2382.9358 + width: 1999.102 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.4037037 - m_LastWindowPixelSize: {x: 962, y: 457} + m_defaultScale: 0.4537037 + m_LastWindowPixelSize: {x: 907, y: 511} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -401,8 +401,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 962 - height: 440 + width: 907 + height: 386 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -839,9 +839,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.0323483, y: -3.1636772, z: 2.0469959} + m_Target: {x: 12.876998, y: -2.4685442, z: 39.417637} speed: 2 - m_Value: {x: 1.0323483, y: -3.1636772, z: 2.0469959} + m_Value: {x: 12.876998, y: -2.4685442, z: 39.417637} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -887,13 +887,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.288143, y: -0.13870426, z: 0.04222642, w: 0.9465569} + m_Target: {x: 0.1868545, y: 0.5160025, z: -0.116471924, w: 0.8278125} speed: 2 - m_Value: {x: -0.288143, y: 0.13870426, z: -0.042226423, w: -0.9465569} + m_Value: {x: 0.18685333, y: 0.51599926, z: -0.1164712, w: 0.82780737} m_Size: - m_Target: 2.8024457 + m_Target: 0.4353459 speed: 2 - m_Value: 2.8024457 + m_Value: 0.4353459 m_Ortho: m_Target: 0 speed: 2 @@ -1013,9 +1013,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 534 - width: 962 - height: 457 + y: 480 + width: 907 + height: 511 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1056,9 +1056,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 963 + x: 908 y: 73 - width: 355 + width: 383 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1073,23 +1073,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6e6f0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2efbffff + m_ExpandedIDs: b832e3ff7240e3ff3645e3ff0a96e3ff7cdae3ff2edfe3ffa221e4ffb666e4ffd06ee4ff46b0e4ff7ae8e4ff18e9e4ff16fbe4ff22fbe4ffe802e5ff1813e5ff082be5ff9290e5ff3ecde5ff8a70e6ff02d2e6ff76ebe6ffa217e7ff021ae7ff4c4ce7ff5ca0e7ffa2a5e7ffcccbe7ffd0cbe7ff94cce7ff3aebe7fffaebe7ff1efce7ff4421e8ff4821e8ff0c22e8ffac3de8ffb03de8ff6c3ee8ffda4fe8ff9e54e8ff4aa3e8ff26a7e8ff1ecae8ffe40ee9fffe5ce9ffa29fe9ff0cb1e9ff08e4e9ff1eece9ff3609eaff2286eaff2886eaff6088eaff2a14ebffa058ebff6cf9ebffd246edffe463edff4836eeffdc79eeff7ac5eeff8a50efff9895efff5c27f0ff1e75f0ff90bdf0ff7401f1ff304af1ffc688f1ffacc7f1ffbecef1ffe000f2ffe400f2fff401f2ff9619f2ff5e1ef2ff3a7bf2ff12c4f2ff9ee3f2ff5ae4f2ffe41bf3ff0843f4ff0085f4ff10cbf4ff8a5af5ffaae9f5ff623bf6ff283cf6ff5285f6ff5a85f6ff7686f6ff60b8f6ffe0cdf6ff2e0ef7ff6857f7ffc4e3f7ff80e4f7ff6ce9f7ff7651f9ff309af9ffbaa0f9ffb2fdf9ffe096faff702ffbff46bdfbff48bdfbff1ecdfbff22cdfbff1ecefbff22cefbff2acefbff2ecefbffe4d2fbffe8d2fbff7cf0fbff7af1fbff8037fcff043efcff9a7afcff0ac8fcff8823fdff2ed8feff2efbffffba260100de2c01006e2e010050310100f23101003aae010096ae0100f6b20100940b02006e380200ca380200263d02006a5002006e5002008c510200e8510200ac5402004456020066ac020086b2020014b40200e8b60200f0d902004cda020010dd0200a8de0200b6a4030050a50300d0a503002eaa0300ecab0300f2ab030054b0030048b303004ae8030000e9030080e90300deed0300e2ed030078fc030064fe03001aff03009aff0300d002040082030400f0030400f8030400fc030400f42a04002a2c04004c320400ae3604004e37040000b304005eb70400d4db040014e0040036e6040098ea040038eb0400f8f40400aef504002ef6040050fc0400b2000500520105007c7b0500327c0500b27c0500108105003087050044bb05001cbd0500d4bf050052c2050032c40500f6c50500f0ca05007aea050032ed050090f1050042ff05001a010600d20306005006060030080600f4090600500e0600ee0e0600161a0600941c06003820060094240600322506001c5d06009a5f06003e6306009a67060038680600bcb3060074b60600d2ba06000acd06002cd3060088d7060026d806001af9060050fa0600aefe06000c6a07002e700700ba7107008a740700287507007606080074070800640b080054a4080076aa0800d2ae080070af080020bb080042c108009ec508003cc6080020c90800ace40800cce70800b4eb08002aec0800eeed08004af20800e8f2080072280900ca2b09000030090084300900c04209004e490900aa4d0900484e0900d69e0900d6a1090064a50900c0a909005eaa0900a4b20900fcb5090032ba0900b6ba09008abc0900e6c00900c20c0a00360e0a00a20e0a008e110a00c4150a0048160a00b2230a007e280a00b42c0a00382d0a0052840a0016890a00f28a0a007e8c0a004e8f0a00ec8f0a00f0960a00fc9b0a00169d0a00829f0a003ca00a00c0a00a009ca20a00f8a60a0022e20a003ce30a003ae40a0052e70a0092e70a0066560b0084570b00669c0b00849d0b00a69d0b0032cb0b0050cc0b0072cc0b003ae20b0058e30b0000110c001e120c0040120c00 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Cylinder + m_OriginalName: Cylinder m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -1833580 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 9} m_SearchString: @@ -1120,9 +1120,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1320 + x: 1293 y: 73 - width: 224 + width: 304 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1145,7 +1145,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/StreamingAssets/Excel + - Assets/Render/SpecialMaterials/XiShou/PaoPao/sources m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1161,7 +1161,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: be940b00 m_LastClickedID: 758974 - m_ExpandedIDs: 00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a750000 + m_ExpandedIDs: ffffffff00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000022750000247500002675000028750000c4770000ce770000e4770000ee7700009cc001009ec00100006302000263020004630200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1186,24 +1186,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 72} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e75000020750000227500002475000026750000287500002a750000 + m_ExpandedIDs: ffffffff00000000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe740000007500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001c7500001e750000227500002475000026750000e2770000ee770000006302000263020004630200 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Home + m_OriginalName: Home m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 30652 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_SearchString: @@ -1266,9 +1266,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1546 + x: 1599 y: 73 - width: 373 + width: 320 height: 918 m_SerializedDataModeController: m_DataMode: 0