Browse Source

将动画放到Update里处理

jet 8 years ago
parent
commit
eac872623b
43 changed files with 680 additions and 102 deletions
  1. 154 0
      Assets/New Animation.anim
  2. 8 0
      Assets/New Animation.anim.meta
  3. 67 0
      Assets/New Animator Controller.controller
  4. 8 0
      Assets/New Animator Controller.controller.meta
  5. 349 0
      Assets/Resource/Logo.unity
  6. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  7. 1 1
      Assets/Script/Manage/ManaAnim.cs
  8. 4 12
      Assets/Script/Manage/ManaCenter.cs
  9. 1 1
      Assets/Script/Manage/ManaData.cs
  10. 4 4
      Assets/Script/Manage/ManaGarden.cs
  11. 3 3
      Assets/Script/Manage/ManaInfo.cs
  12. 12 12
      Assets/Script/Manage/ManaMiniGame.cs
  13. 1 1
      Assets/Script/Manage/ManaServer.cs
  14. 3 3
      Assets/Script/Object/Drop.cs
  15. 3 10
      Assets/Script/Object/Player.cs
  16. 2 2
      Assets/Script/Object/Skill/Skill.cs
  17. 2 2
      Assets/Script/Object/Star.cs
  18. 1 1
      Assets/Script/Tool/Anim/Move2D.cs
  19. 1 1
      Assets/Script/Tool/Anim/Move3D.cs
  20. 1 1
      Assets/Script/Tool/Anim/Shake.cs
  21. 2 2
      Assets/Script/Tool/Anim/StreamScale.cs
  22. 2 2
      Assets/Script/Tool/Anim/TweenAudio.cs
  23. 2 2
      Assets/Script/Tool/Anim/TweenCG.cs
  24. 2 2
      Assets/Script/Tool/Anim/TweenEuler.cs
  25. 2 2
      Assets/Script/Tool/Anim/TweenFont.cs
  26. 2 2
      Assets/Script/Tool/Anim/TweenGra.cs
  27. 2 2
      Assets/Script/Tool/Anim/TweenMatColor.cs
  28. 2 2
      Assets/Script/Tool/Anim/TweenMatFloat.cs
  29. 2 2
      Assets/Script/Tool/Anim/TweenNumber.cs
  30. 2 2
      Assets/Script/Tool/Anim/TweenOutline.cs
  31. 2 2
      Assets/Script/Tool/Anim/TweenRect.cs
  32. 2 2
      Assets/Script/Tool/Anim/TweenRenderer.cs
  33. 2 2
      Assets/Script/Tool/Anim/TweenScale.cs
  34. 2 2
      Assets/Script/Tool/Anim/TweenSr.cs
  35. 2 2
      Assets/Script/Tool/Anim/TweenVec.cs
  36. 1 1
      Assets/Script/Tool/Anim/Zoom2D.cs
  37. 11 6
      Assets/Script/Tool/Auxiliary.cs
  38. 1 1
      Assets/Script/Tool/UI/HudTarget.cs
  39. 3 3
      Assets/Script/Tool/UI/HudText.cs
  40. 2 2
      Assets/Script/Tool/UI/HudTextPlus.cs
  41. 0 1
      Assets/Script/Tool/UI/TextPlus.cs
  42. 2 2
      Assets/Script/Tool/UI/Toast.cs
  43. 5 2
      ToList.txt

+ 154 - 0
Assets/New Animation.anim

@@ -0,0 +1,154 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: New Animation
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: -343.3
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 346.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0.0000076294
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 0.0000076294
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  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:
+    - path: 0
+      attribute: 1460864421
+      script: {fileID: 0}
+      classID: 224
+      customType: 0
+      isPPtrCurve: 0
+    - path: 0
+      attribute: 538195251
+      script: {fileID: 0}
+      classID: 224
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.33333334
+    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:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: -343.3
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 346.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 0.0000076294
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      - serializedVersion: 2
+        time: 0.33333334
+        value: 0.0000076294
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_IsEmpty: 0
+  m_Events: []

