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

Merge branch 'dev_lishuo' into dev_cyp

Browse Source 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
This commit is contained in:
Caiyanpeng committed 2021-11-23 09:51:10 +08:00
2 parents 8c5ad08475 eb9338390c
commit 190a66bb68
89 files changed
+9195 -1628
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/MapList/MapFilterOptions.cs
+16 -5
View File
@@ -9,7 +9,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
{
public class MapFilterOptions
{
public static List<Dropdown.OptionData> distances = new string[] {"All",
public static List<Dropdown.OptionData> distances = new string[] {App.GetLocalString("All"),
"0-5KM",
"5-10KM",
"10-20KM",
@@ -20,7 +20,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
"Over 200KM", }.Select(x=>new Dropdown.OptionData(x)).ToList();
public static Dictionary<string, string> distanceDict = new Dictionary<string, string>()
{
{"All","" },
{App.GetLocalString("All"),"" },
{"0-5KM","0-5" },
{"5-10KM","5-10" },
{"10-20KM","10-20" },
@@ -32,7 +32,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
};
public static Dictionary<string,string> diffDict = new Dictionary<string, string>()
{
{"FLAT","0-100" },
{App.GetLocalString("FLAT"),"0-100" },
{"LV.4","100-250" },
{"LV.3","250-350" },
{"LV.2","350-550" },
@@ -40,11 +40,22 @@ namespace Assets.Scripts.UI.Prefab.MapList
{"HC","750-99999" },
};
public static List<Dropdown.OptionData> sorts = new string[] {
"Near", "Trend","Name","Distance","Difficulty","Time"
App.GetLocalString("Near"), App.GetLocalString("Trend"), App.GetLocalString("Name"), App.GetLocalString("Distance"), App.GetLocalString("Difficulty"), App.GetLocalString("Time")
}.Select(x => new Dropdown.OptionData(x)).ToList();
public static Dictionary<string, string> sortsDict = new Dictionary<string, string>()
{
{App.GetLocalString("Near"),"Near" },
{App.GetLocalString("Trend"),"Trend" },
{App.GetLocalString("Name"),"Name" },
{App.GetLocalString("Distance"),"Distance" },
{App.GetLocalString("Difficulty"),"Difficulty" },
{App.GetLocalString("Time"),"Time" },
};
public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
{
{"FLAT","0-100" },
{App.GetLocalString("FLAT"),"0-100" },
{"LV.4","100-250" },
{"LV.3","250-350" },
{"LV.2","350-550" },