1
This commit is contained in:
Binary file not shown.
@@ -68,7 +68,7 @@ AnimatorStateMachine:
|
||||
m_Position: {x: 280, y: -50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -7534707240423970994}
|
||||
m_Position: {x: 284.11755, y: 70.252594, z: 0}
|
||||
m_Position: {x: 280, y: 100, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
|
||||
@@ -83,7 +83,7 @@ AnimatorStateMachine:
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -8625825380608351088}
|
||||
m_Position: {x: 260, y: 60, z: 0}
|
||||
m_Position: {x: 330, y: 50, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 7852823638291951170}
|
||||
m_Position: {x: 300, y: 160, z: 0}
|
||||
|
||||
@@ -313,6 +313,12 @@ MonoBehaviour:
|
||||
fixPos3D: 0
|
||||
voxelSize: {x: 1, y: 1, z: 1}
|
||||
passedFilter: 0
|
||||
--- !u!1 &67125806 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2611516488426571569, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 386026518160299567}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &68834416
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -15818,11 +15824,21 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1182538979}
|
||||
m_Modifications:
|
||||
- target: {fileID: 519834376591409561, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 844003330440009666, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_ProbeAnchor
|
||||
value:
|
||||
objectReference: {fileID: 543450653188518151}
|
||||
- target: {fileID: 1214591323983948673, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1997430245209971286, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@@ -15903,11 +15919,36 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7504274785365530900, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.476
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7504274785365530900, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 3.2319999
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8304914913776413196, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_ProbeAnchor
|
||||
value:
|
||||
objectReference: {fileID: 543450653188518151}
|
||||
- target: {fileID: 8971419746952560049, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 4.417
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8971419746952560049, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 2.734
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9022163902034346732, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||
type: 3}
|
||||
propertyPath: animatorDaoJiuzhu
|
||||
value:
|
||||
objectReference: {fileID: 67125806}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@@ -5,8 +5,9 @@ using UnityEngine;
|
||||
public class SingleTouchPlayAnimator : MonoBehaviour
|
||||
{
|
||||
public GameObject animatorDaoJiu;
|
||||
public GameObject animatorDaoJiuzhu;
|
||||
Animator animator;
|
||||
|
||||
Animator animatorpig;
|
||||
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
|
||||
bool isRun = false;
|
||||
float waitTime = 5f;
|
||||
@@ -16,6 +17,7 @@ public class SingleTouchPlayAnimator : MonoBehaviour
|
||||
void Start()
|
||||
{
|
||||
animator = GetComponent<Animator>();
|
||||
animatorpig= animatorDaoJiuzhu.GetComponent<Animator>();
|
||||
if (animatorDaoJiu != null)
|
||||
{
|
||||
animatorDaoJiu.SetActive(false);
|
||||
@@ -44,6 +46,7 @@ public class SingleTouchPlayAnimator : MonoBehaviour
|
||||
if (other.gameObject.name == "PalmBox_L" || other.gameObject.name == "PalmBox_R")
|
||||
{
|
||||
animator.Play("Touch");
|
||||
animatorpig.Play("Touch");
|
||||
}
|
||||
|
||||
if (animatorDaoJiu != null)
|
||||
|
||||
@@ -2993,7 +2993,7 @@ MonoBehaviour:
|
||||
m_Version: 3
|
||||
m_AnimClip: {fileID: 0}
|
||||
m_Locked: 0
|
||||
m_Muted: 1
|
||||
m_Muted: 0
|
||||
m_CustomPlayableFullTypename:
|
||||
m_Curves: {fileID: 0}
|
||||
m_Parent: {fileID: 11400000}
|
||||
@@ -3009,7 +3009,7 @@ MonoBehaviour:
|
||||
m_EaseInDuration: 0
|
||||
m_EaseOutDuration: 0
|
||||
m_BlendInDuration: -1
|
||||
m_BlendOutDuration: 0
|
||||
m_BlendOutDuration: -1
|
||||
m_MixInCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
@@ -3051,7 +3051,7 @@ MonoBehaviour:
|
||||
m_PreExtrapolationTime: 0
|
||||
m_DisplayName: zr_3_huxi
|
||||
- m_Version: 1
|
||||
m_Start: 3.399999999999995
|
||||
m_Start: 3.4
|
||||
m_ClipIn: 0
|
||||
m_Asset: {fileID: -6641255368763986848}
|
||||
m_Duration: 31
|
||||
@@ -3059,7 +3059,7 @@ MonoBehaviour:
|
||||
m_ParentTrack: {fileID: -5096577713653672605}
|
||||
m_EaseInDuration: 0
|
||||
m_EaseOutDuration: 0
|
||||
m_BlendInDuration: 0
|
||||
m_BlendInDuration: -1
|
||||
m_BlendOutDuration: -1
|
||||
m_MixInCurve:
|
||||
serializedVersion: 2
|
||||
@@ -3069,25 +3069,7 @@ MonoBehaviour:
|
||||
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_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
@@ -4896,7 +4878,7 @@ MonoBehaviour:
|
||||
m_Version: 3
|
||||
m_AnimClip: {fileID: 0}
|
||||
m_Locked: 0
|
||||
m_Muted: 1
|
||||
m_Muted: 0
|
||||
m_CustomPlayableFullTypename:
|
||||
m_Curves: {fileID: 0}
|
||||
m_Parent: {fileID: 11400000}
|
||||
@@ -7019,7 +7001,7 @@ MonoBehaviour:
|
||||
m_Version: 3
|
||||
m_AnimClip: {fileID: 0}
|
||||
m_Locked: 0
|
||||
m_Muted: 1
|
||||
m_Muted: 0
|
||||
m_CustomPlayableFullTypename:
|
||||
m_Curves: {fileID: 0}
|
||||
m_Parent: {fileID: 11400000}
|
||||
@@ -13670,7 +13652,7 @@ MonoBehaviour:
|
||||
m_Version: 3
|
||||
m_AnimClip: {fileID: 0}
|
||||
m_Locked: 0
|
||||
m_Muted: 1
|
||||
m_Muted: 0
|
||||
m_CustomPlayableFullTypename:
|
||||
m_Curves: {fileID: 0}
|
||||
m_Parent: {fileID: 11400000}
|
||||
@@ -13740,25 +13722,7 @@ MonoBehaviour:
|
||||
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_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
|
||||
@@ -304,6 +304,8 @@ PlayableDirector:
|
||||
value: {fileID: 8849653153911270068}
|
||||
- key: {fileID: 5441829241084109018, guid: 2d38a9030cee9e24189f254e853ac26c, type: 2}
|
||||
value: {fileID: 8124711569227362538}
|
||||
- key: {fileID: -3323040264835945538, guid: 2d38a9030cee9e24189f254e853ac26c, type: 2}
|
||||
value: {fileID: 0}
|
||||
m_ExposedReferences:
|
||||
m_References: []
|
||||
--- !u!1 &3553537622265031815
|
||||
|
||||
@@ -141,6 +141,8 @@ PlayerSettings:
|
||||
bundleVersion: 1.0
|
||||
preloadedAssets:
|
||||
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
||||
- {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2}
|
||||
- {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
||||
Reference in New Issue
Block a user