summaryrefslogtreecommitdiff
path: root/Assets/UI_Extension
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/UI_Extension')
-rw-r--r--Assets/UI_Extension/Scripts/Animation/Tween/Demo/TweenDemo.unity22
-rw-r--r--Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs2
2 files changed, 20 insertions, 4 deletions
diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Demo/TweenDemo.unity b/Assets/UI_Extension/Scripts/Animation/Tween/Demo/TweenDemo.unity
index 7d8478d..5f4545f 100644
--- a/Assets/UI_Extension/Scripts/Animation/Tween/Demo/TweenDemo.unity
+++ b/Assets/UI_Extension/Scripts/Animation/Tween/Demo/TweenDemo.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -225,6 +225,7 @@ ParticleSystemRenderer:
m_RendererPriority: 0
m_Materials:
- {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -4990,7 +4991,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.875}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.53686523}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -5061,7 +5062,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.125}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.46313477}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -5505,5 +5506,20 @@ PrefabInstance:
propertyPath: modules.Array.data[1].graphic
value:
objectReference: {fileID: 638242415}
+ - target: {fileID: 2269033645537954357, guid: 1821abac54ca6014d8fff06cff6aff5d,
+ type: 3}
+ propertyPath: animations.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2269033645537954357, guid: 1821abac54ca6014d8fff06cff6aff5d,
+ type: 3}
+ propertyPath: autoPlayOnEnable
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2269033645537954357, guid: 1821abac54ca6014d8fff06cff6aff5d,
+ type: 3}
+ propertyPath: defaultAnimation
+ value: Normal
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1821abac54ca6014d8fff06cff6aff5d, type: 3}
diff --git a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs
index 236a700..aa2ea25 100644
--- a/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs
+++ b/Assets/UI_Extension/Scripts/Animation/Tween/Editor/TweenAnimationInspector.cs
@@ -352,7 +352,7 @@ namespace TweenAnimation
Rect rulerRect = new Rect(5, 5, timelineRect.width - 10, 60);
Rect bgRect = rulerRect;
- EditorGUI.DrawRect(bgRect, new Color(1, 1, 1, 1f) * 0.7f);
+ EditorGUI.DrawRect(bgRect, new Color(1, 1, 1, 1f) * 0.3f);
int rulerWidth = (int)rulerRect.width;
styles.defaultUIMaterail.SetPass(0);