Commit ffa1abd5 authored by 杨泽宇's avatar 杨泽宇

更新

parent 6438e39b
......@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 690929a59dc7a42da9030305190d391f, type: 3}
m_Name: XRDeviceSimulatorSettings
m_EditorClassIdentifier:
m_AutomaticallyInstantiateSimulatorPrefab: 1
m_SimulatorPrefab: {fileID: 6598815579406187037, guid: 18ddb545287c546e19cc77dc9fbb2189, type: 3}
m_AutomaticallyInstantiateSimulatorPrefab: 0
m_SimulatorPrefab: {fileID: 0}
This diff is collapsed.
fileFormatVersion: 2
guid: e7dcb58e96f4ce445a0665bf3f179f40
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 51d26d405a533fa42bac3993081323ef
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: f6ec9e9cc93e2f04ab9667727658a51c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 556ce574db2d80a4e86a796b21f4fa8e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -63,6 +63,16 @@ public class GameSystem : SingletonBase<GameSystem>
}
}
/// <summary>
/// 游戏通关
/// </summary>
public void GameBeat()
{
isPauseGame = true;
}
// 开始倒计时
public void StartGame()
{
......@@ -112,6 +122,10 @@ public class GameSystem : SingletonBase<GameSystem>
StartCoroutine(PauseGameCoroutine());
}
/// <summary>
/// 暂停时间
/// </summary>
/// <param name="context"></param>
public void PauseGame(InputAction.CallbackContext context)
{
if (isPauseGame)
......
......@@ -9,10 +9,6 @@ using UnityEngine.XR.Interaction.Toolkit;
/// </summary>
public class OperationManager : MonoBehaviour
{
[SerializeField]
[Tooltip("惯用手是否是右手(默认右手为惯用手)")]
private bool IsRight=true;
[SerializeField]
private XRControllerManager LeftHandManager;
......@@ -26,7 +22,28 @@ public class OperationManager : MonoBehaviour
private ActionBasedContinuousTurnProvider smoothTurnProvider;
[Tooltip("惯用手")]
private XRControllerManager Handedness;
public XRControllerManager Handedness;
[Tooltip("是否使用平滑旋转")]
private bool IsSmoothTurnEnabled;
[Tooltip("是否使用平滑移动")]
private bool IsSmoothMotionEnabled;
[Tooltip("惯用手是否是右手(默认右手为惯用手)")]
private bool IsRight ;
/// <summary>
/// 设置手柄控制
/// </summary>
public void SetHandleControl()
{
IsRight = SettingsManager.SettingsHand();
IsSmoothTurnEnabled = SettingsManager.SettingTurn();
IsSmoothMotionEnabled = SettingsManager.SettingMove();
SetHandedness(IsRight);
SetTurnStyle(IsSmoothTurnEnabled);
SetMoveScheme(IsSmoothMotionEnabled);
}
/// <summary>
/// 设置惯用手
......@@ -35,16 +52,29 @@ public class OperationManager : MonoBehaviour
{
Handedness = RightHand ? RightHandManager : LeftHandManager;
Handedness.SetHandedness();
IsRight = RightHand;
SettingsManager.SaveHand(IsRight);
}
/// <summary>
/// 设置旋转方式
/// </summary>
/// <param name="SmoothTurnEnabled"></param>
public void SetTurnStyle(bool SmoothTurnEnabled)
{
Handedness.smoothTurnEnabled = SmoothTurnEnabled;
IsSmoothTurnEnabled = SmoothTurnEnabled;
SettingsManager.SaveTurn(IsSmoothTurnEnabled);
}
/// <summary>
/// 设置移动方式
/// </summary>
/// <param name="SmoothMotionEnabled"></param>
public void SetMoveScheme(bool SmoothMotionEnabled)
{
Handedness.smoothMotionEnabled = SmoothMotionEnabled;
IsSmoothTurnEnabled = SmoothMotionEnabled;
SettingsManager.SaveMove(IsSmoothTurnEnabled);
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 把上一个场景的人物设置设置到下一个场景
/// </summary>
public class SettingsManager : MonoBehaviour
{
// 保存和加载设置的键
private const string IsRightHandedKey = "IsRightHanded";
private const string IsSmoothTurnEnabledKey = "IsSmoothTurnEnabled";
private const string IsSmoothMotionEnabledKey = "IsSmoothMotionEnabled";
public static bool SettingsHand()
{
return IsTure(IsRightHandedKey);
}
public static bool SettingTurn()
{
return IsTure(IsSmoothTurnEnabledKey);
}
public static bool SettingMove()
{
return IsTure(IsSmoothMotionEnabledKey);
}
// 保存设置到 PlayerPrefs
public static void SaveSettings(bool isRightHanded, bool isSmoothTurnEnabled, bool isSmoothMotionEnabled)
{
PlayerPrefs.SetInt(IsRightHandedKey, isRightHanded ? 1 : 0);
PlayerPrefs.SetInt(IsSmoothTurnEnabledKey, isSmoothTurnEnabled ? 1 : 0);
PlayerPrefs.SetInt(IsSmoothMotionEnabledKey, isSmoothMotionEnabled ? 1 : 0);
PlayerPrefs.Save();
}
public static void SaveHand(bool isRightHanded)
{
PlayerPrefs.SetInt(IsRightHandedKey, isRightHanded ? 1 : 0);
PlayerPrefs.Save();
}
public static void SaveTurn(bool isSmoothTurnEnabled)
{
PlayerPrefs.SetInt(IsSmoothTurnEnabledKey, isSmoothTurnEnabled ? 1 : 0);
PlayerPrefs.Save();
}
public static void SaveMove(bool isSmoothMotionEnabled)
{
PlayerPrefs.SetInt(IsSmoothMotionEnabledKey, isSmoothMotionEnabled ? 1 : 0);
PlayerPrefs.Save();
}
private static bool IsTure(string isTureName )
{
return PlayerPrefs.GetInt(isTureName, 1) == 1;
}
}
fileFormatVersion: 2
guid: 55b6b6828b4baec44aab9ce17247bd71
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -60,11 +60,14 @@ public class XRControllerManager : MonoBehaviour
private void Start()
{
DisableLocomotionActions();
//DisableLocomotionActions();
grabRayInteractor.selectEntered.AddListener(OnEnterGrab);
grabRayInteractor.selectExited.AddListener(OnExitGrab);
}
private void OnDestroy()
{
grabRayInteractor.selectEntered.RemoveListener(OnEnterGrab);
......@@ -132,7 +135,7 @@ public class XRControllerManager : MonoBehaviour
SetEnabled(TeleportModeCancelReference, !SmoothMotionEnabled);
}
private void DisableLocomotionActions()
public void DisableLocomotionActions()
{
DisableAction(turnReference);
DisableAction(SnapTurnReference);
......
fileFormatVersion: 2
guid: f762ff42fa301ab478af932a62089e33
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1fb067b5beb0b23458a1c77182110387
VideoClipImporter:
externalObjects: {}
serializedVersion: 2
frameRange: 0
startFrame: -1
endFrame: -1
colorSpace: 0
deinterlace: 0
encodeAlpha: 0
flipVertical: 0
flipHorizontal: 0
importAudio: 1
targetSettings: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -66,7 +66,7 @@ Material:
- _GlossMapScale: 0.715
- _Glossiness: 0.874
- _GlossyReflections: 1
- _Metallic: 0.889
- _Metallic: 0.944
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
......@@ -76,6 +76,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1}
- _Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
......@@ -28,8 +28,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4574490674631895538}
- {fileID: 8462340316789386621}
- {fileID: 4574490674631895538}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -40,21 +40,69 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5801259177700483968}
m_Modifications:
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.x
value: 0.005840596
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.y
value: -0.5042929
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.z
value: -0.22788334
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9995302
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.x
value: -0.018403066
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.y
value: -0.016262664
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.z
value: 0.018340888
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1694275472537445433, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.x
value: -0.194
value: 0.056999985
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.y
value: 1.436
value: 1.3729999
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.z
value: -1.213
value: -1.354
objectReference: {fileID: 0}
- target: {fileID: 2531817920521988976, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.w
......@@ -84,17 +132,101 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.x
value: 0.0086
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.y
value: -0.483
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.z
value: -0.24
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2726892120942521866, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4572582368877290084, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_Name
value: "\u9501"
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.x
value: 0.079
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4779189824251022905, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -7.238
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925980721809859921, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e0b7570e3677e4e44a268690c1250fe8, type: 3}
......@@ -112,15 +244,19 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2490722731679858080, guid: 07cafc6e2eef88d4fb79357b378dc2d1, type: 3}
propertyPath: m_LocalPosition.x
value: -0.218
value: -0.13
objectReference: {fileID: 0}
- target: {fileID: 2490722731679858080, guid: 07cafc6e2eef88d4fb79357b378dc2d1, type: 3}
propertyPath: m_LocalPosition.y
value: 1.65
objectReference: {fileID: 0}
- target: {fileID: 2490722731679858080, guid: 07cafc6e2eef88d4fb79357b378dc2d1, type: 3}
propertyPath: m_LocalPosition.z
value: -1.185
value: -1.18
objectReference: {fileID: 0}
- target: {fileID: 2723526085741968424, guid: 07cafc6e2eef88d4fb79357b378dc2d1, type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2723526085741968424, guid: 07cafc6e2eef88d4fb79357b378dc2d1, type: 3}
propertyPath: m_LocalScale.x
......
......@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 13.140865, y: -3.91, z: -18.187483}
value: {x: -10.26775, y: -3.74, z: 7.949201}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
value: {x: 13.14087, y: -0.67000055, z: -18.18748}
value: {x: -10.26775, y: -0.67, z: 7.949201}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -41,7 +41,35 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -57,6 +85,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -84,7 +119,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 13.140865
value: -10.26775
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -93,7 +128,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 13.14087
value: -10.26775
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -112,7 +147,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -3.91
value: -3.74
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -121,7 +156,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -0.67000055
value: -0.67
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -140,7 +175,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -18.187483
value: 7.949201
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -149,7 +184,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -18.18748
value: 7.949201
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -163,6 +198,34 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
......
......@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 13.14087, y: -0.67000055, z: -18.18748}
value: {x: -10.26775, y: -0.6700001, z: 7.949201}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
value: {x: 13.140865, y: -3.91, z: -18.187483}
value: {x: -10.26775, y: -3.74, z: 7.949201}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -41,7 +41,35 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -57,6 +85,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -84,7 +119,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 13.14087
value: -10.26775
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -93,7 +128,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 13.140865
value: -10.26775
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -112,7 +147,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.67000055
value: -0.6700001
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -121,7 +156,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -3.91
value: -3.74
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -140,7 +175,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -18.18748
value: 7.949201
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -149,7 +184,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -18.187483
value: 7.949201
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -163,6 +198,34 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
......
......@@ -41,7 +41,35 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -57,6 +85,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -163,6 +198,34 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
......
......@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 12.7308, y: -3.85, z: -18.18774}
value: {x: 13.14087, y: -3.76, z: -18.18748}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
value: {x: 12.7308, y: -0.67, z: -18.18774}
value: {x: 13.14087, y: -0.67, z: -18.18748}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -41,7 +41,35 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -57,6 +85,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -84,7 +119,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 12.7308
value: 13.14087
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -93,7 +128,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 12.7308
value: 13.14087
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -112,7 +147,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -3.85
value: -3.76
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -140,7 +175,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -18.18774
value: -18.18748
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -149,7 +184,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -18.18774
value: -18.18748
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -163,6 +198,34 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
......
......@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 12.7308, y: -0.6700001, z: -18.18774}
value: {x: 13.14087, y: -0.67000055, z: -18.18748}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
value: {x: 12.7308, y: -3.85, z: -18.187738}
value: {x: 13.14087, y: -3.76, z: -18.18748}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
......@@ -41,7 +41,35 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -57,6 +85,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 3305885265
script: {fileID: 0}
typeID: 82
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -84,7 +119,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 12.7308
value: 13.14087
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -93,7 +128,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 12.7308
value: 13.14087
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -112,7 +147,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.6700001
value: -0.67000055
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -121,7 +156,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -3.85
value: -3.76
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -140,7 +175,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -18.18774
value: -18.18748
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -149,7 +184,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -18.187738
value: -18.18748
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -163,6 +198,34 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2
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_Enabled
path:
classID: 82
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-7576252334556710802
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3734277818638773487
AnimatorState:
serializedVersion: 6
......@@ -85,10 +59,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -3734277818638773487}
m_Position: {x: 250, y: 140, z: 0}
m_Position: {x: 290, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -7576252334556710802}
m_Position: {x: 260, y: 30, z: 0}
m_State: {fileID: 9164738738953100869}
m_Position: {x: 270, y: 50, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......@@ -98,4 +72,30 @@ AnimatorStateMachine:
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: -7576252334556710802}
m_DefaultState: {fileID: 9164738738953100869}
--- !u!1102 &9164738738953100869
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment