mirror of
https://github.com/Mukheem/TwinTurbine.git
synced 2025-05-07 13:30:34 +02:00
Fixed avatar spawn and animation
This commit is contained in:
parent
9268d2e6b0
commit
531be1b0eb
Assets/SharedSpatialAnchors
@ -0,0 +1,72 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!91 &9100000
|
||||||
|
AnimatorController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: TalkingAvatar
|
||||||
|
serializedVersion: 5
|
||||||
|
m_AnimatorParameters: []
|
||||||
|
m_AnimatorLayers:
|
||||||
|
- serializedVersion: 5
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_StateMachine: {fileID: 2302322318099120788}
|
||||||
|
m_Mask: {fileID: 0}
|
||||||
|
m_Motions: []
|
||||||
|
m_Behaviours: []
|
||||||
|
m_BlendingMode: 0
|
||||||
|
m_SyncedLayerIndex: -1
|
||||||
|
m_DefaultWeight: 0
|
||||||
|
m_IKPass: 0
|
||||||
|
m_SyncedLayerAffectsTiming: 0
|
||||||
|
m_Controller: {fileID: 9100000}
|
||||||
|
--- !u!1107 &2302322318099120788
|
||||||
|
AnimatorStateMachine:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_ChildStates:
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 8964048799714054855}
|
||||||
|
m_Position: {x: 200, y: 0, z: 0}
|
||||||
|
m_ChildStateMachines: []
|
||||||
|
m_AnyStateTransitions: []
|
||||||
|
m_EntryTransitions: []
|
||||||
|
m_StateMachineTransitions: {}
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||||
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||||
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||||
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
|
m_DefaultState: {fileID: 8964048799714054855}
|
||||||
|
--- !u!1102 &8964048799714054855
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Talking
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: -203655887218126122, guid: e22e44a460ec9422895f60af131a2b34, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: de321237b23bb304fb94c8c5dcecdf35
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 9100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -942,6 +942,10 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2316982808971492402}
|
- component: {fileID: 2316982808971492402}
|
||||||
- component: {fileID: 8559019908004013640}
|
- component: {fileID: 8559019908004013640}
|
||||||
|
- component: {fileID: 2339184958253340532}
|
||||||
|
- component: {fileID: 3196596099490932396}
|
||||||
|
- component: {fileID: 4067417591161320129}
|
||||||
|
- component: {fileID: 3569971862085791352}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: TalkingAvatar
|
m_Name: TalkingAvatar
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -956,7 +960,7 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 3128949758138181256}
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||||
m_LocalPosition: {x: 1.42, y: 0, z: 0}
|
m_LocalPosition: {x: 1.42, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
@ -965,7 +969,7 @@ Transform:
|
|||||||
- {fileID: 7815928270693653670}
|
- {fileID: 7815928270693653670}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||||
--- !u!95 &8559019908004013640
|
--- !u!95 &8559019908004013640
|
||||||
Animator:
|
Animator:
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
@ -976,8 +980,8 @@ Animator:
|
|||||||
m_GameObject: {fileID: 3128949758138181256}
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_Avatar: {fileID: 9000000, guid: e22e44a460ec9422895f60af131a2b34, type: 3}
|
m_Avatar: {fileID: 9000000, guid: e22e44a460ec9422895f60af131a2b34, type: 3}
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 9100000, guid: de321237b23bb304fb94c8c5dcecdf35, type: 2}
|
||||||
m_CullingMode: 1
|
m_CullingMode: 0
|
||||||
m_UpdateMode: 0
|
m_UpdateMode: 0
|
||||||
m_ApplyRootMotion: 0
|
m_ApplyRootMotion: 0
|
||||||
m_LinearVelocityBlending: 0
|
m_LinearVelocityBlending: 0
|
||||||
@ -987,6 +991,78 @@ Animator:
|
|||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorStateOnDisable: 0
|
m_KeepAnimatorStateOnDisable: 0
|
||||||
m_WriteDefaultValuesOnDisable: 0
|
m_WriteDefaultValuesOnDisable: 0
|
||||||
|
--- !u!114 &2339184958253340532
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
ObservedComponentsFoldoutOpen: 1
|
||||||
|
Group: 0
|
||||||
|
prefixField: -1
|
||||||
|
Synchronization: 3
|
||||||
|
OwnershipTransfer: 0
|
||||||
|
observableSearch: 2
|
||||||
|
ObservedComponents:
|
||||||
|
- {fileID: 3196596099490932396}
|
||||||
|
- {fileID: 3569971862085791352}
|
||||||
|
sceneViewId: 0
|
||||||
|
InstantiationId: 0
|
||||||
|
isRuntimeInstantiated: 0
|
||||||
|
--- !u!114 &3196596099490932396
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SynchronizePosition: 1
|
||||||
|
m_SynchronizeRotation: 1
|
||||||
|
m_SynchronizeScale: 1
|
||||||
|
m_UseLocal: 1
|
||||||
|
--- !u!54 &4067417591161320129
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 0
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!114 &3569971862085791352
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3128949758138181256}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 64179f3720bbfe947b7724caa67b7c1d, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SynchronizeVelocity: 1
|
||||||
|
m_SynchronizeAngularVelocity: 1
|
||||||
|
m_TeleportEnabled: 1
|
||||||
|
m_TeleportIfDistanceGreaterThan: 3
|
||||||
--- !u!1 &3489539847802727250
|
--- !u!1 &3489539847802727250
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -497,6 +497,8 @@ PrefabInstance:
|
|||||||
m_RemovedComponents:
|
m_RemovedComponents:
|
||||||
- {fileID: -6453332735135581912, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
- {fileID: -6453332735135581912, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
||||||
- {fileID: -8231463906739603765, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
- {fileID: -8231463906739603765, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
||||||
|
- {fileID: -1201471494275974383, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
||||||
|
- {fileID: 2070753283667298535, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 8754aa5f3d45cec4980f02029a881f7d, type: 3}
|
||||||
--- !u!4 &4270609215839807869 stripped
|
--- !u!4 &4270609215839807869 stripped
|
||||||
Transform:
|
Transform:
|
||||||
|
@ -2758,6 +2758,10 @@ PrefabInstance:
|
|||||||
propertyPath: TwinTurbine_windTurbine
|
propertyPath: TwinTurbine_windTurbine
|
||||||
value:
|
value:
|
||||||
objectReference: {fileID: 382264866490105690, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3}
|
objectReference: {fileID: 382264866490105690, guid: a4966b3be785a2e4aaf3eb0c3ec8db1f, type: 3}
|
||||||
|
- target: {fileID: 1161621203827536544, guid: bac340b17ae71864ab3a424b042a3ce7, type: 3}
|
||||||
|
propertyPath: TwinTurbine_talkingAvatar
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 3128949758138181256, guid: 07763ca13338457409391f700224d64b, type: 3}
|
||||||
- target: {fileID: 1161621203827536544, guid: bac340b17ae71864ab3a424b042a3ce7, type: 3}
|
- target: {fileID: 1161621203827536544, guid: bac340b17ae71864ab3a424b042a3ce7, type: 3}
|
||||||
propertyPath: TwinTurbine_voltageMenuItem
|
propertyPath: TwinTurbine_voltageMenuItem
|
||||||
value:
|
value:
|
||||||
|
@ -382,9 +382,9 @@ public class SharedAnchorControlPanel : MonoBehaviour
|
|||||||
var networkedGUI = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f,1f, 2f), Quaternion.identity);
|
var networkedGUI = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_menuItem.name, new Vector3(-1f,1f, 2f), Quaternion.identity);
|
||||||
var photonGrabbableGui = networkedGUI.GetComponent<PhotonGrabbableObject>();
|
var photonGrabbableGui = networkedGUI.GetComponent<PhotonGrabbableObject>();
|
||||||
|
|
||||||
photonGrabbableGui.TransferOwnershipToLocalPlayer();
|
//photonGrabbableGui.TransferOwnershipToLocalPlayer();
|
||||||
|
|
||||||
var networkedAvatar = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_talkingAvatar.name, new Vector3(1f, 0f, 2f), Quaternion.identity);
|
var networkedAvatar = PhotonPun.PhotonNetwork.Instantiate(TwinTurbine_talkingAvatar.name, new Vector3(1f, -0.2f, 1.15f), Quaternion.identity);
|
||||||
var photonGrabbableAvatar = networkedAvatar.GetComponent<PhotonGrabbableObject>();
|
var photonGrabbableAvatar = networkedAvatar.GetComponent<PhotonGrabbableObject>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user