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

Merge branch 'dev_language' into dev_release

Browse Source 
# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
#	Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
This commit is contained in:
Caiyanpeng committed 2021-11-25 10:04:35 +08:00
2 parents 9ff3de1d10 23e5ae6ebd
commit 134dc76ec5
94 files changed
+10234 -2610
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Control/PFUIInputField.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace Assets.Scripts.UI.Control
isSelected = false;
this.mInnerInputField.OnDeselect(eventData);
transform.Find("Placeholder").GetComponent<Text>().text = placeHolderText;
transform.Find("Placeholder").GetComponent<Text>().text = App.GetLocalString(placeHolderText);
//var image = this.transform.GetComponent<Image>();
//var png1 = Resources.Load<Sprite>("Images/ipt-0");
//image.sprite = png1;
Assets/Scripts/UI/Control/PFUIText.cs
+23
View File
@@ -11,6 +11,7 @@ namespace Assets.Scripts.UI.Control
[RequireComponent(typeof(Text))]
public class PFUIText : PFUIComponentBase
{
public string key;
private Text text;
public string Text
@@ -27,6 +28,28 @@ namespace Assets.Scripts.UI.Control
protected void Awake()
{
text = this.transform.GetComponent<Text>();
if (string.IsNullOrEmpty(key))
{
key = text.text;//默认英文内容为key值
}
}
protected void Start()
{
//Debug.Log(text.text);
if (App.LanguageManager != null && App.LanguageManager.ContainsKey(key))
{
//Debug.Log(text.text);
text.text = App.LanguageManager[key];
}
App.ChangeLanguageEvent += App_ChangeLanguageEvent;
}
private void App_ChangeLanguageEvent()
{
if (App.LanguageManager != null && App.LanguageManager.ContainsKey(text.text))
{
text.text = App.LanguageManager[key];
}
}
}
}
Assets/Scripts/UI/Prefab/Confirm.cs
+5 -2
View File
@@ -71,8 +71,8 @@ public class Confirm : PFUIPanel
// return;
//}
//text.text = txt;
_title.Text = title;
_content.Text = content;
_title.Text = App.GetLocalString(title);
_content.Text = App.GetLocalString(content);
_callback = callback;
_cancelCallback = cancelCallback;
}
@@ -85,6 +85,9 @@ public class Confirm : PFUIPanel
ok = "Yes";
cancel = "No";
}
ok = App.GetLocalString(ok);
cancel = App.GetLocalString(cancel);
_ok.transform.Find("Text").GetComponent<Text>().text = ok;
_cancel.transform.Find("Text").GetComponent<Text>().text = cancel;
}
Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
+9 -5
View File
@@ -83,7 +83,7 @@ public class ConnectDeviceModal : PFUIPanel
UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
{
if (!connectBtnText.text.Equals("DISCONNECT"))
if (!connectBtnText.text.Equals(App.GetLocalString("DISCONNECT")))
{
foreach (var item in deviceList)
{
@@ -208,11 +208,13 @@ public class ConnectDeviceModal : PFUIPanel
var nontrainer = deviceItemObj.DeviceInfo.Sensor != SensorType.Trainer && SensorType != SensorType.Trainer && deviceItemObj.DeviceInfo.State == DeviceState.Connected;
if (trainer || nontrainer)
{
connectBtnText.text = "DISCONNECT";
connectBtnText.text = App.GetLocalString("DISCONNECT");
connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
}
else
{
connectBtnText.text = "CONNECT";
connectBtnText.text = App.GetLocalString("CONNECT");
connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
}
foreach (var item in deviceList)
@@ -247,11 +249,13 @@ public class ConnectDeviceModal : PFUIPanel
var nontrainer = firstDevice.DeviceInfo.Sensor != SensorType.Trainer && SensorType != SensorType.Trainer && firstDevice.DeviceInfo.State == DeviceState.Connected;
if(trainer || nontrainer)
{
connectBtnText.text = "DISCONNECT";
connectBtnText.text = App.GetLocalString("DISCONNECT");
connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
}
else
{
connectBtnText.text = "CONNECT";
connectBtnText.text = App.GetLocalString("CONNECT");
connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
}
//connectBtn.text.text = "DISCOUNECT";
noDevice.text = firstDevice.DeviceInfo.Name;
Assets/Scripts/UI/Prefab/Device/DeviceView.cs
+3 -3
View File
@@ -276,8 +276,8 @@ public class DeviceView : MonoBehaviour
connectionPanel.SetActive(false);
logo.sprite = sprite0;
noDevice.text = "NO DEVICE";
searchState.text = "Searching...";
noDevice.text = App.GetLocalString("NO DEVICE");
searchState.text = App.GetLocalString("Searching...");
var hasDevice = false;
if (SensorType == SensorType.SpeedCadence) {
@@ -286,7 +286,7 @@ public class DeviceView : MonoBehaviour
else {
hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
}
Debug.Log(hasDevice);
//Debug.Log(hasDevice);
if (hasDevice)
{
mSearchButton.SetActive(false);
Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs
+3 -2
View File
@@ -54,13 +54,14 @@ namespace Assets.Scripts.UI.Prefab.Login
{
months.Add(new Dropdown.OptionData(m.ToString()));
}
days = new List<Dropdown.OptionData>();
genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData("Male"), new Dropdown.OptionData("FeMale") };
genders = new List<Dropdown.OptionData>() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("FeMale")) };
var countryJson = Resources.Load<TextAsset>("UI/flags-mini").text;
countryList = JsonConvert.DeserializeObject<List<CountryModel>>(countryJson);
countrys = countryList.Select(x => new Dropdown.OptionData(x.country)).ToList();
countryDefaultValue = countryList.FindIndex(x => x.country == "中国");
units = new List<Dropdown.OptionData>() { new Dropdown.OptionData("Metric"), new Dropdown.OptionData("Imperial") };
units = new List<Dropdown.OptionData>() { new Dropdown.OptionData(App.GetLocalString("Metric")), new Dropdown.OptionData(App.GetLocalString("Imperial")) };
}
public Texture GetCountryImage(int index)
{
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" },
Assets/Scripts/UI/Prefab/Panel/EarthController.cs
+1
View File
@@ -128,6 +128,7 @@ public class EarthController : PFUIPanel
map.OnCountryEnter += (int countryIndex, int regionIndex) =>
{
map.autoRotationSpeed = 0f;
var country = map.countries[countryIndex];
if (country.name.ToLower().Contains("taiwan"))
{
Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+1 -1
View File
@@ -175,7 +175,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
mSexDropdown.ClearOptions();
mSexDropdown.AddOptions(new List<string>
{
"Male","Female"
App.GetLocalString("Male"),App.GetLocalString("Female")
});
mUnitDropdown.ClearOptions();
mUnitDropdown.AddOptions(UIManager.Instance.loginRegOptions.units);
Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+3 -1
View File
@@ -226,7 +226,9 @@ public class MapListController : PFUIPanel
drop.value = 0;
drop.onValueChanged.AddListener((int index)=>
{
sort = drop.options[index].text;
var text = drop.options[index].text;
sort = MapFilterOptions.sortsDict[text];
if (sort == "Trend")
{
sort = "Hot";
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
+4 -4
View File
@@ -85,10 +85,10 @@ public class RaceScript : PFUIPanel
var map = currentItem.GetComponent<RaceItemScript>().mapCompetition;
if (map.Status == 1)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start for Registration";
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = App.GetLocalString("Start for Registration");
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Deadline for Registration";
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = App.GetLocalString("Deadline for Registration");
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
map.EndApplyTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
@@ -104,7 +104,7 @@ public class RaceScript : PFUIPanel
}
else if (map.Status == 3)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Start Time";
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = App.GetLocalString("Start Time");
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
}
@@ -132,7 +132,7 @@ public class RaceScript : PFUIPanel
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 1;
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
= map.HasJoin ? "Get Ready" : "Start Time";
= App.GetLocalString(map.HasJoin ? "Get Ready" : "Start Time");
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm");
}