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

Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

Browse Source
This commit is contained in:
CaiYanPeng 2022-01-26 10:53:46 +08:00
commit c4bcb36356
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab
View File

@ -1332,9 +1332,9 @@ RectTransform:
m_Father: {fileID: 1936946042244182541} m_Father: {fileID: 1936946042244182541}
m_RootOrder: 0 m_RootOrder: 0
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: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 10, y: -14} m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: 0, y: 28} m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &9218960045514105109 --- !u!222 &9218960045514105109
@ -2730,7 +2730,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3} m_Texture: {fileID: 2800000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
m_UVRect: m_UVRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
@ -4313,7 +4313,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: 0, y: 28} m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4547966394363676322 --- !u!222 &4547966394363676322
@ -4420,7 +4420,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: 0, y: 28} m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1116450085117521016 --- !u!222 &1116450085117521016
@ -4670,7 +4670,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: 0, y: 28} m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4886094110349649579 --- !u!222 &4886094110349649579
@ -4777,7 +4777,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 0, y: 16} m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8640525812794733518 --- !u!222 &8640525812794733518
@ -4884,7 +4884,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 0, y: 16} m_SizeDelta: {x: 0, y: 16}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8640525813296669078 --- !u!222 &8640525813296669078

2
Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab
View File

@ -2408,7 +2408,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3} m_Texture: {fileID: 2800000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
m_UVRect: m_UVRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0

2
Assets/Scripts/Scenes/MainController.cs
View File

@ -404,7 +404,7 @@ public class MainController : BaseScene
var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun"; var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(-1, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(-1, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
} }
if (!string.IsNullOrEmpty(item.RouteName)) if (string.IsNullOrEmpty(item.RouteName))
continue; continue;
if (item.RouteId > 0) if (item.RouteId > 0)
{ {