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

中文调整

Browse Source
This commit is contained in:
CaiYanPeng 2021-11-23 14:25:36 +08:00
parent 265430053a
commit 23e5ae6ebd
13 changed files with 1865 additions and 1534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Resources/UI/Control/PFUIInputField.prefab
View File

@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8306171861788952873} - component: {fileID: 8306171861788952873}
- component: {fileID: 3566600873913421943} - component: {fileID: 3566600873913421943}
- component: {fileID: 7204820797918493515} - component: {fileID: 7204820797918493515}
- component: {fileID: 3933748842939903915}
m_Layer: 5 m_Layer: 5
m_Name: Placeholder m_Name: Placeholder
m_TagString: Untagged m_TagString: Untagged
@ -78,6 +79,19 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Enter text... m_Text: Enter text...
--- !u!114 &3933748842939903915
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 92744388873403988}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &1827088261433348456 --- !u!1 &1827088261433348456
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -89,6 +103,7 @@ GameObject:
- component: {fileID: 8098460543711191387} - component: {fileID: 8098460543711191387}
- component: {fileID: 2612167359391694885} - component: {fileID: 2612167359391694885}
- component: {fileID: 7511924356665468489} - component: {fileID: 7511924356665468489}
- component: {fileID: 8119156731135992212}
m_Layer: 5 m_Layer: 5
m_Name: Text m_Name: Text
m_TagString: Untagged m_TagString: Untagged
@ -156,6 +171,19 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: m_Text:
--- !u!114 &8119156731135992212
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1827088261433348456}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &4589186191166513557 --- !u!1 &4589186191166513557
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

18
Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab
View File

@ -179,7 +179,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 1 m_MinSize: 1
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -1364,7 +1364,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 1 m_MinSize: 1
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 0 m_Alignment: 1
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -3597,6 +3597,7 @@ GameObject:
- component: {fileID: 5377764333629162855} - component: {fileID: 5377764333629162855}
- component: {fileID: 5377764333629162853} - component: {fileID: 5377764333629162853}
- component: {fileID: 5377764333629162852} - component: {fileID: 5377764333629162852}
- component: {fileID: 6788729204167551342}
m_Layer: 5 m_Layer: 5
m_Name: Text m_Name: Text
m_TagString: Untagged m_TagString: Untagged
@ -3664,6 +3665,19 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Nickname m_Text: Nickname
--- !u!114 &6788729204167551342
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5377764333629162854}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3}
m_Name:
m_EditorClassIdentifier:
key:
--- !u!1 &5377764333894728495 --- !u!1 &5377764333894728495
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

5
Assets/Resources/UI/Prefab/Panel/HomePanel.prefab
View File

@ -1451,6 +1451,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -500 value: -500
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5922912691081905187, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
type: 3}
propertyPath: key
value: More
objectReference: {fileID: 0}
- target: {fileID: 7275502706204060242, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - target: {fileID: 7275502706204060242, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
type: 3} type: 3}
propertyPath: m_Pivot.y propertyPath: m_Pivot.y

854
Assets/Resources/UI/language.json
View File