+ 8 - 0
Assets/New Animation.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd0a14156aaf9ac4f8b548adf683c7a8
+timeCreated: 1502693532
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 67 - 0
Assets/New Animator Controller.controller

@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: New Animator Controller
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107907516412157236}
+    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!1102 &1102324197426563160
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: New Animation
+  m_Speed: 0.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_Motion: {fileID: 7400000, guid: bd0a14156aaf9ac4f8b548adf683c7a8, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+--- !u!1107 &1107907516412157236
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102324197426563160}
+    m_Position: {x: 312, y: 24, 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: 1102324197426563160}

+ 8 - 0
Assets/New Animator Controller.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 313b259a8bf0b0c499bbac8e5354063b
+timeCreated: 1502693516
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 349 - 0
Assets/Resource/Logo.unity

@@ -91,6 +91,68 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &442047128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 442047131}
+  - component: {fileID: 442047130}
+  - component: {fileID: 442047129}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &442047129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 442047128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &442047130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 442047128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 5
+--- !u!4 &442047131
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 442047128}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -155,6 +217,120 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1 &557082217
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 557082221}
+  - component: {fileID: 557082220}
+  - component: {fileID: 557082219}
+  - component: {fileID: 557082218}
+  - component: {fileID: 557082222}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &557082218
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 557082217}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &557082219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 557082217}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &557082220
+Canvas:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 557082217}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &557082221
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 557082217}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1541018266}
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  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: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &557082222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 557082217}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3cac44ec7ca55734c9dd55ba09a4b72a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  RegistLock: 0
+  String1: 
+  String2: 
+  TextAsset: {fileID: 0}
+  Texture: {fileID: 0}
+  Font: {fileID: 0}
+  Go: {fileID: 0}
+  GoList: []
+  SrList: []
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,6 +594,179 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1541018265
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1541018266}
+  - component: {fileID: 1541018268}
+  - component: {fileID: 1541018267}
+  - component: {fileID: 1541018269}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1541018266
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1541018265}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 557082221}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -334.3, y: 0.0000076294}
+  m_SizeDelta: {x: 197.6, y: 197.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1541018267
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1541018265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1541018268
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1541018265}
+--- !u!95 &1541018269
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1541018265}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 313b259a8bf0b0c499bbac8e5354063b, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+--- !u!1 &1632940791
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1632940796}
+  - component: {fileID: 1632940795}
+  - component: {fileID: 1632940794}
+  - component: {fileID: 1632940793}
+  - component: {fileID: 1632940792}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!81 &1632940792
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1632940791}
+  m_Enabled: 1
+--- !u!92 &1632940793
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1632940791}
+  m_Enabled: 1
+--- !u!124 &1632940794
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1632940791}
+  m_Enabled: 1
+--- !u!20 &1632940795
+Camera:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1632940791}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+  m_StereoMirrorMode: 0
+--- !u!4 &1632940796
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1632940791}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.010913, y: 3.2366495, z: 0.25}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 1
Assets/Script/Manage/ManaAnim.cs

@@ -122,7 +122,7 @@ public class ManaAnim : Regist
 
     #endregion
 
-    public void FixedUpdate()
+    public void Update()
     {
         for (int i = 0; i < MoveForList.Count; i++)
         {

+ 4 - 12
Assets/Script/Manage/ManaCenter.cs

@@ -375,16 +375,6 @@ public class ManaCenter : Regist
 
     private void Update()
     {
-        if (ManaTutorial.TutorialA)
-        {
-            return;
-        }
-
-        OpThread();
-    }
-
-    private void FixedUpdate()
-    {
         LoginThread();
 
         if (ManaTutorial.TutorialA)
@@ -392,6 +382,8 @@ public class ManaCenter : Regist
             return;
         }
 
+        OpThread();
+
         SkillThread();
 
         MiniThread();
@@ -493,7 +485,7 @@ public class ManaCenter : Regist
             return;
         }
 
-        SaveTimer += Time.fixedDeltaTime;
+        SaveTimer += Time.deltaTime;
 
         if (SaveTimer >= 60)
         {
@@ -505,7 +497,7 @@ public class ManaCenter : Regist
 
     private void LoginThread()
     {
-        LoginTimer += Time.fixedDeltaTime;
+        LoginTimer += Time.deltaTime;
 
         if (LoginTimer >= 10)
         {

+ 1 - 1
Assets/Script/Manage/ManaData.cs

@@ -143,7 +143,7 @@ public class ManaData : Regist
     {
         if (DamageLock)
         {
-            Timer += Time.fixedDeltaTime;
+            Timer += Time.deltaTime;
 
             if (Timer >= 10)
             {

+ 4 - 4
Assets/Script/Manage/ManaGarden.cs

@@ -145,7 +145,7 @@ public class ManaGarden : Regist
 
     #endregion
 
-    public void FixedUpdate()
+    public void Update()
     {
         if (ManaTutorial.TutorialA || Player.InDressRoom)
         {
@@ -167,7 +167,7 @@ public class ManaGarden : Regist
             return;
         }
 
-        ElfTimer -= Time.fixedDeltaTime;
+        ElfTimer -= Time.deltaTime;
 
         if (ElfTimer < 0)
         {
@@ -184,7 +184,7 @@ public class ManaGarden : Regist
     {
         if (MiniLock && !ManaCenter.MiniLock && !ManaVisit.InVisit)
         {
-            StarTimer -= Time.fixedDeltaTime;
+            StarTimer -= Time.deltaTime;
 
             if (StarTimer < 0)
             {
@@ -199,7 +199,7 @@ public class ManaGarden : Regist
     {
         if (MiniLock)
         {
-            AwardTimer -= Time.fixedDeltaTime;
+            AwardTimer -= Time.deltaTime;
 
             if (AwardTimer <= 0)
             {

+ 3 - 3
Assets/Script/Manage/ManaInfo.cs

@@ -40,9 +40,9 @@ public class ManaInfo : Regist
 
     #endregion
 
-    public void FixedUpdate()
+    public void Update()
     {
-        Timer -= Time.fixedDeltaTime;
+        Timer -= Time.deltaTime;
 
         if (Timer <= 0 && Lock)
         {
@@ -56,7 +56,7 @@ public class ManaInfo : Regist
         {
             InfoText infoText = TextList[i];
 
-            infoText.Timer -= Time.fixedDeltaTime;
+            infoText.Timer -= Time.deltaTime;
 
             if (infoText.Timer < 0)
             {

+ 12 - 12
Assets/Script/Manage/ManaMiniGame.cs

@@ -725,7 +725,7 @@ public class ManaMiniGame : Regist
 
     #endregion
 
-    private void FixedUpdate()
+    private void Update()
     {
         if (Pause)
         {
@@ -755,7 +755,7 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer += Time.fixedDeltaTime;
+        GameTimer += Time.deltaTime;
 
         if (GameTimer >= GameTime)
         {
@@ -766,7 +766,7 @@ public class ManaMiniGame : Regist
 
         if (Panalty)
         {
-            PanaltyTimer -= Time.fixedDeltaTime;
+            PanaltyTimer -= Time.deltaTime;
 
             if (PanaltyTimer <= 0)
             {
@@ -776,7 +776,7 @@ public class ManaMiniGame : Regist
 
         if (IdleList.Count > 0)
         {
-            OpTimer -= Time.fixedDeltaTime;
+            OpTimer -= Time.deltaTime;
 
             if (OpTimer <= 0)
             {
@@ -798,7 +798,7 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer += Time.fixedDeltaTime;
+        GameTimer += Time.deltaTime;
 
         if (GameTimer >= GameTime)
         {
@@ -809,7 +809,7 @@ public class ManaMiniGame : Regist
 
         if (Panalty)
         {
-            PanaltyTimer -= Time.fixedDeltaTime;
+            PanaltyTimer -= Time.deltaTime;
 
             if (PanaltyTimer <= 0)
             {
@@ -819,7 +819,7 @@ public class ManaMiniGame : Regist
         
         if (FadeList.Count < 6)
         {
-            FadeTimer -= Time.fixedDeltaTime;
+            FadeTimer -= Time.deltaTime;
             
             if (FadeTimer <= 0)
             {
@@ -839,7 +839,7 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer += Time.fixedDeltaTime;
+        GameTimer += Time.deltaTime;
 
         if (GameTimer >= GameTime)
         {
@@ -850,7 +850,7 @@ public class ManaMiniGame : Regist
 
         if (Panalty)
         {
-            PanaltyTimer -= Time.fixedDeltaTime;
+            PanaltyTimer -= Time.deltaTime;
 
             if (PanaltyTimer <= 0)
             {
@@ -863,7 +863,7 @@ public class ManaMiniGame : Regist
 
     private void BonusThread()
     {
-        GoldTimer -= Time.fixedDeltaTime;
+        GoldTimer -= Time.deltaTime;
 
         if (GoldTimer < 0)
         {
@@ -874,7 +874,7 @@ public class ManaMiniGame : Regist
 
         if (DropDiamond)
         {
-            DiamondTimer -= Time.fixedDeltaTime;
+            DiamondTimer -= Time.deltaTime;
 
             if (DiamondTimer < 0)
             {
@@ -887,7 +887,7 @@ public class ManaMiniGame : Regist
 
     private void PrepareThread()
     {
-        PrepareTimer -= Time.fixedDeltaTime;
+        PrepareTimer -= Time.deltaTime;
 
         if (PrepareTimer <= 0)
         {

+ 1 - 1
Assets/Script/Manage/ManaServer.cs

@@ -111,7 +111,7 @@ public class ManaServer : Regist
     {
         if (!ManaCenter.Complete && !Complete)
         {
-            Timer += UnityEngine.Time.fixedDeltaTime;
+            Timer += UnityEngine.Time.deltaTime;
 
             if (Timer >= 2f)
             {

+ 3 - 3
Assets/Script/Object/Drop.cs

@@ -59,11 +59,11 @@ public class Drop : Regist,IPointerClickHandler
         transform.GetTweenSr().InOrigin = true;
     }
 
-    public void FixedUpdate()
+    public void Update()
     {
         if (!ManaMiniGame.Pause)
         {
-            Timer += Time.fixedDeltaTime;
+            Timer += Time.deltaTime;
 
             if (Timer > 5)
             {
@@ -77,7 +77,7 @@ public class Drop : Regist,IPointerClickHandler
         {
             if (!ManaMiniGame.Pause)
             {
-                transform.Translate(Vector3.down * Time.fixedDeltaTime * Speed);
+                transform.Translate(Vector3.down * Time.deltaTime * Speed);
             }
         }
     }

+ 3 - 10
Assets/Script/Object/Player.cs

@@ -165,7 +165,8 @@ public class CloseUnit
 
         if (BuyCurrent != Current.Free)
         {
-            BuyBtnLab.text = Language.GetStr("UI", "P_BtnLab1") + Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyAmt);
+            ManaLan.Add(BuyBtnLab, new LanStr("UI", "P_BtnLab1"), Auxiliary.ImageParse(BuyCurrent), Auxiliary.ShrinkNumberStr(BuyAmt));
+            //BuyBtnLab.text = Language.GetStr("UI", "P_BtnLab1") + Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyAmt);
         }
 
         BuyBtn.onClick.AddListener
@@ -418,17 +419,9 @@ public class Player : Regist , IPointerClickHandler
 
     public void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            UnityFactory.factory.BuildArmature("脑壳1");
-        }
-    }
-
-    public void FixedUpdate()
-    {
         if (InDressRoom)
         {
-            JumpTimer += Time.fixedDeltaTime;
+            JumpTimer += Time.deltaTime;
 
             if (JumpTimer > JumpTime)
             {

+ 2 - 2
Assets/Script/Object/Skill/Skill.cs

@@ -194,7 +194,7 @@ public class Skill : SkillRoot
 
     public virtual bool DoCool()
     {
-        CoolTimer -= Time.fixedDeltaTime;
+        CoolTimer -= Time.deltaTime;
         
         TimeSpan timeSpan = new TimeSpan(0, 0, Mathf.CeilToInt(CoolTimer));
 
@@ -223,7 +223,7 @@ public class Skill : SkillRoot
 
     public override bool DoUse()
     {
-        UseTimer -= Time.fixedDeltaTime;
+        UseTimer -= Time.deltaTime;
 
         TimeSpan timeSpan = new TimeSpan(0, 0, Mathf.CeilToInt(UseTimer));
 

+ 2 - 2
Assets/Script/Object/Star.cs

@@ -74,9 +74,9 @@ public class Star : MonoBehaviour, IPointerClickHandler
 
     #endregion
 
-    public void FixedUpdate()
+    public void Update()
     {
-        Timer += UnityEngine.Time.fixedDeltaTime;
+        Timer += UnityEngine.Time.deltaTime;
         
         if (Timer >= Time)
         {

+ 1 - 1
Assets/Script/Tool/Anim/Move2D.cs

@@ -80,7 +80,7 @@ public class Move2D : MoveRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 1 - 1
Assets/Script/Tool/Anim/Move3D.cs

@@ -81,7 +81,7 @@ public class Move3D : MoveRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 1 - 1
Assets/Script/Tool/Anim/Shake.cs

@@ -57,7 +57,7 @@ public class Shake : MoveRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/StreamScale.cs

@@ -391,7 +391,7 @@ public class StreamScale : StreamRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
         
         if (Phase == TotPhase)
         {
@@ -504,7 +504,7 @@ public class StreamScale : StreamRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Phase == TotPhase)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenAudio.cs

@@ -132,7 +132,7 @@ public class TweenAudio : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -157,7 +157,7 @@ public class TweenAudio : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenCG.cs

@@ -131,7 +131,7 @@ public class TweenCG : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -156,7 +156,7 @@ public class TweenCG : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenEuler.cs

@@ -197,7 +197,7 @@ public class TweenEuler : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -229,7 +229,7 @@ public class TweenEuler : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenFont.cs

@@ -133,7 +133,7 @@ public class TweenFont : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -158,7 +158,7 @@ public class TweenFont : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenGra.cs

@@ -132,7 +132,7 @@ public class TweenGra : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -157,7 +157,7 @@ public class TweenGra : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenMatColor.cs

@@ -135,7 +135,7 @@ public class TweenMatColor : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -162,7 +162,7 @@ public class TweenMatColor : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenMatFloat.cs

@@ -135,7 +135,7 @@ public class TweenMatFloat : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -162,7 +162,7 @@ public class TweenMatFloat : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenNumber.cs

@@ -135,7 +135,7 @@ public class TweenNumber : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
         
         if (Timer > Duration)
         {
@@ -160,7 +160,7 @@ public class TweenNumber : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenOutline.cs

@@ -136,7 +136,7 @@ public class TweenOutline : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -161,7 +161,7 @@ public class TweenOutline : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenRect.cs

@@ -131,7 +131,7 @@ public class TweenRect : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -156,7 +156,7 @@ public class TweenRect : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenRenderer.cs

@@ -248,7 +248,7 @@ public class TweenRenderer : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -297,7 +297,7 @@ public class TweenRenderer : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenScale.cs

@@ -140,7 +140,7 @@ public class TweenScale : TweenRoot
             return false;
         }
 
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -172,7 +172,7 @@ public class TweenScale : TweenRoot
             return false;
         }
 
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenSr.cs

@@ -196,7 +196,7 @@ public class TweenSr : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -245,7 +245,7 @@ public class TweenSr : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 2 - 2
Assets/Script/Tool/Anim/TweenVec.cs

@@ -197,7 +197,7 @@ public class TweenVec : TweenRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {
@@ -229,7 +229,7 @@ public class TweenVec : TweenRoot
 
     public override bool DoBackward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer > Duration)
         {

+ 1 - 1
Assets/Script/Tool/Anim/Zoom2D.cs

@@ -43,7 +43,7 @@ public class Zoom2D : MoveRoot
 
     public override bool DoForward()
     {
-        Timer += Time.fixedDeltaTime;
+        Timer += Time.deltaTime;
 
         if (Timer < TempTime)
         {

+ 11 - 6
Assets/Script/Tool/Auxiliary.cs

@@ -133,16 +133,21 @@ public class Auxiliary : Regist
         {
             
         }
-        
+
+        if (Input.GetKeyDown(KeyCode.M))
+        {
+            
+        }
+
         if (Input.GetKeyDown(KeyCode.N))
         {
             //ManaCenter.Coin = 0;
             //ManaCenter.Diamond = 0;
 
-            foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
-            {
-                VARIABLE.Value.Unlock = true;
-            }
+            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+            //{
+            //    VARIABLE.Value.Unlock = true;
+            //}
 
             //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
             //{
@@ -184,7 +189,7 @@ public class Auxiliary : Regist
         {
             ManaMiniGame.Score = 1000;
 
-            ManaSign.SignTime = new DateTime(2007, 1, 1);
+            //ManaSign.SignTime = new DateTime(2007, 1, 1);
         }
 
         if (Input.GetKeyDown(KeyCode.V))

+ 1 - 1
Assets/Script/Tool/UI/HudTarget.cs

@@ -10,7 +10,7 @@ public class HudTarget : MonoBehaviour
 
     #endregion
 
-    private void FixedUpdate()
+    private void Update()
     {
         transform.position = Camera.main.WorldToScreenPoint(PosTra.position);
     }

+ 3 - 3
Assets/Script/Tool/UI/HudText.cs

@@ -42,9 +42,9 @@ public class HudText : Regist
         return false;
     }
 
-    private void FixedUpdate()
+    private void Update()
     {
-        StayTimer -= Time.fixedDeltaTime;
+        StayTimer -= Time.deltaTime;
 
         if (StayTimer < 0)
         {
@@ -56,7 +56,7 @@ public class HudText : Regist
                 Text.TweenForCG();
             }
 
-            transform.position += new Vector3(0, Speed * Time.fixedDeltaTime, 0);
+            transform.position += new Vector3(0, Speed * Time.deltaTime, 0);
         }
     }
 

+ 2 - 2
Assets/Script/Tool/UI/HudTextPlus.cs

@@ -51,11 +51,11 @@ public class HudTextPlus : MonoBehaviour
     }
 
 
-    public void FixedUpdate()
+    public void Update()
     {
         if (MoveMode == Mode.Direction)
         {
-            transform.position += Direction * Speed * Time.fixedDeltaTime;
+            transform.position += Direction * Speed * Time.deltaTime;
         }
     }
 

+ 0 - 1
Assets/Script/Tool/UI/TextPlus.cs

@@ -42,7 +42,6 @@ public class TextPlus : Text
 
     private ImagePlus ImagePlus_;
 
-
     public bool Draw;
     public float LineHeight;
     public VertexHelper ToFill;

+ 2 - 2
Assets/Script/Tool/UI/Toast.cs

@@ -14,11 +14,11 @@ public class Toast : Regist
 
     #endregion
 
-    public void FixedUpdate()
+    public void Update()
     {
         if (On)
         {
-            Timer -= Time.fixedDeltaTime;
+            Timer -= Time.deltaTime;
 
             if (Timer <= 0)
             {

+ 5 - 2
ToList.txt

@@ -1,6 +1,9 @@
-花隐形的bug
+新资源
 
-DragonBone优化
+
+花隐形的bug(小游戏C? 小游戏B?)
+
+CloseUnity的图文混排位置
 
 
 苹果的本地化(在PlayerBuilder中设置)