diff --git a/Assets/Resources/UI/Control/PFUIInputField.prefab b/Assets/Resources/UI/Control/PFUIInputField.prefab index 254b6681..c9661c65 100644 --- a/Assets/Resources/UI/Control/PFUIInputField.prefab +++ b/Assets/Resources/UI/Control/PFUIInputField.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 8306171861788952873} - component: {fileID: 3566600873913421943} - component: {fileID: 7204820797918493515} + - component: {fileID: 3933748842939903915} m_Layer: 5 m_Name: Placeholder m_TagString: Untagged @@ -78,6 +79,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 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 GameObject: m_ObjectHideFlags: 0 @@ -89,6 +103,7 @@ GameObject: - component: {fileID: 8098460543711191387} - component: {fileID: 2612167359391694885} - component: {fileID: 7511924356665468489} + - component: {fileID: 8119156731135992212} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -156,6 +171,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 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 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab index e30ab27d..87222c29 100644 --- a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab @@ -179,7 +179,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1364,7 +1364,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3597,6 +3597,7 @@ GameObject: - component: {fileID: 5377764333629162855} - component: {fileID: 5377764333629162853} - component: {fileID: 5377764333629162852} + - component: {fileID: 6788729204167551342} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3664,6 +3665,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 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 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index 9d7c67eb..9107011b 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -1451,6 +1451,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -500 objectReference: {fileID: 0} + - target: {fileID: 5922912691081905187, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + propertyPath: key + value: More + objectReference: {fileID: 0} - target: {fileID: 7275502706204060242, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} propertyPath: m_Pivot.y diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index e4190141..e72fe248 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -1,505 +1,513 @@ -{ - "zh": - { - "HOT ROUTES": "热门线路", - "Ride Now": "开始", - "Back": "返回", - "Watch": "观看", - "Uploaded By": "线路来源", - "Nearby": "附近的人", - "Shadow Players": "影子选手", - "Single": "单人骑行", - "Add Some Shadow Player": "添加影子选手", - "Add": "添加", - "ADD": "添加", - "Current Slope": "当前坡度", - "join this route !": "加入路线！", - "New Shadow": "添加", - "Name": "名字", - "No Shadow Here": "无数据", - "Cancel": "取消", - "Enter text...": "请输入关键字", - "Quit": "退出", - "Do you want to keep the record?": "保存记录？", - "Do you want to quit?": "你想要退出吗？", - "Save": "保存", - "Discard": "放弃", - "Route Mileage": "总里程", - "Riding Time": "骑行时间", - "Riding Distance": "骑行距离", - "Average Cadence": "平均踏频", - "Average Heart Rate": "平均心率", - "Max Power": "最大功率", - "Average Power": "平均功率", - "Max Speed": "最大速度", - "Average Speed": "平均速度", - "Share to:": "分享至：", - "Well Done": "查看详情", - "Resistance Sensitivity": "阻力灵敏度", - "Warning": "警告", - "Please Connect Device！": "请连接设备", - "OK": "好的", - "Total Climbed":"累计爬升", - "Other Account":"切换账号", - "Ranking":"排名", - "Time Limit:":"倒计时：", - "RANK":"排名", - "NAME":"昵称", - "TIME":"时间", - "TIMER":"骑行时间", - "GAP":"GAP", - "WATT":"功率", - "W/KG":"功体比", - "HR":"心率", - "SOURCE":"设备", - "My Time":"骑行时间", - "RANKING":"排名", - "Join":"报名", - "Detail":"查看详情", - "Get Ready":"比赛开始倒计时：", - "Get Ready!":"比赛开始倒计时：", - "Sponsor":"主办方", - "more...":"更多...", - "Description":"描述", - "Contestants":"参与者", - "Time":"时间", - "Viewers":"观众", - "Join Now":"报名", - "ROUTES":"线路", - "MATCH":"赛事", - "Found Nothing":"wushuju", - "Toast":"Toast", - "Riders":"骑手", - "Altitude":"海拔", - "Power":"功率", - "Cadence":"踏频", - "Heart Rate":"心率", - "Speed":"速度", - "Name/ID":"名称", - "No":"否", - "Yes":"是", - "Enter":"进入", - "Cancel Apply":"取消报名", - "Cancel Reserve":"取消报名", - "Smart Trainer":"骑行台", - "CONNECT":"连接", - "CLOSE":"关闭", - "PAIR":"配对", - "Searching...":"搜索中...", - "CHANGE":"更换设备", - "HOT":"热门", - "INFO":"信息", - "RIDE NOW":"开始骑行", - "ROUTED":"线路", - "TRAINING":"训练", - "Search Route":"搜索线路", - "ANT+ Connected":"ANT+已连接", - "SEARCH":"搜索", - "UPDATE":"自动更新", - "Start":"开始", - "Establishing connection, please wait...":"正在连接，请稍等...", - "POWERFUN WORKOUTS":"POWERFUN WORKOUTS", - "Install Now":"立即安装", - "Click Start to download and install PowerFun Workouts,Start the course training experience.":"点击开始按钮开始下载安装PowerFun Workouts,体验课程训练", - "Country":"国家", - "Province":"省", - "Total Routes":"总线路数", - "Recommended Routes":"推荐线路", - "Total Riders":"总骑行人数", - "Total":"总计", - "Change Avatar":"更换头像", - "Linked account":"关联账号", - "ID Number":"编号", - "Nickname":"昵称", - "Please enter your nickname":"请输入您的昵称", - "Day":"日", - "Month":"月", - "Year":"年", - "Gender":"性别", - "Units":"单位", - "FTP":"FTP", - "Please enter your FTP":"请输入您的FTP", - "Weight":"体重", - "Please enter your weight":"请输入您的体重", - "Height":"身高", - "Please enter your height":"请输入您的身高", - "Max heart rate":"最大心率", - "Max Heart Rate":"最大心率", - "Please enter your MHR":"请输入您的最大心率", - "Bike weight":"车重", - "Bike Weight":"车重", - "Please enter your BW":"请输入您的车重", - "Wheel diameter":"轮径", - "Wheel Diameter":"轮径", - "Please enter your WD":"请输入您的轮径", - "DELIVERY INFO":"收货信息", - "Please enter your name":"请输入您的收货信息", - "Phone number":"手机号", - "Please enter your phone number":"请输入您的手机号", - "Address":"地址", - "Please enter your address":"请输入您的地址", - "All merchandise prizes will be sent to this address by default":"所有官方奖励将邮寄到你填写的收获地址", - "Change Password":"更改密码", - "FEEDBACK":"意见反馈", - "Email / Phone Number":"邮箱 / 手机号", - "ID":"编号", - "Version":"版本", - "Comments and suggestions":"评论和意见", - "We sincerely look forward to receiving your suggestions......":"我们真诚的希望收到您的建议......", - "Submit":"提交", - "RACE":"赛事", - "WEIGHT":"体重", - "FTP/KG":"功体比", - "Total Calories Burned":"累计消耗", - "Phone/E-mail":"手机号/邮箱", - "Password":"密码", - "Login":"登录", - "Forget password?":"忘记密码?", - "or you can join with":"或者使用如下账号登录", - "Difficulty":"难度", - "FLAT":"平路", - "Favorite":"收藏", - "Route Name":"线路名称", - "SETTING":"设置", - "NOTIFICATION":"通知", - "GO!":"开始!", - "Go":"开始", - "Stay":"忽略", - "ALL RACE":"所有赛事", - "Status":"状态", - "All":"所有", - "Not started":"未开始", - "In play":"进行中", - "Done":"结束", - "Join In":"报名", - "Race Name":"赛事名称", - "Total Rides":"总计骑行次数", - "Total Riding Time":"总计骑行时间", - "times":"次", - "hours":"h", - "KCAL":"KCAL", - "M":"M", - "KM":"KM", - "TRAINING DIARY":"骑行记录", - "Downloaded":"下载进度", - "Update Now":"立即更新", - "Total Distance":"总里程", - "Sign In":"登录", - "Sign Up":"注册", - "Remember me":"记住密码", - "It’s your first login":"这是你第一次登录", - "Fill in the information":"填写信息", - "Next":"下一步", - "SIGN UP":"注册", - "Verification Code":"验证码", - "Verify":"获取验证码", - "Repeat Password":"重复输入密码", - "LOGIN":"登录", - "Forgot password?":"忘记密码？", - "Previous":"上一步", - "Power Meter":"功率计", - "Cadence Sensor":"踏频", - "Speed Meter":"速度计", - "Heart Rate Monitor":"心率带", - "NO DEVICE":"无可用设备", - "Edit":"编辑", - "Record":"骑行记录", - "More":"更多", - "Remaining Time":"比赛结束倒计时：", - "Time Limit":"关门时间：", - "Start Time":"比赛开始时间：", - "Start for Registration":"报名开始时间", - "Deadline for Registration":"报名截止时间", - "WATTS":"功率", - "Choose Your Account":"选择一个账号", - "Are you a new to Powerfun?":"新用户?", - "Account Infomation":"账号信息", - "You're almost done.":"马上完成", - "Just a little more info to set up your account.":"设置一些额外的账号信息", - "Already a member?":"老用户?", - "Or you can continue with":"或者使用如下账号登录", - "Not a member?":"还未注册？", - "RESET PASSWORD":"重置密码", - "Create Race":"创建赛事", - "RETURN":"返回", - "CHANGE ACCOUNT":"切换账号", - "DEVICE":"设备", - "QUIT": "退出", - "Continue":"继续骑行", - "Ride Again":"重新骑行", - "Delete":"删除", - "Ride Route":"骑行线路", - "Continue riding?":"继续骑行？", - "Ride again?":"重新骑行该线路？", - "ReRide":"重新骑行", - "Delete this record?":"删除这条记录？", - "Ride":"骑行", - "Ride this route?":"在这条线路上骑行？", - "HOME":"首页", - "MAP MODE":"地球模式", - "Average Slope":"平均坡度", - "VIEW":"切换视图", - "SIMPLE":"极简模式", - "PAUSE":"暂停", - "Male":"男", - "Female":"女", - "Metric":"米", - "Imperial":"英寸", - "Again":"重新获取", - "Get":"获取验证码", - "Display Units":"单位", - "Distance":"里程", - "Near":"附近", - "Trend":"热门", - "Go to the official website to download?":"去powerfun.com下载Powerfun Workouts？", - "Workouts not installed":"Powerfun Workouts 未安装", - "DISCONNECT":"断开连接", - }, - "en": - { - "HOT ROUTES": "HOT ROUTES", - "Ride Now": "Ride Now", - "Back": "Back", - "Watch": "Watch", - "Uploaded By": "Uploaded By", - "Nearby": "Nearby", - "Shadow Players": "Shadow Players", - "Single": "Single", - "Add Some Shadow Player": "Add Some Shadow Player", - "Add": "Add", - "ADD": "ADD", - "Current Slope": "Current Slope", - "join this route !": "join this route !", - "New Shadow": "New Shadow", - "Name": "Name", - "No Shadow Here": "No Shadow Here", - "Cancel": "Cancel", - "Enter text...": "Enter text...", - "Quit": "Quit", - "Do you want to keep the record?": "Do you want to keep the record?", - "Save": "Save", - "Discard": "Discard", - "Route Mileage": "Route Mileage", - "Riding Time": "Riding Time", - "Riding Distance": "Riding Distance", - "Total Distance":"Total Distance", - "Average Cadence": "Average Cadence", - "Average Heart Rate": "Average Heart Rate", - "Max Power": "Max Power", - "Average Power": "Average Power", - "Max Speed": "Max Speed", - "Average Speed": "Average Speed", - "Share to:": "Share to:", - "Well Done": "Well Done", - "Resistance Sensitivity": "Resistance Sensitivity", - "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", - "GAP":"GAP", - "WATT":"WATT", - "W/KG":"W/KG", - "HR":"HR", - "SOURCE":"SOURCE", - "Final Score":"Final Score", - "My Time":"My Time", - "RANKING":"RANKING", - "Join":"Join", - "Detail":"Detail", - "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":"Found Nothing", - "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", - "NO DEVICE":"NO DEVICE", - "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+ Connected", - "SEARCH":"SEARCH", - "UPDATE":"UPDATE", - "Start":"Start", - "Establishing connection, please wait...":"Establishing connection, please wait...", - "POWERFUN WORKOUTS":"POWERFUN WORKOUTS", - "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.", - "Country":"Country", - "Province":"Province", - "Total Routes":"Total Routes", - "Recommended Routes":"Recommended Routes", - "Total Riders":"Total Riders", - "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":"Units", - "Please enter your FTP":"Please enter your 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", - "Please enter your MHR":"Please enter your MHR", - "Bike weight":"Bike weight", - "Please enter your BW":"Please enter your BW", - "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?":"Forget password?", - "or you can join with":"or you can join with", - "Difficulty":"Difficulty", - "FLAT":"FLAT", - "Favorite":"Favorite", - "Route Name":"Route Name", - "SETTING":"SETTING", - "NOTIFICATION":"NOTIFICATION", - "GO!":"GO!", - "Go":"Go", - "Stay":"Stay", - "ALL RACE":"ALL RACE", - "Status":"Status", - "All":"All", - "Not started":"Not started", - "In play":"In play", - "Done":"Done", - "Join In":"Join In", - "Race Name":"Race Name", - "Total Rides":"Total Rides", - "Total Riding Time":"Total Riding Time", - "times":"times", - "hours":"hours", - "KCAL":"KCAL", - "M":"M", - "KM":"KM", - "TRAINING DIARY":"TRAINING DIARY", - "Downloaded":"Downloaded", - "Update Now":"Update Now", - "Sign In":"Sign In", - "Sign Up":"Sign Up", - "Remember me":"Remember me", - "It’s your first login":"It’s your first login", - "Fill in the information":"Fill in the information", - "Next":"Next", - "SIGN UP":"SIGN UP", - "Verification Code":"Verification Code", - "Verify":"Verify", - "Repeat Password":"Repeat Password", - "LOGIN":"LOGIN", - "Forgot password?":"Forgot password?", - "Previous":"Previous", - "Power Meter":"Power Meter", - "Cadence Sensor":"Cadence Sensor", - "Speed Meter":"Speed Meter", - "Heart Rate Monitor":"Heart Rate Monitor", - "Edit":"Edit", - "Record":"Record", - "More":"More", - "Remaining Time":"Remaining Time", - "Time Limit":"Time Limit", - "Start Time":"Start Time", - "Start for Registration":"Start for Registration", - "Deadline for Registration":"Deadline for Registration", - "Total":"Total", - "Do you want to quit?": "Do you want to quit？", - "Get Ready!":"Get Ready!", - "WATTS":"WATTS", - "Choose Your Account":"Choose Your Account", - "Are you a new to Powerfun?":"Are you a new to Powerfun?", - "Account Infomation":"Account Infomation", - "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.", - "Already a member?":"Already a member?", - "Or you can continue with":"Or you can continue with", - "Not a member?":"Not a member?", - "RESET PASSWORD":"RESET PASSWORD", - "Create Race":"Create Race", - "CHANGE ACCOUNT":"CHANGE ACCOUNT", - "DEVICE":"DEVICE", - "QUIT": "QUIT", - "Continue":"Continue", - "Ride Again":"Ride Again", - "Delete":"Delete", - "Ride Route":"Ride Route", - "Ride":"Ride", - "Ride this route?":"Ride this route?", - "HOME":"HOME", - "MAP MODE":"MAP MODE", - "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?":"Go to the official website to download?", - "Workouts not installed":"Workouts not installed", - "DISCONNECT":"DISCONNECT", - } +{ + "zh": { + "HOT ROUTES": "热门线路", + "Ride Now": "开始", + "Back": "返回", + "Watch": "观看", + "Uploaded By": "线路来源", + "Nearby": "附近的人", + "Shadow Players": "影子选手", + "Single": "单人骑行", + "Add Some Shadow Player": "添加影子选手", + "Add": "添加", + "ADD": "添加", + "Current Slope": "当前坡度", + "join this route !": "加入路线！", + "New Shadow": "添加", + "Name": "名字", + "No Shadow Here": "无数据", + "Cancel": "取消", + "Enter text...": "请输入关键字", + "Quit": "退出", + "Do you want to keep the record?": "保存记录？", + "Do you want to quit?": "你想要退出吗？", + "Save": "保存", + "Discard": "放弃", + "Route Mileage": "总里程", + "Riding Time": "骑行时间", + "Riding Distance": "骑行距离", + "Average Cadence": "平均踏频", + "Average Heart Rate": "平均心率", + "Max Power": "最大功率", + "Average Power": "平均功率", + "Max Speed": "最大速度", + "Average Speed": "平均速度", + "Share to:": "分享至：", + "Well Done": "查看详情", + "Resistance Sensitivity": "阻力灵敏度", + "Warning": "警告", + "Please Connect Device！": "请连接设备", + "OK": "好的", + "Total Climbed": "累计爬升", + "Other Account": "切换账号", + "Ranking": "排名", + "Time Limit:": "倒计时：", + "RANK": "排名", + "NAME": "昵称", + "TIME": "时间", + "TIMER": "骑行时间", + "GAP": "GAP", + "WATT": "功率", + "W/KG": "功体比", + "HR": "心率", + "SOURCE": "设备", + "My Time": "骑行时间", + "RANKING": "排名", + "Join": "报名", + "Detail": "查看详情", + "Get Ready": "比赛开始倒计时：", + "Get Ready!": "比赛开始倒计时：", + "Sponsor": "主办方", + "more...": "更多...", + "Description": "描述", + "Contestants": "参与者", + "Time": "时间", + "Viewers": "观众", + "Join Now": "报名", + "ROUTES": "线路", + "MATCH": "赛事", + "Found Nothing": "wushuju", + "Toast": "Toast", + "Riders": "骑手", + "Altitude": "海拔", + "Power": "功率", + "Cadence": "踏频", + "Heart Rate": "心率", + "Speed": "速度", + "Name/ID": "名称", + "No": "否", + "Yes": "是", + "Enter": "进入", + "Cancel Apply": "取消报名", + "Cancel Reserve": "取消报名", + "Smart Trainer": "骑行台", + "CONNECT": "连接", + "CLOSE": "关闭", + "PAIR": "配对", + "Searching...": "搜索中...", + "CHANGE": "更换设备", + "HOT": "热门", + "INFO": "信息", + "RIDE NOW": "开始骑行", + "ROUTED": "线路", + "TRAINING": "训练", + "Search Route": "搜索线路", + "ANT+ Connected": "ANT+已连接", + "SEARCH": "搜索", + "UPDATE": "自动更新", + "Start": "开始", + "Establishing connection, please wait...": "正在连接，请稍等...", + "POWERFUN WORKOUTS": "POWERFUN WORKOUTS", + "Install Now": "立即安装", + "Click Start to download and install PowerFun Workouts,Start the course training experience.": "点击开始按钮开始下载安装PowerFun Workouts,体验课程训练", + "Country": "国家", + "Province": "省", + "Total Routes": "总线路数", + "Recommended Routes": "推荐线路", + "Total Riders": "总骑行人数", + "Total": "总计", + "Change Avatar": "更换头像", + "Linked account": "关联账号", + "ID Number": "编号", + "Nickname": "昵称", + "Please enter your nickname": "请输入您的昵称", + "Day": "日", + "Month": "月", + "Year": "年", + "Gender": "性别", + "Units": "单位", + "FTP": "FTP", + "Please enter your FTP": "请输入您的FTP", + "Weight": "体重", + "Please enter your weight": "请输入您的体重", + "Height": "身高", + "Please enter your height": "请输入您的身高", + "Max heart rate": "最大心率", + "Max Heart Rate": "最大心率", + "Please enter your MHR": "请输入您的最大心率", + "Bike weight": "车重", + "Bike Weight": "车重", + "Please enter your BW": "请输入您的车重", + "Wheel diameter": "轮径", + "Wheel Diameter": "轮径", + "Please enter your WD": "请输入您的轮径", + "DELIVERY INFO": "收货信息", + "Please enter your name": "请输入您的收货信息", + "Phone number": "手机号", + "Please enter your phone number": "请输入您的手机号", + "Address": "地址", + "Please enter your address": "请输入您的地址", + "All merchandise prizes will be sent to this address by default": "所有官方奖励将邮寄到你填写的收获地址", + "Change Password": "更改密码", + "FEEDBACK": "意见反馈", + "Email / Phone Number": "邮箱 / 手机号", + "ID": "编号", + "Version": "版本", + "Comments and suggestions": "评论和意见", + "We sincerely look forward to receiving your suggestions......": "我们真诚的希望收到您的建议......", + "Submit": "提交", + "RACE": "赛事", + "WEIGHT": "体重", + "FTP/KG": "功体比", + "Total Calories Burned": "累计消耗", + "Phone/E-mail": "手机号/邮箱", + "Password": "密码", + "Login": "登录", + "Logout": "注销", + "Do you want to log out and change accounts?": "您要注销并更改帐户吗？", + "Forget password?": "忘记密码?", + "or you can join with": "或者使用如下账号登录", + "Difficulty": "难度", + "FLAT": "平路", + "Favorite": "收藏", + "Route Name": "线路名称", + "SETTING": "设置", + "NOTIFICATION": "通知", + "GO!": "开始!", + "Go": "开始", + "Stay": "忽略", + "ALL RACE": "所有赛事", + "Status": "状态", + "All": "所有", + "Not started": "未开始", + "In play": "进行中", + "Done": "结束", + "Join In": "报名", + "Race Name": "赛事名称", + "Total Rides": "总计骑行次数", + "Total Riding Time": "总计骑行时间", + "times": "次", + "hours": "h", + "KCAL": "KCAL", + "M": "M", + "KM": "KM", + "TRAINING DIARY": "骑行记录", + "Downloaded": "下载进度", + "Update Now": "立即更新", + "Total Distance": "总里程", + "Sign In": "登录", + "Sign Up": "注册", + "Remember me": "记住密码", + "It’s your first login": "这是你第一次登录", + "Fill in the information": "填写信息", + "Next": "下一步", + "SIGN UP": "注册", + "Verification Code": "验证码", + "Verify": "获取验证码", + "Repeat Password": "重复输入密码", + "LOGIN": "登录", + "Forgot password?": "忘记密码？", + "Previous": "上一步", + "Power Meter": "功率计", + "Cadence Sensor": "踏频", + "Speed Meter": "速度计", + "Heart Rate Monitor": "心率带", + "NO DEVICE": "无可用设备", + "Edit": "编辑", + "Record": "骑行记录", + "More": "更多", + "Remaining Time": "比赛结束倒计时：", + "Time Limit": "关门时间：", + "Start Time": "比赛开始时间：", + "Start for Registration": "报名开始时间", + "Deadline for Registration": "报名截止时间", + "WATTS": "功率", + "Choose Your Account": "选择一个账号", + "Are you a new to Powerfun?": "新用户?", + "Account Infomation": "账号信息", + "You're almost done.": "马上完成", + "Just a little more info to set up your account.": "设置一些额外的账号信息", + "Already a member?": "老用户?", + "Or you can continue with": "或者使用如下账号登录", + "Not a member?": "还未注册？", + "RESET PASSWORD": "重置密码", + "Create Race": "创建赛事", + "RETURN": "返回", + "CHANGE ACCOUNT": "切换账号", + "DEVICE": "设备", + "QUIT": "退出", + "Continue": "继续骑行", + "Ride Again": "重新骑行", + "Delete": "删除", + "Ride Route": "骑行线路", + "Continue riding?": "继续骑行？", + "Ride again?": "重新骑行该线路？", + "ReRide": "重新骑行", + "Delete this record?": "删除这条记录？", + "Ride": "骑行", + "Ride this route?": "在这条线路上骑行？", + "HOME": "首页", + "MAP MODE": "地球模式", + "Average Slope": "平均坡度", + "VIEW": "切换视图", + "SIMPLE": "极简模式", + "PAUSE": "暂停", + "Male": "男", + "Female": "女", + "Metric": "米", + "Imperial": "英寸", + "Again": "重新获取", + "Get": "获取验证码", + "Display Units": "单位", + "Distance": "里程", + "Near": "附近", + "Trend": "热门", + "Go to the official website to download?": "去powerfun.com下载Powerfun Workouts？", + "Workouts not installed": "Powerfun Workouts 未安装", + "DISCONNECT": "断开连接", + "Switch to PowerFun Workouts?": "切换到运动地球 Workouts？", + "We will close the Powerfun and start PowerFun Workouts.": "即将关闭运动地球，并启动Workouts。", + "Do you want to quit PowerFun?": "您要退出 运动地球 吗？" + }, + "en": { + "HOT ROUTES": "HOT ROUTES", + "Ride Now": "Ride Now", + "Back": "Back", + "Watch": "Watch", + "Uploaded By": "Uploaded By", + "Nearby": "Nearby", + "Shadow Players": "Shadow Players", + "Single": "Single", + "Add Some Shadow Player": "Add Some Shadow Player", + "Add": "Add", + "ADD": "ADD", + "Current Slope": "Current Slope", + "join this route !": "join this route !", + "New Shadow": "New Shadow", + "Name": "Name", + "No Shadow Here": "No Shadow Here", + "Cancel": "Cancel", + "Enter text...": "Enter text...", + "Quit": "Quit", + "Do you want to keep the record?": "Do you want to keep the record?", + "Save": "Save", + "Discard": "Discard", + "Route Mileage": "Route Mileage", + "Riding Time": "Riding Time", + "Riding Distance": "Riding Distance", + "Total Distance": "Total Distance", + "Average Cadence": "Average Cadence", + "Average Heart Rate": "Average Heart Rate", + "Max Power": "Max Power", + "Average Power": "Average Power", + "Max Speed": "Max Speed", + "Average Speed": "Average Speed", + "Share to:": "Share to:", + "Well Done": "Well Done", + "Resistance Sensitivity": "Resistance Sensitivity", + "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", + "GAP": "GAP", + "WATT": "WATT", + "W/KG": "W/KG", + "HR": "HR", + "SOURCE": "SOURCE", + "Final Score": "Final Score", + "My Time": "My Time", + "RANKING": "RANKING", + "Join": "Join", + "Detail": "Detail", + "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": "Found Nothing", + "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", + "NO DEVICE": "NO DEVICE", + "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+ Connected", + "SEARCH": "SEARCH", + "UPDATE": "UPDATE", + "Start": "Start", + "Establishing connection, please wait...": "Establishing connection, please wait...", + "POWERFUN WORKOUTS": "POWERFUN WORKOUTS", + "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.", + "Country": "Country", + "Province": "Province", + "Total Routes": "Total Routes", + "Recommended Routes": "Recommended Routes", + "Total Riders": "Total Riders", + "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": "Units", + "Please enter your FTP": "Please enter your 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", + "Please enter your MHR": "Please enter your MHR", + "Bike weight": "Bike weight", + "Please enter your BW": "Please enter your BW", + "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", + "Logout": "Logout", + "Do you want to log out and change accounts?": "Do you want to log out and change accounts?", + "Forget password?": "Forget password?", + "or you can join with": "or you can join with", + "Difficulty": "Difficulty", + "FLAT": "FLAT", + "Favorite": "Favorite", + "Route Name": "Route Name", + "SETTING": "SETTING", + "NOTIFICATION": "NOTIFICATION", + "GO!": "GO!", + "Go": "Go", + "Stay": "Stay", + "ALL RACE": "ALL RACE", + "Status": "Status", + "All": "All", + "Not started": "Not started", + "In play": "In play", + "Done": "Done", + "Join In": "Join In", + "Race Name": "Race Name", + "Total Rides": "Total Rides", + "Total Riding Time": "Total Riding Time", + "times": "times", + "hours": "hours", + "KCAL": "KCAL", + "M": "M", + "KM": "KM", + "TRAINING DIARY": "TRAINING DIARY", + "Downloaded": "Downloaded", + "Update Now": "Update Now", + "Sign In": "Sign In", + "Sign Up": "Sign Up", + "Remember me": "Remember me", + "It’s your first login": "It’s your first login", + "Fill in the information": "Fill in the information", + "Next": "Next", + "SIGN UP": "SIGN UP", + "Verification Code": "Verification Code", + "Verify": "Verify", + "Repeat Password": "Repeat Password", + "LOGIN": "LOGIN", + "Forgot password?": "Forgot password?", + "Previous": "Previous", + "Power Meter": "Power Meter", + "Cadence Sensor": "Cadence Sensor", + "Speed Meter": "Speed Meter", + "Heart Rate Monitor": "Heart Rate Monitor", + "Edit": "Edit", + "Record": "Record", + "More": "More", + "Remaining Time": "Remaining Time", + "Time Limit": "Time Limit", + "Start Time": "Start Time", + "Start for Registration": "Start for Registration", + "Deadline for Registration": "Deadline for Registration", + "Total": "Total", + "Do you want to quit?": "Do you want to quit？", + "Get Ready!": "Get Ready!", + "WATTS": "WATTS", + "Choose Your Account": "Choose Your Account", + "Are you a new to Powerfun?": "Are you a new to Powerfun?", + "Account Infomation": "Account Infomation", + "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.", + "Already a member?": "Already a member?", + "Or you can continue with": "Or you can continue with", + "Not a member?": "Not a member?", + "RESET PASSWORD": "RESET PASSWORD", + "Create Race": "Create Race", + "CHANGE ACCOUNT": "CHANGE ACCOUNT", + "DEVICE": "DEVICE", + "QUIT": "QUIT", + "Continue": "Continue", + "Ride Again": "Ride Again", + "Delete": "Delete", + "Ride Route": "Ride Route", + "Ride": "Ride", + "Ride this route?": "Ride this route?", + "HOME": "HOME", + "MAP MODE": "MAP MODE", + "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?": "Go to the official website to download?", + "Workouts not installed": "Workouts not installed", + "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?" + } } \ No newline at end of file diff --git a/Assets/Scenes/Login.unity b/Assets/Scenes/Login.unity index 57c6575e..9842ca83 100644 --- a/Assets/Scenes/Login.unity +++ b/Assets/Scenes/Login.unity @@ -366,7 +366,81 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 23459890} m_PrefabAsset: {fileID: 0} ---- !u!21 &27103335 +--- !u!1 &42104466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 42104467} + - component: {fileID: 42104469} + - component: {fileID: 42104468} + m_Layer: 5 + m_Name: Line1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &42104467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42104466} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 567535512} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -461} + m_SizeDelta: {x: 320, y: 1} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &42104468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42104466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &42104469 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 42104466} + m_CullTransparentMesh: 0 +--- !u!21 &52155448 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -451,81 +525,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} ---- !u!1 &42104466 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 42104467} - - component: {fileID: 42104469} - - component: {fileID: 42104468} - m_Layer: 5 - m_Name: Line1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &42104467 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 42104466} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 567535512} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -461} - m_SizeDelta: {x: 320, y: 1} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &42104468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 42104466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &42104469 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 42104466} - m_CullTransparentMesh: 0 + - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} --- !u!1 &53318763 GameObject: m_ObjectHideFlags: 0 @@ -995,7 +995,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 584079735} + m_Material: {fileID: 225368564} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -1083,7 +1083,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1816309597} + m_Material: {fileID: 1486849194} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 0 @@ -1132,6 +1132,7 @@ GameObject: - component: {fileID: 111977415} - component: {fileID: 111977417} - component: {fileID: 111977416} + - component: {fileID: 111977418} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1199,6 +1200,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111977414} m_CullTransparentMesh: 0 +--- !u!114 &111977418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111977414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1001 &139200882 PrefabInstance: m_ObjectHideFlags: 0 @@ -1554,7 +1568,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 199358470} m_PrefabAsset: {fileID: 0} ---- !u!21 &231574217 +--- !u!21 &225368564 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -1639,7 +1653,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} + - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} --- !u!1 &248120061 GameObject: m_ObjectHideFlags: 0 @@ -1651,6 +1665,7 @@ GameObject: - component: {fileID: 248120062} - component: {fileID: 248120064} - component: {fileID: 248120063} + - component: {fileID: 248120065} m_Layer: 5 m_Name: Info-title m_TagString: Untagged @@ -1718,6 +1733,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248120061} m_CullTransparentMesh: 0 +--- !u!114 &248120065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 248120061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!21 &252053013 Material: serializedVersion: 6 @@ -1894,6 +1922,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260522527} m_CullTransparentMesh: 0 +--- !u!21 &295925195 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} --- !u!1 &303335966 GameObject: m_ObjectHideFlags: 0 @@ -1980,6 +2094,7 @@ GameObject: - component: {fileID: 359271458} - component: {fileID: 359271460} - component: {fileID: 359271459} + - component: {fileID: 359271461} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -2047,6 +2162,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 359271457} m_CullTransparentMesh: 0 +--- !u!114 &359271461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359271457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &372638126 GameObject: m_ObjectHideFlags: 0 @@ -2369,92 +2497,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 386526920} m_PrefabAsset: {fileID: 0} ---- !u!21 &393015578 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 0, b: 60, a: 0} --- !u!21 &393649370 Material: serializedVersion: 6 @@ -2694,7 +2736,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1638162698} + m_Material: {fileID: 1231480445} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -2716,7 +2758,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 426271702} m_CullTransparentMesh: 0 ---- !u!21 &431527905 +--- !u!21 &435024097 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -2801,7 +2843,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} + - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!1001 &438221681 PrefabInstance: m_ObjectHideFlags: 0 @@ -3215,7 +3257,13 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 40, g: 34, b: 34, a: 0} ---- !u!21 &511648306 +--- !u!224 &511656224 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 661484772} + m_PrefabAsset: {fileID: 0} +--- !u!21 &531861132 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -3300,13 +3348,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} ---- !u!224 &511656224 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - type: 3} - m_PrefabInstance: {fileID: 661484772} - m_PrefabAsset: {fileID: 0} + - _WidthHeightRadius: {r: 120, g: 120, b: 120, a: 0} --- !u!21 &554553437 Material: serializedVersion: 6 @@ -3461,7 +3503,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2101559183} + m_Material: {fileID: 1540841876} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -3486,92 +3528,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567535511} m_CullTransparentMesh: 0 ---- !u!21 &584079735 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} --- !u!1001 &605095745 PrefabInstance: m_ObjectHideFlags: 0 @@ -3887,92 +3843,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 608756976} m_PrefabAsset: {fileID: 0} ---- !u!21 &640368274 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!1 &647248200 GameObject: m_ObjectHideFlags: 0 @@ -4073,6 +3943,7 @@ GameObject: - component: {fileID: 657523256} - component: {fileID: 657523258} - component: {fileID: 657523257} + - component: {fileID: 657523259} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4140,6 +4011,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 657523255} m_CullTransparentMesh: 0 +--- !u!114 &657523259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 657523255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1001 &661484772 PrefabInstance: m_ObjectHideFlags: 0 @@ -4321,6 +4205,7 @@ GameObject: - component: {fileID: 665723269} - component: {fileID: 665723271} - component: {fileID: 665723270} + - component: {fileID: 665723272} m_Layer: 5 m_Name: signText m_TagString: Untagged @@ -4388,6 +4273,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 665723268} m_CullTransparentMesh: 0 +--- !u!114 &665723272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665723268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!21 &678027997 Material: serializedVersion: 6 @@ -4485,6 +4383,7 @@ GameObject: - component: {fileID: 685738579} - component: {fileID: 685738581} - component: {fileID: 685738580} + - component: {fileID: 685738582} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -4552,6 +4451,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 685738578} m_CullTransparentMesh: 0 +--- !u!114 &685738582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 685738578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!21 &687300802 Material: serializedVersion: 6 @@ -4778,7 +4690,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704704647} m_CullTransparentMesh: 0 ---- !u!21 &712909509 +--- !u!21 &723855475 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -4863,7 +4775,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} + - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} --- !u!1 &726890181 GameObject: m_ObjectHideFlags: 0 @@ -4875,6 +4787,7 @@ GameObject: - component: {fileID: 726890182} - component: {fileID: 726890184} - component: {fileID: 726890183} + - component: {fileID: 726890185} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4942,7 +4855,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726890181} m_CullTransparentMesh: 0 ---- !u!21 &753078120 +--- !u!114 &726890185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 726890181} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!21 &738687090 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -5028,6 +4954,92 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} +--- !u!21 &741446786 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} --- !u!1 &756711464 GameObject: m_ObjectHideFlags: 0 @@ -5099,7 +5111,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 712909509} + m_Material: {fileID: 295925195} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -5124,6 +5136,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756711464} m_CullTransparentMesh: 0 +--- !u!21 &775637094 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} --- !u!1 &804258766 GameObject: m_ObjectHideFlags: 0 @@ -5135,6 +5233,7 @@ GameObject: - component: {fileID: 804258767} - component: {fileID: 804258769} - component: {fileID: 804258768} + - component: {fileID: 804258770} m_Layer: 5 m_Name: otherLogText (1) m_TagString: Untagged @@ -5202,6 +5301,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804258766} m_CullTransparentMesh: 0 +--- !u!114 &804258770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 804258766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &828967545 GameObject: m_ObjectHideFlags: 0 @@ -5452,6 +5564,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6843030710554625779, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: key + value: QUIT + objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: mType @@ -5562,6 +5679,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 885308276} m_CullTransparentMesh: 0 +--- !u!21 &894366562 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} --- !u!1 &906657265 GameObject: m_ObjectHideFlags: 0 @@ -5625,7 +5828,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1350204558} + m_Material: {fileID: 52155448} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -5732,7 +5935,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 753078120} + m_Material: {fileID: 775637094} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -5835,7 +6038,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921918106} m_CullTransparentMesh: 0 ---- !u!21 &934726029 +--- !u!21 &933709376 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -5920,7 +6123,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 246, g: 39, b: 22, a: 0} + - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1 &938793830 GameObject: m_ObjectHideFlags: 0 @@ -6455,6 +6658,7 @@ GameObject: - component: {fileID: 984301801} - component: {fileID: 984301803} - component: {fileID: 984301802} + - component: {fileID: 984301804} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -6507,7 +6711,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -6522,6 +6726,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 984301800} m_CullTransparentMesh: 0 +--- !u!114 &984301804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 984301800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &1020725607 GameObject: m_ObjectHideFlags: 0 @@ -6533,6 +6750,7 @@ GameObject: - component: {fileID: 1020725608} - component: {fileID: 1020725610} - component: {fileID: 1020725609} + - component: {fileID: 1020725611} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -6600,6 +6818,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020725607} m_CullTransparentMesh: 0 +--- !u!114 &1020725611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1020725607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1001 &1035872848 PrefabInstance: m_ObjectHideFlags: 0 @@ -7042,6 +7273,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6843030710554625779, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: key + value: NOTIFICATION + objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: mType @@ -8471,6 +8707,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226946007} m_CullTransparentMesh: 0 +--- !u!21 &1231480445 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!21 &1258602188 Material: serializedVersion: 6 @@ -9031,92 +9353,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340062704} m_CullTransparentMesh: 0 ---- !u!21 &1350204558 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} --- !u!1 &1371282017 GameObject: m_ObjectHideFlags: 0 @@ -9539,92 +9775,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395740765} m_CullTransparentMesh: 0 ---- !u!21 &1398401955 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} --- !u!1001 &1405020871 PrefabInstance: m_ObjectHideFlags: 0 @@ -9851,7 +10001,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 393015578} + m_Material: {fileID: 1468144858} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -10190,92 +10340,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1446160410} m_PrefabAsset: {fileID: 0} ---- !u!21 &1449550790 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} --- !u!1001 &1454741467 PrefabInstance: m_ObjectHideFlags: 0 @@ -10491,7 +10555,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1454741467} m_PrefabAsset: {fileID: 0} ---- !u!21 &1493142499 +--- !u!21 &1461889294 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -10576,7 +10640,179 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} + - _WidthHeightRadius: {r: 246, g: 39, b: 22, a: 0} +--- !u!21 &1468144858 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 0, b: 60, a: 0} +--- !u!21 &1486849194 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 385, b: 60, a: 0} --- !u!1 &1507594307 GameObject: m_ObjectHideFlags: 0 @@ -10588,6 +10824,7 @@ GameObject: - component: {fileID: 1507594308} - component: {fileID: 1507594310} - component: {fileID: 1507594309} + - component: {fileID: 1507594311} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -10655,6 +10892,105 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1507594307} m_CullTransparentMesh: 0 +--- !u!114 &1507594311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507594307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!21 &1540841876 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} --- !u!1001 &1560149220 PrefabInstance: m_ObjectHideFlags: 0 @@ -10909,92 +11245,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563257777} m_CullTransparentMesh: 0 ---- !u!21 &1583548320 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 120, g: 120, b: 120, a: 0} --- !u!1 &1602252557 GameObject: m_ObjectHideFlags: 0 @@ -11065,7 +11315,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1749167837} + m_Material: {fileID: 2053513352} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -11090,92 +11340,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1602252557} m_CullTransparentMesh: 0 ---- !u!21 &1638162698 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!21 &1664838921 Material: serializedVersion: 6 @@ -11433,6 +11597,7 @@ GameObject: - component: {fileID: 1696356446} - component: {fileID: 1696356448} - component: {fileID: 1696356447} + - component: {fileID: 1696356449} m_Layer: 5 m_Name: Info-sub m_TagString: Untagged @@ -11500,6 +11665,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1696356445} m_CullTransparentMesh: 0 +--- !u!114 &1696356449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696356445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &1713385733 GameObject: m_ObjectHideFlags: 0 @@ -11574,52 +11752,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713385733} m_CullTransparentMesh: 0 ---- !u!1 &1746218432 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1746218434} - - component: {fileID: 1746218433} - m_Layer: 0 - m_Name: UIManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1746218433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1746218432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff5927b9099e57740a8e1c1296251a99, type: 3} - m_Name: - m_EditorClassIdentifier: - mMainPanel: {fileID: 0} - Root: {fileID: 0} ---- !u!4 &1746218434 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1746218432} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 540.81384, y: 228.10681, z: -579.94684} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1749167837 +--- !u!21 &1736748747 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -11704,7 +11837,52 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 385, b: 60, a: 0} + - _WidthHeightRadius: {r: 88, g: 39, b: 22, a: 0} +--- !u!1 &1746218432 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1746218434} + - component: {fileID: 1746218433} + m_Layer: 0 + m_Name: UIManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1746218433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746218432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff5927b9099e57740a8e1c1296251a99, type: 3} + m_Name: + m_EditorClassIdentifier: + mMainPanel: {fileID: 0} + Root: {fileID: 0} +--- !u!4 &1746218434 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746218432} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 540.81384, y: 228.10681, z: -579.94684} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1749352220 GameObject: m_ObjectHideFlags: 0 @@ -11995,7 +12173,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 640368274} + m_Material: {fileID: 435024097} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -12233,92 +12411,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1815654368} m_PrefabAsset: {fileID: 0} ---- !u!21 &1816309597 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 385, b: 60, a: 0} --- !u!1 &1824410413 GameObject: m_ObjectHideFlags: 0 @@ -12389,7 +12481,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 431527905} + m_Material: {fileID: 894366562} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -12938,6 +13030,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1910090115} m_CullTransparentMesh: 0 +--- !u!21 &1933563838 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1 &1934359711 GameObject: m_ObjectHideFlags: 0 @@ -13005,6 +13183,7 @@ GameObject: - component: {fileID: 1949300945} - component: {fileID: 1949300947} - component: {fileID: 1949300946} + - component: {fileID: 1949300948} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -13072,6 +13251,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1949300944} m_CullTransparentMesh: 0 +--- !u!114 &1949300948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949300944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1001 &1973948708 PrefabInstance: m_ObjectHideFlags: 0 @@ -13258,6 +13450,7 @@ GameObject: - component: {fileID: 1982416543} - component: {fileID: 1982416545} - component: {fileID: 1982416544} + - component: {fileID: 1982416546} m_Layer: 5 m_Name: signText m_TagString: Untagged @@ -13327,6 +13520,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1982416542} m_CullTransparentMesh: 0 +--- !u!114 &1982416546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982416542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &2003946479 GameObject: m_ObjectHideFlags: 0 @@ -13775,6 +13981,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8672365918081744322} m_PrefabAsset: {fileID: 0} +--- !u!21 &2053513352 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 360, g: 385, b: 60, a: 0} --- !u!1 &2067798644 GameObject: m_ObjectHideFlags: 0 @@ -14011,92 +14303,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!21 &2101559183 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 360, g: 573, b: 60, a: 0} --- !u!1 &2123061716 GameObject: m_ObjectHideFlags: 0 @@ -14422,6 +14628,7 @@ GameObject: - component: {fileID: 6432226911792163231} - component: {fileID: 6432226911792163201} - component: {fileID: 6432226911792163230} + - component: {fileID: 6432226911792163229} m_Layer: 5 m_Name: regText m_TagString: Untagged @@ -14429,6 +14636,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6432226911792163229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6432226911792163228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!114 &6432226911792163230 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14884,7 +15104,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1583548320} + m_Material: {fileID: 531861132} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -15151,6 +15371,7 @@ GameObject: - component: {fileID: 6432226912755900168} - component: {fileID: 6432226912755900170} - component: {fileID: 6432226912755900171} + - component: {fileID: 6432226912755900172} m_Layer: 5 m_Name: otherLogText m_TagString: Untagged @@ -15199,6 +15420,19 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Or you can continue with +--- !u!114 &6432226912755900172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6432226912755900169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &6432226912761282404 GameObject: m_ObjectHideFlags: 0 @@ -15842,7 +16076,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 511648306} + m_Material: {fileID: 738687090} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -15884,6 +16118,7 @@ GameObject: - component: {fileID: 6432226913572424204} - component: {fileID: 6432226913572424205} - component: {fileID: 6432226913572424202} + - component: {fileID: 6432226913572424201} m_Layer: 5 m_Name: ForgetPassword m_TagString: Untagged @@ -15891,6 +16126,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6432226913572424201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6432226913572424200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!114 &6432226913572424202 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15987,7 +16235,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs index 8768b289..945f0fc2 100644 --- a/Assets/Scripts/Apis/ApiBase.cs +++ b/Assets/Scripts/Apis/ApiBase.cs @@ -103,7 +103,7 @@ namespace Assets.Scripts.Apis //yield return request.Send(); var client = new HttpClient(httpClientHandler); - client.DefaultRequestHeaders.Add("Language", "en"); + //client.DefaultRequestHeaders.Add("Language", "en"); HandleHeaders(client.DefaultRequestHeaders); var result = await client.GetByteArrayAsync(_url).ConfigureAwait(false); @@ -123,6 +123,8 @@ namespace Assets.Scripts.Apis defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion)); #endif defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier); + defaultRequestHeaders.Remove("Language"); + defaultRequestHeaders.Add("Language", App.GetLocalLanguage()); } protected async Task GetUrlAsync(string url) diff --git a/Assets/Scripts/Apis/JsonResult.cs b/Assets/Scripts/Apis/JsonResult.cs index 207c3d8a..bf22e176 100644 --- a/Assets/Scripts/Apis/JsonResult.cs +++ b/Assets/Scripts/Apis/JsonResult.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -14,6 +15,10 @@ namespace Assets.Scripts.Apis //public dynamic data { get; set; } public string errMsg { get; set; } public JArray errFieldMsg { get; set; } + public override string ToString() + { + return JsonConvert.SerializeObject(this); + } } public class JsonResult : JsonResult diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index acaee291..c29c86c8 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -18,7 +18,7 @@ public delegate void ChangeLanguageDelegate(); 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; @@ -175,7 +175,7 @@ public static class App { App._IsRowerMode = bool.Parse(isRower); } + //App.ChangeLanguage("en"); Screen.sleepTimeout = SleepTimeout.NeverSleep; - Debug.Log(SystemInfo.deviceUniqueIdentifier); } } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 338929f6..c4bd9802 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -631,7 +631,9 @@ public class LoginController : BaseScene private void AdjustWxQrCode() { #if !(UNITY_IOS || UNITY_ANDROID) - wxBrowser.EvalJSCSP(@" + if (App.GetLocalLanguage() == "en") + { + wxBrowser.EvalJSCSP(@" document.getElementsByClassName('qrcode')[0].style.marginTop = 0; document.getElementsByClassName('title')[0].style.display = 'none'; document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`; @@ -640,6 +642,20 @@ public class LoginController : BaseScene document.body.style.transformOrigin = 'top left'; document.body.style.transform = 'scale(0.85106382978)'; 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 } //浏览器加载回调 diff --git a/Assets/Scripts/UI/Control/PFUIText.cs b/Assets/Scripts/UI/Control/PFUIText.cs index bcf70b96..22c09c53 100644 --- a/Assets/Scripts/UI/Control/PFUIText.cs +++ b/Assets/Scripts/UI/Control/PFUIText.cs @@ -35,10 +35,10 @@ namespace Assets.Scripts.UI.Control } protected void Start() { - Debug.Log(text.text); + //Debug.Log(text.text); if (App.LanguageManager != null && App.LanguageManager.ContainsKey(key)) { - Debug.Log(text.text); + //Debug.Log(text.text); text.text = App.LanguageManager[key]; } App.ChangeLanguageEvent += App_ChangeLanguageEvent; diff --git a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs index c42b90e7..79c15f4a 100644 --- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs +++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs @@ -83,7 +83,7 @@ public class ConnectDeviceModal : PFUIPanel UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(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().key = "DISCONNECT"; } else { - connectBtnText.text = "CONNECT"; + connectBtnText.text = App.GetLocalString("CONNECT"); + connectBtnText.GetComponent().key = "CONNECT"; } foreach (var item in deviceList) @@ -248,10 +250,12 @@ public class ConnectDeviceModal : PFUIPanel if(trainer || nontrainer) { connectBtnText.text = App.GetLocalString("DISCONNECT"); + connectBtnText.GetComponent().key = "DISCONNECT"; } else { connectBtnText.text = App.GetLocalString("CONNECT"); + connectBtnText.GetComponent().key = "CONNECT"; } //connectBtn.text.text = "DISCOUNECT"; noDevice.text = firstDevice.DeviceInfo.Name; diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs index be79f388..d41ec6e7 100644 --- a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs +++ b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs @@ -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); diff --git a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs index ee1be099..65c29732 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EarthController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EarthController.cs @@ -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")) {