@ -1,6 +1,5 @@
{ {
"zh": "zh": {
{
"HOT ROUTES": "热门线路", "HOT ROUTES": "热门线路",
"Ride Now": "开始", "Ride Now": "开始",
"Back": "返回", "Back": "返回",
@ -39,224 +38,228 @@
"Warning": "警告", "Warning": "警告",
"Please Connect Device！": "请连接设备", "Please Connect Device！": "请连接设备",
"OK": "好的", "OK": "好的",
"Total Climbed":"累计爬升", "Total Climbed": "累计爬升",
"Other Account":"切换账号", "Other Account": "切换账号",
"Ranking":"排名", "Ranking": "排名",
"Time Limit:":"倒计时：", "Time Limit:": "倒计时：",
"RANK":"排名", "RANK": "排名",
"NAME":"昵称", "NAME": "昵称",
"TIME":"时间", "TIME": "时间",
"TIMER":"骑行时间", "TIMER": "骑行时间",
"GAP":"GAP", "GAP": "GAP",
"WATT":"功率", "WATT": "功率",
"W/KG":"功体比", "W/KG": "功体比",
"HR":"心率", "HR": "心率",
"SOURCE":"设备", "SOURCE": "设备",
"My Time":"骑行时间", "My Time": "骑行时间",
"RANKING":"排名", "RANKING": "排名",
"Join":"报名", "Join": "报名",
"Detail":"查看详情", "Detail": "查看详情",
"Get Ready":"比赛开始倒计时：", "Get Ready": "比赛开始倒计时：",
"Get Ready!":"比赛开始倒计时：", "Get Ready!": "比赛开始倒计时：",
"Sponsor":"主办方", "Sponsor": "主办方",
"more...":"更多...", "more...": "更多...",
"Description":"描述", "Description": "描述",
"Contestants":"参与者", "Contestants": "参与者",
"Time":"时间", "Time": "时间",
"Viewers":"观众", "Viewers": "观众",
"Join Now":"报名", "Join Now": "报名",
"ROUTES":"线路", "ROUTES": "线路",
"MATCH":"赛事", "MATCH": "赛事",
"Found Nothing":"wushuju", "Found Nothing": "wushuju",
"Toast":"Toast", "Toast": "Toast",
"Riders":"骑手", "Riders": "骑手",
"Altitude":"海拔", "Altitude": "海拔",
"Power":"功率", "Power": "功率",
"Cadence":"踏频", "Cadence": "踏频",
"Heart Rate":"心率", "Heart Rate": "心率",
"Speed":"速度", "Speed": "速度",
"Name/ID":"名称", "Name/ID": "名称",
"No":"否", "No": "否",
"Yes":"是", "Yes": "是",
"Enter":"进入", "Enter": "进入",
"Cancel Apply":"取消报名", "Cancel Apply": "取消报名",
"Cancel Reserve":"取消报名", "Cancel Reserve": "取消报名",
"Smart Trainer":"骑行台", "Smart Trainer": "骑行台",
"CONNECT":"连接", "CONNECT": "连接",
"CLOSE":"关闭", "CLOSE": "关闭",
"PAIR":"配对", "PAIR": "配对",
"Searching...":"搜索中...", "Searching...": "搜索中...",
"CHANGE":"更换设备", "CHANGE": "更换设备",
"HOT":"热门", "HOT": "热门",
"INFO":"信息", "INFO": "信息",
"RIDE NOW":"开始骑行", "RIDE NOW": "开始骑行",
"ROUTED":"线路", "ROUTED": "线路",
"TRAINING":"训练", "TRAINING": "训练",
"Search Route":"搜索线路", "Search Route": "搜索线路",
"ANT+ Connected":"ANT+已连接", "ANT+ Connected": "ANT+已连接",
"SEARCH":"搜索", "SEARCH": "搜索",
"UPDATE":"自动更新", "UPDATE": "自动更新",
"Start":"开始", "Start": "开始",
"Establishing connection, please wait...":"正在连接，请稍等...", "Establishing connection, please wait...": "正在连接，请稍等...",
"POWERFUN WORKOUTS":"POWERFUN WORKOUTS", "POWERFUN WORKOUTS": "POWERFUN WORKOUTS",
"Install Now":"立即安装", "Install Now": "立即安装",
"Click Start to download and install PowerFun Workouts,Start the course training experience.":"点击开始按钮开始下载安装PowerFun Workouts,体验课程训练", "Click Start to download and install PowerFun Workouts,Start the course training experience.": "点击开始按钮开始下载安装PowerFun Workouts,体验课程训练",
"Country":"国家", "Country": "国家",
"Province":"省", "Province": "省",
"Total Routes":"总线路数", "Total Routes": "总线路数",
"Recommended Routes":"推荐线路", "Recommended Routes": "推荐线路",
"Total Riders":"总骑行人数", "Total Riders": "总骑行人数",
"Total":"总计", "Total": "总计",
"Change Avatar":"更换头像", "Change Avatar": "更换头像",
"Linked account":"关联账号", "Linked account": "关联账号",
"ID Number":"编号", "ID Number": "编号",
"Nickname":"昵称", "Nickname": "昵称",
"Please enter your nickname":"请输入您的昵称", "Please enter your nickname": "请输入您的昵称",
"Day":"日", "Day": "日",
"Month":"月", "Month": "月",
"Year":"年", "Year": "年",
"Gender":"性别", "Gender": "性别",
"Units":"单位", "Units": "单位",
"FTP":"FTP", "FTP": "FTP",
"Please enter your FTP":"请输入您的FTP", "Please enter your FTP": "请输入您的FTP",
"Weight":"体重", "Weight": "体重",
"Please enter your weight":"请输入您的体重", "Please enter your weight": "请输入您的体重",
"Height":"身高", "Height": "身高",
"Please enter your height":"请输入您的身高", "Please enter your height": "请输入您的身高",
"Max heart rate":"最大心率", "Max heart rate": "最大心率",
"Max Heart Rate":"最大心率", "Max Heart Rate": "最大心率",
"Please enter your MHR":"请输入您的最大心率", "Please enter your MHR": "请输入您的最大心率",
"Bike weight":"车重", "Bike weight": "车重",
"Bike Weight":"车重", "Bike Weight": "车重",
"Please enter your BW":"请输入您的车重", "Please enter your BW": "请输入您的车重",
"Wheel diameter":"轮径", "Wheel diameter": "轮径",
"Wheel Diameter":"轮径", "Wheel Diameter": "轮径",
"Please enter your WD":"请输入您的轮径", "Please enter your WD": "请输入您的轮径",
"DELIVERY INFO":"收货信息", "DELIVERY INFO": "收货信息",
"Please enter your name":"请输入您的收货信息", "Please enter your name": "请输入您的收货信息",
"Phone number":"手机号", "Phone number": "手机号",
"Please enter your phone number":"请输入您的手机号", "Please enter your phone number": "请输入您的手机号",
"Address":"地址", "Address": "地址",
"Please enter your address":"请输入您的地址", "Please enter your address": "请输入您的地址",
"All merchandise prizes will be sent to this address by default":"所有官方奖励将邮寄到你填写的收获地址", "All merchandise prizes will be sent to this address by default": "所有官方奖励将邮寄到你填写的收获地址",
"Change Password":"更改密码", "Change Password": "更改密码",
"FEEDBACK":"意见反馈", "FEEDBACK": "意见反馈",
"Email / Phone Number":"邮箱 / 手机号", "Email / Phone Number": "邮箱 / 手机号",
"ID":"编号", "ID": "编号",
"Version":"版本", "Version": "版本",
"Comments and suggestions":"评论和意见", "Comments and suggestions": "评论和意见",
"We sincerely look forward to receiving your suggestions......":"我们真诚的希望收到您的建议......", "We sincerely look forward to receiving your suggestions......": "我们真诚的希望收到您的建议......",
"Submit":"提交", "Submit": "提交",
"RACE":"赛事", "RACE": "赛事",
"WEIGHT":"体重", "WEIGHT": "体重",
"FTP/KG":"功体比", "FTP/KG": "功体比",
"Total Calories Burned":"累计消耗", "Total Calories Burned": "累计消耗",
"Phone/E-mail":"手机号/邮箱", "Phone/E-mail": "手机号/邮箱",
"Password":"密码", "Password": "密码",
"Login":"登录", "Login": "登录",
"Forget password?":"忘记密码?", "Logout": "注销",
"or you can join with":"或者使用如下账号登录", "Do you want to log out and change accounts?": "您要注销并更改帐户吗？",
"Difficulty":"难度", "Forget password?": "忘记密码?",
"FLAT":"平路", "or you can join with": "或者使用如下账号登录",
"Favorite":"收藏", "Difficulty": "难度",
"Route Name":"线路名称", "FLAT": "平路",
"SETTING":"设置", "Favorite": "收藏",
"NOTIFICATION":"通知", "Route Name": "线路名称",
"GO!":"开始!", "SETTING": "设置",
"Go":"开始", "NOTIFICATION": "通知",
"Stay":"忽略", "GO!": "开始!",
"ALL RACE":"所有赛事", "Go": "开始",
"Status":"状态", "Stay": "忽略",
"All":"所有", "ALL RACE": "所有赛事",
"Not started":"未开始", "Status": "状态",
"In play":"进行中", "All": "所有",
"Done":"结束", "Not started": "未开始",
"Join In":"报名", "In play": "进行中",
"Race Name":"赛事名称", "Done": "结束",
"Total Rides":"总计骑行次数", "Join In": "报名",
"Total Riding Time":"总计骑行时间", "Race Name": "赛事名称",
"times":"次", "Total Rides": "总计骑行次数",
"hours":"h", "Total Riding Time": "总计骑行时间",
"KCAL":"KCAL", "times": "次",
"M":"M", "hours": "h",
"KM":"KM", "KCAL": "KCAL",
"TRAINING DIARY":"骑行记录", "M": "M",
"Downloaded":"下载进度", "KM": "KM",
"Update Now":"立即更新", "TRAINING DIARY": "骑行记录",
"Total Distance":"总里程", "Downloaded": "下载进度",
"Sign In":"登录", "Update Now": "立即更新",
"Sign Up":"注册", "Total Distance": "总里程",
"Remember me":"记住密码", "Sign In": "登录",
"It’s your first login":"这是你第一次登录", "Sign Up": "注册",
"Fill in the information":"填写信息", "Remember me": "记住密码",
"Next":"下一步", "It’s your first login": "这是你第一次登录",
"SIGN UP":"注册", "Fill in the information": "填写信息",
"Verification Code":"验证码", "Next": "下一步",
"Verify":"获取验证码", "SIGN UP": "注册",
"Repeat Password":"重复输入密码", "Verification Code": "验证码",
"LOGIN":"登录", "Verify": "获取验证码",
"Forgot password?":"忘记密码？", "Repeat Password": "重复输入密码",
"Previous":"上一步", "LOGIN": "登录",
"Power Meter":"功率计", "Forgot password?": "忘记密码？",
"Cadence Sensor":"踏频", "Previous": "上一步",
"Speed Meter":"速度计", "Power Meter": "功率计",
"Heart Rate Monitor":"心率带", "Cadence Sensor": "踏频",
"NO DEVICE":"无可用设备", "Speed Meter": "速度计",
"Edit":"编辑", "Heart Rate Monitor": "心率带",
"Record":"骑行记录", "NO DEVICE": "无可用设备",
"More":"更多", "Edit": "编辑",
"Remaining Time":"比赛结束倒计时：", "Record": "骑行记录",
"Time Limit":"关门时间：", "More": "更多",
"Start Time":"比赛开始时间：", "Remaining Time": "比赛结束倒计时：",
"Start for Registration":"报名开始时间", "Time Limit": "关门时间：",
"Deadline for Registration":"报名截止时间", "Start Time": "比赛开始时间：",
"WATTS":"功率", "Start for Registration": "报名开始时间",
"Choose Your Account":"选择一个账号", "Deadline for Registration": "报名截止时间",
"Are you a new to Powerfun?":"新用户?", "WATTS": "功率",
"Account Infomation":"账号信息", "Choose Your Account": "选择一个账号",
"You're almost done.":"马上完成", "Are you a new to Powerfun?": "新用户?",
"Just a little more info to set up your account.":"设置一些额外的账号信息", "Account Infomation": "账号信息",
"Already a member?":"老用户?", "You're almost done.": "马上完成",
"Or you can continue with":"或者使用如下账号登录", "Just a little more info to set up your account.": "设置一些额外的账号信息",
"Not a member?":"还未注册？", "Already a member?": "老用户?",
"RESET PASSWORD":"重置密码", "Or you can continue with": "或者使用如下账号登录",
"Create Race":"创建赛事", "Not a member?": "还未注册？",
"RETURN":"返回", "RESET PASSWORD": "重置密码",
"CHANGE ACCOUNT":"切换账号", "Create Race": "创建赛事",
"DEVICE":"设备", "RETURN": "返回",
"CHANGE ACCOUNT": "切换账号",
"DEVICE": "设备",
"QUIT": "退出", "QUIT": "退出",
"Continue":"继续骑行", "Continue": "继续骑行",
"Ride Again":"重新骑行", "Ride Again": "重新骑行",
"Delete":"删除", "Delete": "删除",
"Ride Route":"骑行线路", "Ride Route": "骑行线路",
"Continue riding?":"继续骑行？", "Continue riding?": "继续骑行？",
"Ride again?":"重新骑行该线路？", "Ride again?": "重新骑行该线路？",
"ReRide":"重新骑行", "ReRide": "重新骑行",
"Delete this record?":"删除这条记录？", "Delete this record?": "删除这条记录？",
"Ride":"骑行", "Ride": "骑行",
"Ride this route?":"在这条线路上骑行？", "Ride this route?": "在这条线路上骑行？",
"HOME":"首页", "HOME": "首页",
"MAP MODE":"地球模式", "MAP MODE": "地球模式",
"Average Slope":"平均坡度", "Average Slope": "平均坡度",
"VIEW":"切换视图", "VIEW": "切换视图",
"SIMPLE":"极简模式", "SIMPLE": "极简模式",
"PAUSE":"暂停", "PAUSE": "暂停",
"Male":"男", "Male": "男",
"Female":"女", "Female": "女",
"Metric":"米", "Metric": "米",
"Imperial":"英寸", "Imperial": "英寸",
"Again":"重新获取", "Again": "重新获取",
"Get":"获取验证码", "Get": "获取验证码",
"Display Units":"单位", "Display Units": "单位",
"Distance":"里程", "Distance": "里程",
"Near":"附近", "Near": "附近",
"Trend":"热门", "Trend": "热门",
"Go to the official website to download?":"去powerfun.com下载Powerfun Workouts？", "Go to the official website to download?": "去powerfun.com下载Powerfun Workouts？",
"Workouts not installed":"Powerfun Workouts 未安装", "Workouts not installed": "Powerfun Workouts 未安装",
"DISCONNECT":"断开连接", "DISCONNECT": "断开连接",
"Switch to PowerFun Workouts?": "切换到运动地球 Workouts？",
"We will close the Powerfun and start PowerFun Workouts.": "即将关闭运动地球，并启动Workouts。",
"Do you want to quit PowerFun?": "您要退出 运动地球 吗？"
}, },
"en": "en": {
{
"HOT ROUTES": "HOT ROUTES", "HOT ROUTES": "HOT ROUTES",
"Ride Now": "Ride Now", "Ride Now": "Ride Now",
"Back": "Back", "Back": "Back",
@ -282,7 +285,7 @@
"Route Mileage": "Route Mileage", "Route Mileage": "Route Mileage",
"Riding Time": "Riding Time", "Riding Time": "Riding Time",
"Riding Distance": "Riding Distance", "Riding Distance": "Riding Distance",
"Total Distance":"Total Distance", "Total Distance": "Total Distance",
"Average Cadence": "Average Cadence", "Average Cadence": "Average Cadence",
"Average Heart Rate": "Average Heart Rate", "Average Heart Rate": "Average Heart Rate",
"Max Power": "Max Power", "Max Power": "Max Power",
@ -295,211 +298,216 @@
"Warning": "Warning", "Warning": "Warning",
"Please Connect Device！": "Please Connect Device！", "Please Connect Device！": "Please Connect Device！",
"OK": "OK", "OK": "OK",
"Total Climbed":"Total Climbed", "Total Climbed": "Total Climbed",
"Other Account":"Other Account", "Other Account": "Other Account",
"Ranking":"Ranking", "Ranking": "Ranking",
"Time Limit:":"Time Limit:", "Time Limit:": "Time Limit:",
"RANK":"RANK", "RANK": "RANK",
"NAME":"NAME", "NAME": "NAME",
"TIME":"TIME", "TIME": "TIME",
"GAP":"GAP", "GAP": "GAP",
"WATT":"WATT", "WATT": "WATT",
"W/KG":"W/KG", "W/KG": "W/KG",
"HR":"HR", "HR": "HR",
"SOURCE":"SOURCE", "SOURCE": "SOURCE",
"Final Score":"Final Score", "Final Score": "Final Score",
"My Time":"My Time", "My Time": "My Time",
"RANKING":"RANKING", "RANKING": "RANKING",
"Join":"Join", "Join": "Join",
"Detail":"Detail", "Detail": "Detail",
"Get Ready":"Get Ready", "Get Ready": "Get Ready",
"Sponsor":"Sponsor", "Sponsor": "Sponsor",
"more...":"more...", "more...": "more...",
"Description":"Description", "Description": "Description",
"Contestants":"Contestants", "Contestants": "Contestants",
"Time":"Time", "Time": "Time",
"Viewers":"Viewers", "Viewers": "Viewers",
"Join Now":"Join Now", "Join Now": "Join Now",
"ROUTES":"ROUTES", "ROUTES": "ROUTES",
"MATCH":"MATCH", "MATCH": "MATCH",
"Found Nothing":"Found Nothing", "Found Nothing": "Found Nothing",
"Toast":"Toast", "Toast": "Toast",
"Riders":"Riders", "Riders": "Riders",
"Altitude":"Altitude", "Altitude": "Altitude",
"Power":"Power", "Power": "Power",
"Cadence":"Cadence", "Cadence": "Cadence",
"Heart Rate":"Heart Rate", "Heart Rate": "Heart Rate",
"Speed":"Speed", "Speed": "Speed",
"Name/ID":"Name/ID", "Name/ID": "Name/ID",
"No":"No", "No": "No",
"Yes":"Yes", "Yes": "Yes",
"Enter":"Enter", "Enter": "Enter",
"Cancel Apply":"Cancel Apply", "Cancel Apply": "Cancel Apply",
"Cancel Reserve":"Cancel Reserve", "Cancel Reserve": "Cancel Reserve",
"Smart Trainer":"Smart Trainer", "Smart Trainer": "Smart Trainer",
"NO DEVICE":"NO DEVICE", "NO DEVICE": "NO DEVICE",
"CONNECT":"CONNECT", "CONNECT": "CONNECT",
"CLOSE":"CLOSE", "CLOSE": "CLOSE",
"PAIR":"PAIR", "PAIR": "PAIR",
"Searching...":"Searching...", "Searching...": "Searching...",
"CHANGE":"CHANGE", "CHANGE": "CHANGE",
"HOT":"HOT", "HOT": "HOT",
"INFO":"INFO", "INFO": "INFO",
"RIDE NOW":"RIDE NOW", "RIDE NOW": "RIDE NOW",
"ROUTED":"ROUTED", "ROUTED": "ROUTED",
"TRAINING":"TRAINING", "TRAINING": "TRAINING",
"Search Route":"Search Route", "Search Route": "Search Route",
"ANT+ Connected":"ANT+ Connected", "ANT+ Connected": "ANT+ Connected",
"SEARCH":"SEARCH", "SEARCH": "SEARCH",
"UPDATE":"UPDATE", "UPDATE": "UPDATE",
"Start":"Start", "Start": "Start",
"Establishing connection, please wait...":"Establishing connection, please wait...", "Establishing connection, please wait...": "Establishing connection, please wait...",
"POWERFUN WORKOUTS":"POWERFUN WORKOUTS", "POWERFUN WORKOUTS": "POWERFUN WORKOUTS",
"Install Now":"Install Now", "Install Now": "Install Now",
"Click Start to download and install PowerFun Workouts,Start the course training experience.":"Click Start to download and install PowerFun Workouts,Start the course training experience.", "Click Start to download and install PowerFun Workouts,Start the course training experience.": "Click Start to download and install PowerFun Workouts,Start the course training experience.",
"Country":"Country", "Country": "Country",
"Province":"Province", "Province": "Province",
"Total Routes":"Total Routes", "Total Routes": "Total Routes",
"Recommended Routes":"Recommended Routes", "Recommended Routes": "Recommended Routes",
"Total Riders":"Total Riders", "Total Riders": "Total Riders",
"Change Avatar":"Change Avatar", "Change Avatar": "Change Avatar",
"Linked account":"Linked account", "Linked account": "Linked account",
"ID Number":"ID Number", "ID Number": "ID Number",
"Nickname":"Nickname", "Nickname": "Nickname",
"Please enter your nickname":"Please enter your nickname", "Please enter your nickname": "Please enter your nickname",
"Day":"Day", "Day": "Day",
"Month":"Month", "Month": "Month",
"Year":"Year", "Year": "Year",
"Gender":"Gender", "Gender": "Gender",
"Units":"Units", "Units": "Units",
"FTP":"Units", "FTP": "Units",
"Please enter your FTP":"Please enter your FTP", "Please enter your FTP": "Please enter your FTP",
"Weight":"Weight", "Weight": "Weight",
"Please enter your weight":"Please enter your weight", "Please enter your weight": "Please enter your weight",
"Height":"Height", "Height": "Height",
"Please enter your height":"Please enter your height", "Please enter your height": "Please enter your height",
"Max heart rate":"Max heart rate", "Max heart rate": "Max heart rate",
"Please enter your MHR":"Please enter your MHR", "Please enter your MHR": "Please enter your MHR",
"Bike weight":"Bike weight", "Bike weight": "Bike weight",
"Please enter your BW":"Please enter your BW", "Please enter your BW": "Please enter your BW",
"Wheel diameter":"Wheel diameter", "Wheel diameter": "Wheel diameter",
"Please enter your WD":"Please enter your WD", "Please enter your WD": "Please enter your WD",
"DELIVERY INFO":"DELIVERY INFO", "DELIVERY INFO": "DELIVERY INFO",
"Please enter your name":"Please enter your name", "Please enter your name": "Please enter your name",
"Phone number":"Phone number", "Phone number": "Phone number",
"Please enter your phone number":"Please enter your phone number", "Please enter your phone number": "Please enter your phone number",
"Address":"Address", "Address": "Address",
"Please enter your address":"Please enter your address", "Please enter your address": "Please enter your address",
"All merchandise prizes will be sent to this address by default":"All merchandise prizes will be sent to this address by default", "All merchandise prizes will be sent to this address by default": "All merchandise prizes will be sent to this address by default",
"Change Password":"Change Password", "Change Password": "Change Password",
"FEEDBACK":"FEEDBACK", "FEEDBACK": "FEEDBACK",
"Email / Phone Number":"Email / Phone Number", "Email / Phone Number": "Email / Phone Number",
"ID":"ID", "ID": "ID",
"Version":"Version", "Version": "Version",
"Comments and suggestions":"Comments and suggestions", "Comments and suggestions": "Comments and suggestions",
"We sincerely look forward to receiving your suggestions......":"We sincerely look forward to receiving your suggestions......", "We sincerely look forward to receiving your suggestions......": "We sincerely look forward to receiving your suggestions......",
"Submit":"Submit", "Submit": "Submit",
"RACE":"RACE", "RACE": "RACE",
"WEIGHT":"WEIGHT", "WEIGHT": "WEIGHT",
"FTP/KG":"FTP/KG", "FTP/KG": "FTP/KG",
"Total Calories Burned":"Total Calories Burned", "Total Calories Burned": "Total Calories Burned",
"Phone/E-mail":"Phone/E-mail", "Phone/E-mail": "Phone/E-mail",
"Password":"Password", "Password": "Password",
"Login":"Login", "Login": "Login",
"Forget password?":"Forget password?", "Logout": "Logout",
"or you can join with":"or you can join with", "Do you want to log out and change accounts?": "Do you want to log out and change accounts?",
"Difficulty":"Difficulty", "Forget password?": "Forget password?",
"FLAT":"FLAT", "or you can join with": "or you can join with",
"Favorite":"Favorite", "Difficulty": "Difficulty",
"Route Name":"Route Name", "FLAT": "FLAT",
"SETTING":"SETTING", "Favorite": "Favorite",
"NOTIFICATION":"NOTIFICATION", "Route Name": "Route Name",
"GO!":"GO!", "SETTING": "SETTING",
"Go":"Go", "NOTIFICATION": "NOTIFICATION",
"Stay":"Stay", "GO!": "GO!",
"ALL RACE":"ALL RACE", "Go": "Go",
"Status":"Status", "Stay": "Stay",
"All":"All", "ALL RACE": "ALL RACE",
"Not started":"Not started", "Status": "Status",
"In play":"In play", "All": "All",
"Done":"Done", "Not started": "Not started",
"Join In":"Join In", "In play": "In play",
"Race Name":"Race Name", "Done": "Done",
"Total Rides":"Total Rides", "Join In": "Join In",
"Total Riding Time":"Total Riding Time", "Race Name": "Race Name",
"times":"times", "Total Rides": "Total Rides",
"hours":"hours", "Total Riding Time": "Total Riding Time",
"KCAL":"KCAL", "times": "times",
"M":"M", "hours": "hours",
"KM":"KM", "KCAL": "KCAL",
"TRAINING DIARY":"TRAINING DIARY", "M": "M",
"Downloaded":"Downloaded", "KM": "KM",
"Update Now":"Update Now", "TRAINING DIARY": "TRAINING DIARY",
"Sign In":"Sign In", "Downloaded": "Downloaded",
"Sign Up":"Sign Up", "Update Now": "Update Now",
"Remember me":"Remember me", "Sign In": "Sign In",
"It’s your first login":"It’s your first login", "Sign Up": "Sign Up",
"Fill in the information":"Fill in the information", "Remember me": "Remember me",
"Next":"Next", "It’s your first login": "It’s your first login",
"SIGN UP":"SIGN UP", "Fill in the information": "Fill in the information",
"Verification Code":"Verification Code", "Next": "Next",
"Verify":"Verify", "SIGN UP": "SIGN UP",
"Repeat Password":"Repeat Password", "Verification Code": "Verification Code",
"LOGIN":"LOGIN", "Verify": "Verify",
"Forgot password?":"Forgot password?", "Repeat Password": "Repeat Password",
"Previous":"Previous", "LOGIN": "LOGIN",
"Power Meter":"Power Meter", "Forgot password?": "Forgot password?",
"Cadence Sensor":"Cadence Sensor", "Previous": "Previous",
"Speed Meter":"Speed Meter", "Power Meter": "Power Meter",
"Heart Rate Monitor":"Heart Rate Monitor", "Cadence Sensor": "Cadence Sensor",
"Edit":"Edit", "Speed Meter": "Speed Meter",
"Record":"Record", "Heart Rate Monitor": "Heart Rate Monitor",
"More":"More", "Edit": "Edit",
"Remaining Time":"Remaining Time", "Record": "Record",
"Time Limit":"Time Limit", "More": "More",
"Start Time":"Start Time", "Remaining Time": "Remaining Time",
"Start for Registration":"Start for Registration", "Time Limit": "Time Limit",
"Deadline for Registration":"Deadline for Registration", "Start Time": "Start Time",
"Total":"Total", "Start for Registration": "Start for Registration",
"Deadline for Registration": "Deadline for Registration",
"Total": "Total",
"Do you want to quit?": "Do you want to quit？", "Do you want to quit?": "Do you want to quit？",
"Get Ready!":"Get Ready!", "Get Ready!": "Get Ready!",
"WATTS":"WATTS", "WATTS": "WATTS",
"Choose Your Account":"Choose Your Account", "Choose Your Account": "Choose Your Account",
"Are you a new to Powerfun?":"Are you a new to Powerfun?", "Are you a new to Powerfun?": "Are you a new to Powerfun?",
"Account Infomation":"Account Infomation", "Account Infomation": "Account Infomation",
"You're almost done.":"You're almost done.", "You're almost done.": "You're almost done.",
"Just a little more info to set up your account.":"Just a little more info to set up your account.", "Just a little more info to set up your account.": "Just a little more info to set up your account.",
"Already a member?":"Already a member?", "Already a member?": "Already a member?",
"Or you can continue with":"Or you can continue with", "Or you can continue with": "Or you can continue with",
"Not a member?":"Not a member?", "Not a member?": "Not a member?",
"RESET PASSWORD":"RESET PASSWORD", "RESET PASSWORD": "RESET PASSWORD",
"Create Race":"Create Race", "Create Race": "Create Race",
"CHANGE ACCOUNT":"CHANGE ACCOUNT", "CHANGE ACCOUNT": "CHANGE ACCOUNT",
"DEVICE":"DEVICE", "DEVICE": "DEVICE",
"QUIT": "QUIT", "QUIT": "QUIT",
"Continue":"Continue", "Continue": "Continue",
"Ride Again":"Ride Again", "Ride Again": "Ride Again",
"Delete":"Delete", "Delete": "Delete",
"Ride Route":"Ride Route", "Ride Route": "Ride Route",
"Ride":"Ride", "Ride": "Ride",
"Ride this route?":"Ride this route?", "Ride this route?": "Ride this route?",
"HOME":"HOME", "HOME": "HOME",
"MAP MODE":"MAP MODE", "MAP MODE": "MAP MODE",
"VIEW":"VIEW", "VIEW": "VIEW",
"SIMPLE":"SIMPLE", "SIMPLE": "SIMPLE",
"PAUSE":"PAUSE", "PAUSE": "PAUSE",
"Male":"Male", "Male": "Male",
"Female":"Female", "Female": "Female",
"Metric":"Metric", "Metric": "Metric",
"Imperial":"Imperial", "Imperial": "Imperial",
"Again":"Again", "Again": "Again",
"Get":"Get", "Get": "Get",
"Display Units":"Display Units", "Display Units": "Display Units",
"Distance":"Distance", "Distance": "Distance",
"Near":"Near", "Near": "Near",
"Trend":"Trend", "Trend": "Trend",
"Go to the official website to download?":"Go to the official website to download?", "Go to the official website to download?": "Go to the official website to download?",
"Workouts not installed":"Workouts not installed", "Workouts not installed": "Workouts not installed",
"DISCONNECT":"DISCONNECT", "DISCONNECT": "DISCONNECT",
"Switch to PowerFun Workouts?": "Switch to PowerFun Workouts?",
"We will close the Powerfun and start PowerFun Workouts.": "We will close the Powerfun and start PowerFun Workouts.",
"Do you want to quit PowerFun?": "Do you want to quit PowerFun?"
} }
} }

2282
Assets/Scenes/Login.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/Apis/ApiBase.cs
View File

@ -103,7 +103,7 @@ namespace Assets.Scripts.Apis
//yield return request.Send(); //yield return request.Send();
var client = new HttpClient(httpClientHandler); var client = new HttpClient(httpClientHandler);
client.DefaultRequestHeaders.Add("Language", "en"); //client.DefaultRequestHeaders.Add("Language", "en");
HandleHeaders(client.DefaultRequestHeaders); HandleHeaders(client.DefaultRequestHeaders);
var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false); var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false);
@ -123,6 +123,8 @@ namespace Assets.Scripts.Apis
defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion)); defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion));
#endif #endif
defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier); defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier);
defaultRequestHeaders.Remove("Language");
defaultRequestHeaders.Add("Language", App.GetLocalLanguage());
} }
protected async Task<byte[]> GetUrlAsync(string url) protected async Task<byte[]> GetUrlAsync(string url)

7
Assets/Scripts/Apis/JsonResult.cs
View File

@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -14,6 +15,10 @@ namespace Assets.Scripts.Apis
//public dynamic data { get; set; } //public dynamic data { get; set; }
public string errMsg { get; set; } public string errMsg { get; set; }
public JArray errFieldMsg { get; set; } public JArray errFieldMsg { get; set; }
public override string ToString()
{
return JsonConvert.SerializeObject(this);
}
} }
public class JsonResult<T> : JsonResult public class JsonResult<T> : JsonResult

4
Assets/Scripts/App.cs
View File

@ -18,7 +18,7 @@ public delegate void ChangeLanguageDelegate();
public static class App public static class App
{ {
public static string Host = "http://192.168.0.102:5082/"; public static string Host = "http://192.168.0.101:5084/";
public static string AppVersion = Application.version; public static string AppVersion = Application.version;
@ -175,7 +175,7 @@ public static class App
{ {
App._IsRowerMode = bool.Parse(isRower); App._IsRowerMode = bool.Parse(isRower);
} }
//App.ChangeLanguage("en");
Screen.sleepTimeout = SleepTimeout.NeverSleep; Screen.sleepTimeout = SleepTimeout.NeverSleep;
Debug.Log(SystemInfo.deviceUniqueIdentifier);
} }
} }

16
Assets/Scripts/Scenes/LoginController.cs
View File

@ -631,6 +631,8 @@ public class LoginController : BaseScene
private void AdjustWxQrCode() private void AdjustWxQrCode()
{ {
#if !(UNITY_IOS || UNITY_ANDROID) #if !(UNITY_IOS || UNITY_ANDROID)
if (App.GetLocalLanguage() == "en")
{
wxBrowser.EvalJSCSP(@" wxBrowser.EvalJSCSP(@"
document.getElementsByClassName('qrcode')[0].style.marginTop = 0; document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
document.getElementsByClassName('title')[0].style.display = 'none'; document.getElementsByClassName('title')[0].style.display = 'none';
@ -640,6 +642,20 @@ public class LoginController : BaseScene
document.body.style.transformOrigin = 'top left'; document.body.style.transformOrigin = 'top left';
document.body.style.transform = 'scale(0.85106382978)'; document.body.style.transform = 'scale(0.85106382978)';
document.body.style.padding = '0';").Done(); document.body.style.padding = '0';").Done();
}
else
{
wxBrowser.EvalJSCSP(@"
document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
document.getElementsByClassName('title')[0].style.display = 'none';
document.getElementById('wx_default_tip').childNodes[1].innerHTML = `请使用微信扫描二维码登录`;
document.body.style.background = '#272732';
document.body.style.overflow = 'hidden';
document.body.style.transformOrigin = 'top left';
document.body.style.transform = 'scale(0.85106382978)';
document.body.style.padding = '0';").Done();
}
#endif #endif
} }
//浏览器加载回调 //浏览器加载回调

4
Assets/Scripts/UI/Control/PFUIText.cs
View File

@ -35,10 +35,10 @@ namespace Assets.Scripts.UI.Control
} }
protected void Start() protected void Start()
{ {
Debug.Log(text.text); //Debug.Log(text.text);
if (App.LanguageManager != null && App.LanguageManager.ContainsKey(key)) if (App.LanguageManager != null && App.LanguageManager.ContainsKey(key))
{ {
Debug.Log(text.text); //Debug.Log(text.text);
text.text = App.LanguageManager[key]; text.text = App.LanguageManager[key];
} }
App.ChangeLanguageEvent += App_ChangeLanguageEvent; App.ChangeLanguageEvent += App_ChangeLanguageEvent;

10
Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
View File

@ -83,7 +83,7 @@ public class ConnectDeviceModal : PFUIPanel
UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => 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) 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; var nontrainer = deviceItemObj.DeviceInfo.Sensor != SensorType.Trainer && SensorType != SensorType.Trainer && deviceItemObj.DeviceInfo.State == DeviceState.Connected;
if (trainer || nontrainer) if (trainer || nontrainer)
{ {
connectBtnText.text = "DISCONNECT"; connectBtnText.text = App.GetLocalString("DISCONNECT");
connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
} }
else else
{ {
connectBtnText.text = "CONNECT"; connectBtnText.text = App.GetLocalString("CONNECT");
connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
} }
foreach (var item in deviceList) foreach (var item in deviceList)
@ -248,10 +250,12 @@ public class ConnectDeviceModal : PFUIPanel
if(trainer || nontrainer) if(trainer || nontrainer)
{ {
connectBtnText.text = App.GetLocalString("DISCONNECT"); connectBtnText.text = App.GetLocalString("DISCONNECT");
connectBtnText.GetComponent<PFUIText>().key = "DISCONNECT";
} }
else else
{ {
connectBtnText.text = App.GetLocalString("CONNECT"); connectBtnText.text = App.GetLocalString("CONNECT");
connectBtnText.GetComponent<PFUIText>().key = "CONNECT";
} }
//connectBtn.text.text = "DISCOUNECT"; //connectBtn.text.text = "DISCOUNECT";
noDevice.text = firstDevice.DeviceInfo.Name; noDevice.text = firstDevice.DeviceInfo.Name;

2
Assets/Scripts/UI/Prefab/Device/DeviceView.cs
View File

@ -286,7 +286,7 @@ public class DeviceView : MonoBehaviour
else { else {
hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType); hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
} }
Debug.Log(hasDevice); //Debug.Log(hasDevice);
if (hasDevice) if (hasDevice)
{ {
mSearchButton.SetActive(false); mSearchButton.SetActive(false);

1
Assets/Scripts/UI/Prefab/Panel/EarthController.cs
View File

@ -128,6 +128,7 @@ public class EarthController : PFUIPanel
map.OnCountryEnter += (int countryIndex, int regionIndex) => map.OnCountryEnter += (int countryIndex, int regionIndex) =>
{ {
map.autoRotationSpeed = 0f; map.autoRotationSpeed = 0f;
var country = map.countries[countryIndex]; var country = map.countries[countryIndex];
if (country.name.ToLower().Contains("taiwan")) if (country.name.ToLower().Contains("taiwan"))
{ {