no message
This commit is contained in:
parent
cfda861017
commit
bcf4dba613
File diff suppressed because one or more lines are too long
@ -12,21 +12,25 @@ namespace Ether
|
|||||||
{
|
{
|
||||||
public class AnimController : SerializedMonoBehaviour
|
public class AnimController : SerializedMonoBehaviour
|
||||||
{
|
{
|
||||||
[Header("动画控制")]
|
[Title("动画控制")]
|
||||||
[LabelText("是否在激活时播放")]
|
[LabelText("是否在激活时播放")]
|
||||||
|
[PropertyOrder(0)]
|
||||||
public bool isPlayEnable;
|
public bool isPlayEnable;
|
||||||
|
|
||||||
[LabelText("激活时播放动画")]
|
[LabelText("激活时播放动画")]
|
||||||
[ShowIf("isPlayEnable", true)]
|
[ShowIf("isPlayEnable", true)]
|
||||||
[ValueDropdown("GetAllAnim")]
|
[ValueDropdown("GetAllAnim")]
|
||||||
|
[PropertyOrder(1)]
|
||||||
public string enablePlayAnim;
|
public string enablePlayAnim;
|
||||||
|
|
||||||
[LabelText("是否在隐藏时播放")]
|
[LabelText("是否在隐藏时播放")]
|
||||||
|
[PropertyOrder(2)]
|
||||||
public bool isPlayDisable;
|
public bool isPlayDisable;
|
||||||
|
|
||||||
[LabelText("隐藏时播放动画")]
|
[LabelText("隐藏时播放动画")]
|
||||||
[ShowIf("isPlayDisable", true)]
|
[ShowIf("isPlayDisable", true)]
|
||||||
[ValueDropdown("GetAllAnim")]
|
[ValueDropdown("GetAllAnim")]
|
||||||
|
[PropertyOrder(3)]
|
||||||
public string disablePlayAnim;
|
public string disablePlayAnim;
|
||||||
|
|
||||||
[LabelText("动画列表")]
|
[LabelText("动画列表")]
|
||||||
@ -34,8 +38,52 @@ namespace Ether
|
|||||||
[ShowInInspector]
|
[ShowInInspector]
|
||||||
[DictionaryDrawerSettings(KeyLabel = "名称", ValueLabel = "动画资源")]
|
[DictionaryDrawerSettings(KeyLabel = "名称", ValueLabel = "动画资源")]
|
||||||
[OnValueChanged("OnValueChanged")]
|
[OnValueChanged("OnValueChanged")]
|
||||||
|
[PropertyOrder(10)]
|
||||||
public Dictionary<string, Object> allAnimationSet = new Dictionary<string, Object>();
|
public Dictionary<string, Object> allAnimationSet = new Dictionary<string, Object>();
|
||||||
|
//
|
||||||
|
// [PropertySpace(20)]
|
||||||
|
// [LabelText("预览动画")]
|
||||||
|
// [ValueDropdown("GetAllAnim")]
|
||||||
|
// [PropertyOrder(4)]
|
||||||
|
// public string previewAnim;
|
||||||
|
//
|
||||||
|
// [LabelText("预览进度")]
|
||||||
|
// [Range(0, 1)]
|
||||||
|
// [OnValueChanged("OnPreview")]
|
||||||
|
// [PropertyOrder(5)]
|
||||||
|
// public float previewProgress;
|
||||||
|
//
|
||||||
|
// [PropertySpace(10)]
|
||||||
|
// [Button("预览动画", ButtonSizes.Large)]
|
||||||
|
// [PropertyOrder(6)]
|
||||||
|
// public void PreviewAnim()
|
||||||
|
// {
|
||||||
|
// OnPreview();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// private void OnPreview()
|
||||||
|
// {
|
||||||
|
// Awake();
|
||||||
|
// if (string.IsNullOrEmpty(previewAnim))
|
||||||
|
// {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// if (allAnimationSet.TryGetValue(previewAnim, out Object animation))
|
||||||
|
// {
|
||||||
|
// AnimationClip clip = animation switch
|
||||||
|
// {
|
||||||
|
// AnimationSet animationSet => animationSet.GetClip(),
|
||||||
|
// AnimationClip animationClip => animationClip,
|
||||||
|
// _ => null
|
||||||
|
// };
|
||||||
|
//
|
||||||
|
// if (clip == null) return;
|
||||||
|
// float normalizedTime = previewProgress;
|
||||||
|
// var currentTime = clip.length * normalizedTime;
|
||||||
|
// clip.SampleAnimation(gameObject, currentTime);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
private void OnValueChanged()
|
private void OnValueChanged()
|
||||||
{
|
{
|
||||||
// 这里可以添加逻辑来处理值变化,例如清理无效条目
|
// 这里可以添加逻辑来处理值变化,例如清理无效条目
|
||||||
|
File diff suppressed because one or more lines are too long
@ -1,101 +0,0 @@
|
|||||||
%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: LoginFrame
|
|
||||||
serializedVersion: 5
|
|
||||||
m_AnimatorParameters: []
|
|
||||||
m_AnimatorLayers:
|
|
||||||
- serializedVersion: 5
|
|
||||||
m_Name: Base Layer
|
|
||||||
m_StateMachine: {fileID: 2486352951758955256}
|
|
||||||
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 &2486352951758955256
|
|
||||||
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: 8931303047572687218}
|
|
||||||
m_Position: {x: 200, y: 0, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: 7384694989546472410}
|
|
||||||
m_Position: {x: 302, y: 117, 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: 8931303047572687218}
|
|
||||||
--- !u!1102 &7384694989546472410
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: LoginFrameHide
|
|
||||||
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: 7400000, guid: 380ce507f72f7334da36a555e8d5d1ab, type: 2}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1102 &8931303047572687218
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: LoginFrameShow
|
|
||||||
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: 7400000, guid: 7e179fd10ed3d8643883c98de0a5fe62, type: 2}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 78fd554fda1c607408b6c7c689c8bd18
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 9100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -10,6 +10,8 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3300074689851355942}
|
- component: {fileID: 3300074689851355942}
|
||||||
- component: {fileID: 2280105451091296656}
|
- component: {fileID: 2280105451091296656}
|
||||||
|
- component: {fileID: 7884195870156522380}
|
||||||
|
- component: {fileID: 4689967333981129580}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: LoginFrame
|
m_Name: LoginFrame
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -109,6 +111,43 @@ MonoBehaviour:
|
|||||||
enablePlayAnim: Show
|
enablePlayAnim: Show
|
||||||
isPlayDisable: 1
|
isPlayDisable: 1
|
||||||
disablePlayAnim: Hide
|
disablePlayAnim: Hide
|
||||||
|
previewAnim: Show
|
||||||
|
previewProgress: 1
|
||||||
|
--- !u!95 &7884195870156522380
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 5
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 50561091006429229}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 0}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_StabilizeFeet: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorStateOnDisable: 0
|
||||||
|
m_WriteDefaultValuesOnDisable: 0
|
||||||
|
--- !u!114 &4689967333981129580
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 50561091006429229}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_Animator: {fileID: 7884195870156522380}
|
||||||
|
_ActionOnDisable: 0
|
||||||
--- !u!1 &2081265740414986783
|
--- !u!1 &2081265740414986783
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -144,7 +183,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 173.59386, y: -475.18332}
|
m_AnchoredPosition: {x: 173.5939, y: -475.18332}
|
||||||
m_SizeDelta: {x: 347.19, y: 78.4124}
|
m_SizeDelta: {x: 347.19, y: 78.4124}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6146899959842804886
|
--- !u!222 &6146899959842804886
|
||||||
@ -311,7 +350,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 173.59386, y: -672.0081}
|
m_AnchoredPosition: {x: 173.5939, y: -672.0081}
|
||||||
m_SizeDelta: {x: 347.19, y: 78.4124}
|
m_SizeDelta: {x: 347.19, y: 78.4124}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2431033288794401294
|
--- !u!222 &2431033288794401294
|
||||||
@ -553,7 +592,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 173.59386, y: -573.5957}
|
m_AnchoredPosition: {x: 173.5939, y: -573.5957}
|
||||||
m_SizeDelta: {x: 347.19, y: 78.4124}
|
m_SizeDelta: {x: 347.19, y: 78.4124}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &9065110783637622606
|
--- !u!222 &9065110783637622606
|
||||||
@ -720,7 +759,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 173.59386, y: -770.42053}
|
m_AnchoredPosition: {x: 173.5939, y: -770.42053}
|
||||||
m_SizeDelta: {x: 347.19, y: 78.4124}
|
m_SizeDelta: {x: 347.19, y: 78.4124}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1470245934926014854
|
--- !u!222 &1470245934926014854
|
||||||
|
@ -20,6 +20,7 @@ namespace Ether
|
|||||||
{
|
{
|
||||||
protected override void OnSubscribe()
|
protected override void OnSubscribe()
|
||||||
{
|
{
|
||||||
|
string str;
|
||||||
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Up, OnInputUpEvent);
|
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Up, OnInputUpEvent);
|
||||||
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Down, OnInputDownEvent);
|
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Down, OnInputDownEvent);
|
||||||
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Left, OnInputLeftEvent);
|
//EventCenter.AddListener<EtherInputType, int>(EtherInputType.Left, OnInputLeftEvent);
|
||||||
|
Loading…
Reference in New Issue
Block a user