lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_lishuo' into dev

Browse Source
This commit is contained in:
suntao committed 2021-05-20 16:04:54 +08:00
2 parents 09514e2a8a 7ba012f5f2
commit 3e38fd65c2
27 files changed
+6400 -2963
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/ResultList/LocalRouteItem.prefab
+2808
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/ResultList/LocalRouteItem.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 27d66dc2cf0c0944da1bb3dd00e0e721
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/UI/Prefab/Ride/NearbyItem.prefab
+2 -2
View File
@@ -509,8 +509,8 @@ MonoBehaviour:
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.2974442, g: 0.23429158, b: 0.6132076, a: 1}
m_SelectedColor: {r: 0.12415449, g: 0.8490566, b: 0.28121665, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
Assets/Resources/UI/Prefab/Ride/NearbyMajorItem.prefab
+2 -2
View File
@@ -481,8 +481,8 @@ MonoBehaviour:
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.2974442, g: 0.23429158, b: 0.6132076, a: 1}
m_SelectedColor: {r: 0.12415449, g: 0.8490566, b: 0.28121665, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
Assets/Resources/UI/Prefab/Ride/OnlineInfoPanel.prefab
+3 -3
View File
@@ -198,7 +198,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 255, y: 48}
m_SizeDelta: {x: 215, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8877223148509276859
CanvasRenderer:
@@ -381,8 +381,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 141, y: -17.5}
m_SizeDelta: {x: 190, y: 19}
m_AnchoredPosition: {x: 126.09, y: -17.5}
m_SizeDelta: {x: 160.17761, y: 19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8877223148939721184
CanvasRenderer: