diff --git a/Assets/Resources/Animations/Face Controller.controller b/Assets/Resources/Animations/Face Controller.controller index 7db4a1a..d90a48d 100644 --- a/Assets/Resources/Animations/Face Controller.controller +++ b/Assets/Resources/Animations/Face Controller.controller @@ -1,18 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-4072449279223152736 +--- !u!1101 &-8958175968040388146 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: IsLoop - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1046042063806159501} + m_DstState: {fileID: -669249569119985261} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -25,7 +22,133 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-1046042063806159501 +--- !u!1101 &-8413374641728975337 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1852960806115855217} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6751304010843963277 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: next + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1852960806115855217} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6094577992812725622 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_e + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7927037578270948742} + 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: 7400000, guid: 1ed7870865d17344faf4aaa14ec2bf03, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: animSpeed +--- !u!1102 &-5919795636781688472 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_s + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8958175968040388146} + 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: 7400000, guid: e87804bd4e9dfd340912754040005c7d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-5535793450531703588 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: next + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -669249569119985261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-4865121992700987810 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -36,7 +159,9 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -4072449279223152736} + - {fileID: 6545945057203326228} + - {fileID: -5535793450531703588} + - {fileID: -1936462703163530381} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -52,19 +177,16 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: animSpeed ---- !u!1101 &-971734861674072838 +--- !u!1101 &-4576748960832017223 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: IsLoop - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5228601998091799676} + m_DstState: {fileID: 8972157377309571960} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -77,6 +199,83 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3563160534198110594 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: next_s + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2299752178252451017} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1936462703163530381 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: next_s + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6094577992812725622} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.2 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-669249569119985261 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8968185575769013632} + 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: 7400000, guid: 3ea5c07300fddb0428f90a5f85f22ee5, type: 2} + m_Tag: + m_SpeedParameter: animSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -92,6 +291,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: next + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: next_s + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} - m_Name: IsLoop m_Type: 4 m_DefaultFloat: 0 @@ -123,62 +334,40 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1107 &1917244892325702502 -AnimatorStateMachine: - serializedVersion: 6 +--- !u!1101 &1849748066309416537 +AnimatorStateTransition: 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: -1046042063806159501} - m_Position: {x: 310, y: 130, 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: -1046042063806159501} ---- !u!1107 &3753690335887328880 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Ear Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 5228601998091799676} - m_Position: {x: 310, y: 160, 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: 5228601998091799676} ---- !u!1102 &5228601998091799676 + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1924499013513400557} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.4294904 + m_TransitionOffset: 0 + m_ExitTime: 0.77050966 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1852960806115855217 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: motion_1 + m_Name: motion_2 m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -971734861674072838} + - {fileID: 3463043077803869875} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -190,7 +379,246 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 3ea5c07300fddb0428f90a5f85f22ee5, type: 2} m_Tag: + m_SpeedParameter: animSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1917244892325702502 +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: -4865121992700987810} + m_Position: {x: 310, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6094577992812725622} + m_Position: {x: 310, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -669249569119985261} + m_Position: {x: 560, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5919795636781688472} + m_Position: {x: 560, y: 10, 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: -4865121992700987810} +--- !u!1102 &1924499013513400557 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_s + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8413374641728975337} + 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: 7400000, guid: e87804bd4e9dfd340912754040005c7d, type: 2} + m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &2299752178252451017 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_e + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1849748066309416537} + 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: 7400000, guid: 1ed7870865d17344faf4aaa14ec2bf03, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: animSpeed +--- !u!1101 &3463043077803869875 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsLoop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1852960806115855217} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &3753690335887328880 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ear Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8972157377309571960} + m_Position: {x: 270, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2299752178252451017} + m_Position: {x: 270, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1852960806115855217} + m_Position: {x: 520, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1924499013513400557} + m_Position: {x: 520, 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: 8972157377309571960} +--- !u!1101 &6545945057203326228 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4865121992700987810} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &7927037578270948742 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5919795636781688472} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.4294904 + m_TransitionOffset: 0 + m_ExitTime: 0.77050966 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8968185575769013632 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsLoop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -669249569119985261} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8972157377309571960 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: motion_1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4576748960832017223} + - {fileID: -6751304010843963277} + - {fileID: -3563160534198110594} + 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: 7400000, guid: ad7fc1d5eece1a946a437cd1bb81bf90, type: 2} + m_Tag: + m_SpeedParameter: animSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: animSpeed diff --git a/Assets/Resources/Animations/clip_1_ear.anim b/Assets/Resources/Animations/clip_1_ear.anim new file mode 100644 index 0000000..20ab180 --- /dev/null +++ b/Assets/Resources/Animations/clip_1_ear.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clip_1_ear + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/clip_1_ear.anim.meta b/Assets/Resources/Animations/clip_1_ear.anim.meta new file mode 100644 index 0000000..c50e401 --- /dev/null +++ b/Assets/Resources/Animations/clip_1_ear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5a6a1785f58a954eb727d33f955e2ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/clip_2_ear.anim b/Assets/Resources/Animations/clip_2_ear.anim new file mode 100644 index 0000000..6f69cb0 --- /dev/null +++ b/Assets/Resources/Animations/clip_2_ear.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clip_2_ear + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/clip_2_ear.anim.meta b/Assets/Resources/Animations/clip_2_ear.anim.meta new file mode 100644 index 0000000..99afa6a --- /dev/null +++ b/Assets/Resources/Animations/clip_2_ear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25d196474525e4d4cb78d6a9dceb41c3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/clip_e_ear.anim b/Assets/Resources/Animations/clip_e_ear.anim new file mode 100644 index 0000000..a6a5663 --- /dev/null +++ b/Assets/Resources/Animations/clip_e_ear.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clip_e_ear + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/clip_e_ear.anim.meta b/Assets/Resources/Animations/clip_e_ear.anim.meta new file mode 100644 index 0000000..cacb537 --- /dev/null +++ b/Assets/Resources/Animations/clip_e_ear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2fab42b8220c52942b2f939aa2ccc806 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/clip_s_ear.anim b/Assets/Resources/Animations/clip_s_ear.anim new file mode 100644 index 0000000..9dd6b7e --- /dev/null +++ b/Assets/Resources/Animations/clip_s_ear.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: clip_s_ear + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/clip_s_ear.anim.meta b/Assets/Resources/Animations/clip_s_ear.anim.meta new file mode 100644 index 0000000..d87bca4 --- /dev/null +++ b/Assets/Resources/Animations/clip_s_ear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68a88f2f1320ed549bfceadc3eb2f897 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Illustration2.png b/Assets/Resources/UI/Illustration2.png new file mode 100644 index 0000000..27c4ca8 Binary files /dev/null and b/Assets/Resources/UI/Illustration2.png differ diff --git a/Assets/Resources/UI/Illustration2.png.meta b/Assets/Resources/UI/Illustration2.png.meta new file mode 100644 index 0000000..41f3ff3 --- /dev/null +++ b/Assets/Resources/UI/Illustration2.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 31c09c7e5e37c29478b22be3658099fc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: Standalone + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index ccf61d1..c68cfb1 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -12667,8 +12667,8 @@ RectTransform: m_Father: {fileID: 1509401544} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.2, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -13122,7 +13122,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &548276324 RectTransform: m_ObjectHideFlags: 0 @@ -13142,10 +13142,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 270} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 283, y: -215} + m_SizeDelta: {x: 283, y: 270} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 MonoBehaviour: @@ -36692,7 +36692,7 @@ MonoBehaviour: AnimationProgressText: {fileID: 1286450786} BackGroundList: {fileID: 394733025} BackGroundPageCtrl: {fileID: 2093223150} - BG_Canvas: {fileID: 0} + BG_Canvas: {fileID: 1085021150} BG_HSVPickerObj: {fileID: 582796021} BG_Image: {fileID: 1682865917} CharaIconDefault: {fileID: 21300000, guid: fcb07487bdd0f054f81d8865b4800c13, type: 3} @@ -36718,7 +36718,7 @@ MonoBehaviour: VMDButton: {fileID: 668484488} UpdateDBButton: {fileID: 1516377151} WorkModeDropdown: {fileID: 1909384047} - LanguageDropdown: {fileID: 0} + LanguageDropdown: {fileID: 308207822} TogglablePanels: - {fileID: 1974252710} - {fileID: 87578738} @@ -40590,7 +40590,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -527.1035} + m_AnchoredPosition: {x: 283, y: -889.68} m_SizeDelta: {x: 283, y: 355} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1705149251 @@ -47262,7 +47262,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -52396,9 +52396,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -286} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -52904,9 +52904,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -57.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -53011,10 +53011,10 @@ RectTransform: m_Father: {fileID: 1704906816} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -296.09} - m_SizeDelta: {x: 283, y: 512.18} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 512.18} m_Pivot: {x: 1, y: 0.5} --- !u!114 &6878219666121841225 MonoBehaviour: @@ -53063,7 +53063,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &6878219666163837328 MonoBehaviour: m_ObjectHideFlags: 0 @@ -53240,8 +53240,8 @@ RectTransform: m_Father: {fileID: 6878219666936031748} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.44444445, y: 0} - m_AnchorMax: {x: 0.44444445, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53801,8 +53801,8 @@ RectTransform: m_Father: {fileID: 6878219666544244009} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.14285715, y: 0} - m_AnchorMax: {x: 0.14285715, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -53829,7 +53829,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.1764706, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -54284,8 +54284,8 @@ RectTransform: m_Father: {fileID: 6878219665908762028} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.18367347, y: 0} - m_AnchorMax: {x: 0.18367347, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -54748,7 +54748,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -55261,9 +55261,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -171.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -56092,9 +56092,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -228.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -56935,7 +56935,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.020408163, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56962,7 +56962,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.14285715, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -57192,8 +57192,8 @@ RectTransform: m_Father: {fileID: 6878219665916883341} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -57220,7 +57220,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.18367347, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -57804,9 +57804,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -58024,9 +58024,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106.5, y: -114.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 @@ -58136,7 +58136,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.44444445, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -58479,8 +58479,8 @@ RectTransform: m_Father: {fileID: 6878219667285779259} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1764706, y: 0} - m_AnchorMax: {x: 0.1764706, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -58692,8 +58692,8 @@ RectTransform: m_Father: {fileID: 6878219667784581359} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.020408163, y: 0} - m_AnchorMax: {x: 0.020408163, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index f289ebc..df36923 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -447,7 +447,7 @@ public class UmaViewerBuilder : MonoBehaviour var hairasset = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name == hair); bool isDefaultHead = true; - + if (asset != null && hairasset != null) { //Load Face And Hair Textures @@ -521,7 +521,7 @@ public class UmaViewerBuilder : MonoBehaviour CurrentUMAContainer.MergeModel(); CurrentUMAContainer.Initialize(); CurrentUMAContainer.SetHeight(-1); - LoadAsset(UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.EndsWith($"homestand{personality.PadLeft(2,'0')}_loop"))); + LoadAsset(UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.EndsWith($"homestand{personality.PadLeft(2, '0')}_loop"))); } private void LoadMiniUma(CharaEntry chara, string costumeId) @@ -934,7 +934,7 @@ public class UmaViewerBuilder : MonoBehaviour } else if (bundle.name.Contains("/head/")) { - if (bundle.name.Contains("_hair")&&!bundle.name.Contains("mchr")) + if (bundle.name.Contains("_hair") && !bundle.name.Contains("mchr")) { LoadHair(go); } @@ -981,10 +981,10 @@ public class UmaViewerBuilder : MonoBehaviour { CurrentUMAContainer.GenericBodyTextures.Add(tex2D); } - else if (bundle.name.Contains("_face")|| bundle.name.Contains("_hair")) + else if (bundle.name.Contains("_face") || bundle.name.Contains("_hair")) { - if(CurrentUMAContainer.IsMob) - CurrentUMAContainer.MobHeadTextures.Add(tex2D); + if (CurrentUMAContainer.IsMob) + CurrentUMAContainer.MobHeadTextures.Add(tex2D); } break; } @@ -1199,7 +1199,7 @@ public class UmaViewerBuilder : MonoBehaviour m.SetTexture("_ToonMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("shad_c"))); m.SetTexture("_TripleMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("base"))); m.SetTexture("_OptionMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("ctrl"))); - m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area")&&! t.name.Contains("_eye"))); + m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area") && !t.name.Contains("_eye"))); SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "mayu", true); } if (m.name.EndsWith("mayu")) @@ -1221,7 +1221,7 @@ public class UmaViewerBuilder : MonoBehaviour { if (isMob) { - CurrentUMAContainer.CheekTex_0 = CurrentUMAContainer.MobHeadTextures.FindLast(a=>a.name.Contains("cheek0")); + CurrentUMAContainer.CheekTex_0 = CurrentUMAContainer.MobHeadTextures.FindLast(a => a.name.Contains("cheek0")); CurrentUMAContainer.CheekTex_1 = CurrentUMAContainer.MobHeadTextures.FindLast(a => a.name.Contains("cheek1")); } else @@ -1289,7 +1289,7 @@ public class UmaViewerBuilder : MonoBehaviour m.shader = alphaShader; } - if(m.name.EndsWith("_hair")) + if (m.name.EndsWith("_hair")) { m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("diff"))); m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("shad_c"))); @@ -1440,51 +1440,12 @@ public class UmaViewerBuilder : MonoBehaviour { if (clip.name.EndsWith("_S")) { - CurrentUMAContainer.UpBodyReset(); CurrentUMAContainer.OverrideController["clip_s"] = clip; } else if (clip.name.EndsWith("_E")) { - CurrentUMAContainer.UpBodyReset(); CurrentUMAContainer.OverrideController["clip_e"] = clip; } - else if (clip.name.EndsWith("_loop")) - { - CurrentUMAContainer.UpBodyReset(); - UmaDatabaseEntry motion_e = null, motion_s = null; - if (clip.name.EndsWith("_loop")) - { - motion_s = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name.Replace("_loop", "_s"))); - } - - if (CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop")) - { - motion_e = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(CurrentUMAContainer.OverrideController["clip_2"].name.Replace("_loop", "_e"))); - } - - if (CurrentUMAContainer.isAnimatorControl && CurrentUMAContainer.FaceDrivenKeyTarget) - { - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - } - - bool needTransit = false; - needTransit = (motion_s != null && motion_e != null); - if (needTransit) - { - RecursiveLoadAsset(motion_e); - RecursiveLoadAsset(motion_s); - } - - SetPreviewCamera(null); - var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime; - CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; - CurrentUMAContainer.OverrideController["clip_2"] = clip; - - CurrentUMAContainer.UmaAnimator.Play("motion_1", -1); - CurrentUMAContainer.UmaAnimator.SetTrigger(needTransit ? "next_s" : "next"); - CurrentUMAContainer.isAnimatorControl = false; - CurrentUMAContainer.SetHeight(-1); - } else if (clip.name.Contains("tail")) { if (CurrentUMAContainer.IsMini) return; @@ -1495,17 +1456,12 @@ public class UmaViewerBuilder : MonoBehaviour else if (clip.name.Contains("face")) { if (CurrentUMAContainer.IsMini) return; - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - CurrentUMAContainer.FaceOverrideController["clip_1"] = clip; - CurrentUMAContainer.isAnimatorControl = true; - CurrentUMAContainer.SetHeight(0); - CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0); + LoadFaceAnimation(clip); } else if (clip.name.Contains("ear")) { if (CurrentUMAContainer.IsMini) return; - CurrentUMAContainer.FaceOverrideController["clip_2"] = clip; - CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 1, 0); + LoadEarAnimation(clip); } else if (clip.name.Contains("pos")) { @@ -1517,12 +1473,61 @@ public class UmaViewerBuilder : MonoBehaviour { SetPreviewCamera(clip); } - else + else if (clip.name.Contains("_loop")) { CurrentUMAContainer.UpBodyReset(); - CurrentUMAContainer.UmaAnimator.Rebind(); + if (CurrentUMAContainer.isAnimatorControl && CurrentUMAContainer.FaceDrivenKeyTarget) + { + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + CurrentUMAContainer.isAnimatorControl = false; + } + + var facialMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_face")); + if (facialMotion != null) + { + RecursiveLoadAsset(facialMotion); + } + var earMotion = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name + "_ear")); + if (earMotion != null) + { + RecursiveLoadAsset(earMotion); + } + + UmaDatabaseEntry motion_e = null, motion_s = null; + motion_s = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name.Replace("_loop", "_s"))); + if (motion_s != null) + { + RecursiveLoadAsset(motion_s); + } + + if (CurrentUMAContainer.OverrideController["clip_2"].name.Contains("_loop")) + { + motion_e = Main.AbMotions.FirstOrDefault(a => + a.Name.EndsWith(CurrentUMAContainer.OverrideController["clip_2"].name.Replace("_loop", "_e")) + && !a.Name.Contains("hom_")); //home end animation not for interpolation + + if (motion_e != null) + { + RecursiveLoadAsset(motion_e); + } + } + + SetPreviewCamera(null); CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; - var lastTime = CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0).normalizedTime; + CurrentUMAContainer.OverrideController["clip_2"] = clip; + + CurrentUMAContainer.UmaAnimator.Play("motion_1", -1, 0); + CurrentUMAContainer.UmaAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); + } + else + { + if (CurrentUMAContainer.FaceDrivenKeyTarget) + { + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + CurrentUMAContainer.isAnimatorControl = false; + } + CurrentUMAContainer.UpBodyReset(); + CurrentUMAContainer.UmaAnimator.Rebind(); CurrentUMAContainer.OverrideController["clip_2"] = clip; // If Cut-in, play immediately without state interpolation if (clip.name.Contains("crd") || clip.name.Contains("res_chr")) @@ -1557,8 +1562,6 @@ public class UmaViewerBuilder : MonoBehaviour SetPreviewCamera(null); } - CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); - if (clip.name.Contains("cti_crd")) { string[] param = clip.name.Split('_'); @@ -1575,15 +1578,11 @@ public class UmaViewerBuilder : MonoBehaviour clip.AddEvent(aevent); } } + + CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); } else { - if (CurrentUMAContainer.FaceDrivenKeyTarget) - { - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - } - CurrentUMAContainer.isAnimatorControl = false; - CurrentUMAContainer.SetHeight(-1); SetPreviewCamera(null); //Some animations have facial animation @@ -1598,12 +1597,101 @@ public class UmaViewerBuilder : MonoBehaviour RecursiveLoadAsset(earMotion); } - CurrentUMAContainer.UmaAnimator.Play("motion_1", 0, lastTime); - CurrentUMAContainer.UmaAnimator.SetTrigger("next"); + CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); } } } + public void LoadFaceAnimation(AnimationClip clip) + { + if (clip.name.Contains("_S")) + { + CurrentUMAContainer.FaceOverrideController["clip_s"] = clip; + } + else if (clip.name.Contains("_E")) + { + CurrentUMAContainer.FaceOverrideController["clip_e"] = clip; + } + else if (clip.name.Contains("_loop")) + { + CurrentUMAContainer.isAnimatorControl = true; + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + UmaDatabaseEntry motion_e = null, motion_s = null; + motion_s = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name.Replace("_loop", "_s"))); + if (motion_s != null) + { + RecursiveLoadAsset(motion_s); + } + + if (CurrentUMAContainer.FaceOverrideController["clip_2"].name.Contains("_loop")) + { + motion_e = Main.AbMotions.FirstOrDefault(a => + a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2"].name.Replace("_loop", "_e")) + && !a.Name.Contains("hom_")); + + if (motion_e != null) + { + RecursiveLoadAsset(motion_e); + } + } + + CurrentUMAContainer.FaceOverrideController["clip_1"] = CurrentUMAContainer.FaceOverrideController["clip_2"]; + CurrentUMAContainer.FaceOverrideController["clip_2"] = clip; + CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0); + CurrentUMAContainer.UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); + } + else + { + CurrentUMAContainer.isAnimatorControl = true; + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + CurrentUMAContainer.FaceOverrideController["clip_2"] = clip; + CurrentUMAContainer.UmaFaceAnimator.Play("motion_2", 0, 0); + } + } + + public void LoadEarAnimation(AnimationClip clip) + { + if (clip.name.Contains("_S")) + { + CurrentUMAContainer.FaceOverrideController["clip_s_ear"] = clip; + } + else if (clip.name.Contains("_E")) + { + CurrentUMAContainer.FaceOverrideController["clip_e_ear"] = clip; + } + else if (clip.name.Contains("_loop")) + { + UmaDatabaseEntry motion_e = null, motion_s = null; + motion_s = Main.AbMotions.FirstOrDefault(a => a.Name.EndsWith(clip.name.Replace("_loop", "_s"))); + if (motion_s != null) + { + RecursiveLoadAsset(motion_s); + } + + if (CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Contains("_loop")) + { + motion_e = Main.AbMotions.FirstOrDefault(a => + a.Name.EndsWith(CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Replace("_loop", "_e")) + && !a.Name.Contains("hom_")); + + if (motion_e != null) + { + RecursiveLoadAsset(motion_e); + } + } + + CurrentUMAContainer.FaceOverrideController["clip_1_ear"] = CurrentUMAContainer.FaceOverrideController["clip_2_ear"]; + CurrentUMAContainer.FaceOverrideController["clip_2_ear"] = clip; + CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 1, 0); + CurrentUMAContainer.UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e_ear" : ((motion_s != null) ? "next_s_ear" : "next_ear")); + } + else + { + CurrentUMAContainer.FaceOverrideController["clip_2_ear"] = clip; + CurrentUMAContainer.UmaFaceAnimator.Play("motion_2", 1, 0); + } + } + public void SetPreviewCamera(AnimationClip clip) { if (clip) @@ -1615,10 +1703,12 @@ public class UmaViewerBuilder : MonoBehaviour (AnimationCameraAnimator.runtimeAnimatorController as AnimatorOverrideController)["clip_1"] = clip; AnimationCamera.enabled = true; AnimationCameraAnimator.Play("motion_1", 0, 0); + CurrentUMAContainer.SetHeight(0); } else { AnimationCamera.enabled = false; + CurrentUMAContainer.SetHeight(-1); } } @@ -1823,7 +1913,7 @@ public class UmaViewerBuilder : MonoBehaviour mat.SetColor("_MaskToonColorB2", t6); } - private void SetMaskColor(Material mat, DataRow colordata, string prefix,bool hastoon) + private void SetMaskColor(Material mat, DataRow colordata, string prefix, bool hastoon) { mat.EnableKeyword("USE_MASK_COLOR"); Color c1, c2, c3, c4, c5, c6, t1, t2, t3, t4, t5, t6; diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index ad267c7..6881493 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -5,9 +5,6 @@ using UnityEngine; using System; using Newtonsoft.Json.Linq; using System.Collections; -using static ManifestCategory; -using BaseNcoding; -using System.Text; public class UmaViewerMain : MonoBehaviour { @@ -63,6 +60,7 @@ public class UmaViewerMain : MonoBehaviour } }); } + //Mob names (EN & JP) yield return UmaViewerDownload.DownloadText("https://www.tracenacademy.com/api/BasicMobDataInfo", txt => { diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 10596d9..5b5e553 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -140,8 +140,6 @@ public class UmaViewerUI : MonoBehaviour AnimationPlayButton.onClick.AddListener(AnimationPause); AnimationSlider.onValueChanged.AddListener(AnimationProgressChange); AnimationSpeedSlider.onValueChanged.AddListener(AnimationSpeedChange); - if (Application.platform == RuntimePlatform.Android) - canvasScaler.screenMatchMode = CanvasScaler.ScreenMatchMode.Shrink; } private void Start() { @@ -168,7 +166,7 @@ public class UmaViewerUI : MonoBehaviour { if (Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2") { - bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop"); + bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.Contains("_loop"); var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"]; if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0) @@ -1000,6 +998,7 @@ public class UmaViewerUI : MonoBehaviour Builder.CurrentUMAContainer.EnableEyeTracking = isOn; } } + public void SetFaceOverrideEnable(bool isOn) { EnableFaceOverride = isOn; diff --git a/Assets/Scripts/umamusume.asmdef b/Assets/Scripts/umamusume.asmdef index 2d6c8c0..4ee991a 100644 --- a/Assets/Scripts/umamusume.asmdef +++ b/Assets/Scripts/umamusume.asmdef @@ -5,8 +5,8 @@ "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:800597811bcc5d848b15e12807d6de45", "GUID:d60799ab2a985554ea1a39cd38695018", - "GUID:145e2572884581c48a08acf566c1a1d6", - "GUID:fd1d627189c561043911a07470238b9c" + "GUID:fd1d627189c561043911a07470238b9c", + "GUID:145e2572884581c48a08acf566c1a1d6" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Packages/manifest.json b/Packages/manifest.json index 473e18c..389237c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,5 @@ { "dependencies": { - "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", "com.unity.collab-proxy": "1.17.0", "com.unity.formats.fbx": "4.1.2", "com.unity.ide.rider": "2.0.7", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 99b6b22..d589c4a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,13 +7,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.assetbundlebrowser": { - "version": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "b7c279278d1a343c6957c9f15b45173d3211f01c" - }, "com.unity.collab-proxy": { "version": "1.17.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 95d8996..5c5e215 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -74,7 +74,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 - defaultIsNativeResolution: 1 + defaultIsNativeResolution: 0 macRetinaSupport: 1 runInBackground: 1 captureSingleScreen: 0 @@ -271,7 +271,7 @@ PlayerSettings: - m_BuildTarget: m_Icons: - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: be57be148b08f20409f61a4db5bab7e7, type: 3} + m_Icon: {fileID: 2800000, guid: 31c09c7e5e37c29478b22be3658099fc, type: 3} m_Width: 128 m_Height: 128 m_Kind: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7ae7f85..46cdcca 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,6 +21,9 @@ EditorUserSettings: value: 224247031146466d202a3e27132c4d1413052b2b21382a35621a1c3ef2ec310be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c711501572b292926237e38271427fb + flags: 0 + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c691504041125227a68252320092a flags: 0 vcSharedLogLevel: