From be9d69f6ebee51400291471747401ed347f66c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E8=99=9E=E6=B8=A0=E6=88=90=E2=80=9D?= <“yuqucheng2006@qq.com”> Date: Fri, 10 Jul 2026 16:11:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E4=B8=8E=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=B8=8A=E6=8A=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增国家选择UI组件与相关配置文件 2. 新增多语言国家列表支持与获取接口 3. 新增设备统计数据上报定时任务 4. 修复固件版本号计算的索引错误 5. 添加新的多语言提示文案 --- Assets/Res/language/country.json | 1994 +++++++++++++++++ Assets/Res/language/country.json.meta | 7 + Assets/Res/language/language.json | 5 + Assets/Res/ui/common/搜索.png | Bin 0 -> 1350 bytes Assets/Res/ui/common/搜索.png.meta | 127 ++ Assets/Scripts/Managers/DataBase.cs | 7 + Assets/Scripts/Managers/LanguageManager.cs | 16 + Assets/Scripts/UI/Components/SelectCountry.cs | 15 + .../UI/Components/SelectCountry.cs.meta | 11 + .../DeviceInfoPage/FirmwareUpdatePage.cs | 4 +- .../Scripts/UI/Pages/HomePage/HomePageCtrl.cs | 25 + 11 files changed, 2209 insertions(+), 2 deletions(-) create mode 100644 Assets/Res/language/country.json create mode 100644 Assets/Res/language/country.json.meta create mode 100644 Assets/Res/ui/common/搜索.png create mode 100644 Assets/Res/ui/common/搜索.png.meta create mode 100644 Assets/Scripts/UI/Components/SelectCountry.cs create mode 100644 Assets/Scripts/UI/Components/SelectCountry.cs.meta diff --git a/Assets/Res/language/country.json b/Assets/Res/language/country.json new file mode 100644 index 0000000..3c8eda4 --- /dev/null +++ b/Assets/Res/language/country.json @@ -0,0 +1,1994 @@ +[ + { + "code": "AD", + "name": "安道尔", + "enabled": true, + "name_zh": "安道尔", + "name_en": "Andorra", + "sort_order": 0 + }, + { + "code": "AE", + "name": "阿拉伯联合酋长国", + "enabled": true, + "name_zh": "阿拉伯联合酋长国", + "name_en": "United Arab Emirates", + "sort_order": 0 + }, + { + "code": "AF", + "name": "阿富汗", + "enabled": true, + "name_zh": "阿富汗", + "name_en": "Afghanistan", + "sort_order": 0 + }, + { + "code": "AG", + "name": "安提瓜和巴布达", + "enabled": true, + "name_zh": "安提瓜和巴布达", + "name_en": "Antigua & Barbuda", + "sort_order": 0 + }, + { + "code": "AI", + "name": "安圭拉", + "enabled": true, + "name_zh": "安圭拉", + "name_en": "Anguilla", + "sort_order": 0 + }, + { + "code": "AL", + "name": "阿尔巴尼亚", + "enabled": true, + "name_zh": "阿尔巴尼亚", + "name_en": "Albania", + "sort_order": 0 + }, + { + "code": "AM", + "name": "亚美尼亚", + "enabled": true, + "name_zh": "亚美尼亚", + "name_en": "Armenia", + "sort_order": 0 + }, + { + "code": "AO", + "name": "安哥拉", + "enabled": true, + "name_zh": "安哥拉", + "name_en": "Angola", + "sort_order": 0 + }, + { + "code": "AQ", + "name": "南极洲", + "enabled": true, + "name_zh": "南极洲", + "name_en": "Antarctica", + "sort_order": 0 + }, + { + "code": "AR", + "name": "阿根廷", + "enabled": true, + "name_zh": "阿根廷", + "name_en": "Argentina", + "sort_order": 0 + }, + { + "code": "AS", + "name": "美属萨摩亚", + "enabled": true, + "name_zh": "美属萨摩亚", + "name_en": "American Samoa", + "sort_order": 0 + }, + { + "code": "AT", + "name": "奥地利", + "enabled": true, + "name_zh": "奥地利", + "name_en": "Austria", + "sort_order": 0 + }, + { + "code": "AU", + "name": "澳大利亚", + "enabled": true, + "name_zh": "澳大利亚", + "name_en": "Australia", + "sort_order": 0 + }, + { + "code": "AW", + "name": "阿鲁巴", + "enabled": true, + "name_zh": "阿鲁巴", + "name_en": "Aruba", + "sort_order": 0 + }, + { + "code": "AX", + "name": "奥兰群岛", + "enabled": true, + "name_zh": "奥兰群岛", + "name_en": "Åland Islands", + "sort_order": 0 + }, + { + "code": "AZ", + "name": "阿塞拜疆", + "enabled": true, + "name_zh": "阿塞拜疆", + "name_en": "Azerbaijan", + "sort_order": 0 + }, + { + "code": "BA", + "name": "波斯尼亚和黑塞哥维那", + "enabled": true, + "name_zh": "波斯尼亚和黑塞哥维那", + "name_en": "Bosnia & Herzegovina", + "sort_order": 0 + }, + { + "code": "BB", + "name": "巴巴多斯", + "enabled": true, + "name_zh": "巴巴多斯", + "name_en": "Barbados", + "sort_order": 0 + }, + { + "code": "BD", + "name": "孟加拉国", + "enabled": true, + "name_zh": "孟加拉国", + "name_en": "Bangladesh", + "sort_order": 0 + }, + { + "code": "BE", + "name": "比利时", + "enabled": true, + "name_zh": "比利时", + "name_en": "Belgium", + "sort_order": 0 + }, + { + "code": "BF", + "name": "布基纳法索", + "enabled": true, + "name_zh": "布基纳法索", + "name_en": "Burkina Faso", + "sort_order": 0 + }, + { + "code": "BG", + "name": "保加利亚", + "enabled": true, + "name_zh": "保加利亚", + "name_en": "Bulgaria", + "sort_order": 0 + }, + { + "code": "BH", + "name": "巴林", + "enabled": true, + "name_zh": "巴林", + "name_en": "Bahrain", + "sort_order": 0 + }, + { + "code": "BI", + "name": "布隆迪", + "enabled": true, + "name_zh": "布隆迪", + "name_en": "Burundi", + "sort_order": 0 + }, + { + "code": "BJ", + "name": "贝宁", + "enabled": true, + "name_zh": "贝宁", + "name_en": "Benin", + "sort_order": 0 + }, + { + "code": "BL", + "name": "圣巴泰勒米", + "enabled": true, + "name_zh": "圣巴泰勒米", + "name_en": "St. Barthélemy", + "sort_order": 0 + }, + { + "code": "BM", + "name": "百慕大", + "enabled": true, + "name_zh": "百慕大", + "name_en": "Bermuda", + "sort_order": 0 + }, + { + "code": "BN", + "name": "文莱", + "enabled": true, + "name_zh": "文莱", + "name_en": "Brunei", + "sort_order": 0 + }, + { + "code": "BO", + "name": "玻利维亚", + "enabled": true, + "name_zh": "玻利维亚", + "name_en": "Bolivia", + "sort_order": 0 + }, + { + "code": "BQ", + "name": "荷属加勒比区", + "enabled": true, + "name_zh": "荷属加勒比区", + "name_en": "Caribbean Netherlands", + "sort_order": 0 + }, + { + "code": "BR", + "name": "巴西", + "enabled": true, + "name_zh": "巴西", + "name_en": "Brazil", + "sort_order": 0 + }, + { + "code": "BS", + "name": "巴哈马", + "enabled": true, + "name_zh": "巴哈马", + "name_en": "Bahamas", + "sort_order": 0 + }, + { + "code": "BT", + "name": "不丹", + "enabled": true, + "name_zh": "不丹", + "name_en": "Bhutan", + "sort_order": 0 + }, + { + "code": "BV", + "name": "布韦岛", + "enabled": true, + "name_zh": "布韦岛", + "name_en": "Bouvet Island", + "sort_order": 0 + }, + { + "code": "BW", + "name": "博茨瓦纳", + "enabled": true, + "name_zh": "博茨瓦纳", + "name_en": "Botswana", + "sort_order": 0 + }, + { + "code": "BY", + "name": "白俄罗斯", + "enabled": true, + "name_zh": "白俄罗斯", + "name_en": "Belarus", + "sort_order": 0 + }, + { + "code": "BZ", + "name": "伯利兹", + "enabled": true, + "name_zh": "伯利兹", + "name_en": "Belize", + "sort_order": 0 + }, + { + "code": "CA", + "name": "加拿大", + "enabled": true, + "name_zh": "加拿大", + "name_en": "Canada", + "sort_order": 0 + }, + { + "code": "CC", + "name": "科科斯(基林)群岛", + "enabled": true, + "name_zh": "科科斯(基林)群岛", + "name_en": "Cocos (Keeling) Islands", + "sort_order": 0 + }, + { + "code": "CD", + "name": "刚果(金)", + "enabled": true, + "name_zh": "刚果(金)", + "name_en": "Congo - Kinshasa", + "sort_order": 0 + }, + { + "code": "CF", + "name": "中非共和国", + "enabled": true, + "name_zh": "中非共和国", + "name_en": "Central African Republic", + "sort_order": 0 + }, + { + "code": "CG", + "name": "刚果(布)", + "enabled": true, + "name_zh": "刚果(布)", + "name_en": "Congo - Brazzaville", + "sort_order": 0 + }, + { + "code": "CH", + "name": "瑞士", + "enabled": true, + "name_zh": "瑞士", + "name_en": "Switzerland", + "sort_order": 0 + }, + { + "code": "CI", + "name": "科特迪瓦", + "enabled": true, + "name_zh": "科特迪瓦", + "name_en": "Côte d’Ivoire", + "sort_order": 0 + }, + { + "code": "CK", + "name": "库克群岛", + "enabled": true, + "name_zh": "库克群岛", + "name_en": "Cook Islands", + "sort_order": 0 + }, + { + "code": "CL", + "name": "智利", + "enabled": true, + "name_zh": "智利", + "name_en": "Chile", + "sort_order": 0 + }, + { + "code": "CM", + "name": "喀麦隆", + "enabled": true, + "name_zh": "喀麦隆", + "name_en": "Cameroon", + "sort_order": 0 + }, + { + "code": "CN", + "name": "中国", + "enabled": true, + "name_zh": "中国", + "name_en": "China", + "sort_order": 0 + }, + { + "code": "CO", + "name": "哥伦比亚", + "enabled": true, + "name_zh": "哥伦比亚", + "name_en": "Colombia", + "sort_order": 0 + }, + { + "code": "CR", + "name": "哥斯达黎加", + "enabled": true, + "name_zh": "哥斯达黎加", + "name_en": "Costa Rica", + "sort_order": 0 + }, + { + "code": "CU", + "name": "古巴", + "enabled": true, + "name_zh": "古巴", + "name_en": "Cuba", + "sort_order": 0 + }, + { + "code": "CV", + "name": "佛得角", + "enabled": true, + "name_zh": "佛得角", + "name_en": "Cape Verde", + "sort_order": 0 + }, + { + "code": "CW", + "name": "库拉索", + "enabled": true, + "name_zh": "库拉索", + "name_en": "Curaçao", + "sort_order": 0 + }, + { + "code": "CX", + "name": "圣诞岛", + "enabled": true, + "name_zh": "圣诞岛", + "name_en": "Christmas Island", + "sort_order": 0 + }, + { + "code": "CY", + "name": "塞浦路斯", + "enabled": true, + "name_zh": "塞浦路斯", + "name_en": "Cyprus", + "sort_order": 0 + }, + { + "code": "CZ", + "name": "捷克", + "enabled": true, + "name_zh": "捷克", + "name_en": "Czechia", + "sort_order": 0 + }, + { + "code": "DE", + "name": "德国", + "enabled": true, + "name_zh": "德国", + "name_en": "Germany", + "sort_order": 0 + }, + { + "code": "DJ", + "name": "吉布提", + "enabled": true, + "name_zh": "吉布提", + "name_en": "Djibouti", + "sort_order": 0 + }, + { + "code": "DK", + "name": "丹麦", + "enabled": true, + "name_zh": "丹麦", + "name_en": "Denmark", + "sort_order": 0 + }, + { + "code": "DM", + "name": "多米尼克", + "enabled": true, + "name_zh": "多米尼克", + "name_en": "Dominica", + "sort_order": 0 + }, + { + "code": "DO", + "name": "多米尼加共和国", + "enabled": true, + "name_zh": "多米尼加共和国", + "name_en": "Dominican Republic", + "sort_order": 0 + }, + { + "code": "DZ", + "name": "阿尔及利亚", + "enabled": true, + "name_zh": "阿尔及利亚", + "name_en": "Algeria", + "sort_order": 0 + }, + { + "code": "EC", + "name": "厄瓜多尔", + "enabled": true, + "name_zh": "厄瓜多尔", + "name_en": "Ecuador", + "sort_order": 0 + }, + { + "code": "EE", + "name": "爱沙尼亚", + "enabled": true, + "name_zh": "爱沙尼亚", + "name_en": "Estonia", + "sort_order": 0 + }, + { + "code": "EG", + "name": "埃及", + "enabled": true, + "name_zh": "埃及", + "name_en": "Egypt", + "sort_order": 0 + }, + { + "code": "EH", + "name": "西撒哈拉", + "enabled": true, + "name_zh": "西撒哈拉", + "name_en": "Western Sahara", + "sort_order": 0 + }, + { + "code": "ER", + "name": "厄立特里亚", + "enabled": true, + "name_zh": "厄立特里亚", + "name_en": "Eritrea", + "sort_order": 0 + }, + { + "code": "ES", + "name": "西班牙", + "enabled": true, + "name_zh": "西班牙", + "name_en": "Spain", + "sort_order": 0 + }, + { + "code": "ET", + "name": "埃塞俄比亚", + "enabled": true, + "name_zh": "埃塞俄比亚", + "name_en": "Ethiopia", + "sort_order": 0 + }, + { + "code": "FI", + "name": "芬兰", + "enabled": true, + "name_zh": "芬兰", + "name_en": "Finland", + "sort_order": 0 + }, + { + "code": "FJ", + "name": "斐济", + "enabled": true, + "name_zh": "斐济", + "name_en": "Fiji", + "sort_order": 0 + }, + { + "code": "FK", + "name": "福克兰群岛", + "enabled": true, + "name_zh": "福克兰群岛", + "name_en": "Falkland Islands", + "sort_order": 0 + }, + { + "code": "FM", + "name": "密克罗尼西亚", + "enabled": true, + "name_zh": "密克罗尼西亚", + "name_en": "Micronesia", + "sort_order": 0 + }, + { + "code": "FO", + "name": "法罗群岛", + "enabled": true, + "name_zh": "法罗群岛", + "name_en": "Faroe Islands", + "sort_order": 0 + }, + { + "code": "FR", + "name": "法国", + "enabled": true, + "name_zh": "法国", + "name_en": "France", + "sort_order": 0 + }, + { + "code": "GA", + "name": "加蓬", + "enabled": true, + "name_zh": "加蓬", + "name_en": "Gabon", + "sort_order": 0 + }, + { + "code": "GB", + "name": "英国", + "enabled": true, + "name_zh": "英国", + "name_en": "United Kingdom", + "sort_order": 0 + }, + { + "code": "GD", + "name": "格林纳达", + "enabled": true, + "name_zh": "格林纳达", + "name_en": "Grenada", + "sort_order": 0 + }, + { + "code": "GE", + "name": "格鲁吉亚", + "enabled": true, + "name_zh": "格鲁吉亚", + "name_en": "Georgia", + "sort_order": 0 + }, + { + "code": "GF", + "name": "法属圭亚那", + "enabled": true, + "name_zh": "法属圭亚那", + "name_en": "French Guiana", + "sort_order": 0 + }, + { + "code": "GG", + "name": "根西岛", + "enabled": true, + "name_zh": "根西岛", + "name_en": "Guernsey", + "sort_order": 0 + }, + { + "code": "GH", + "name": "加纳", + "enabled": true, + "name_zh": "加纳", + "name_en": "Ghana", + "sort_order": 0 + }, + { + "code": "GI", + "name": "直布罗陀", + "enabled": true, + "name_zh": "直布罗陀", + "name_en": "Gibraltar", + "sort_order": 0 + }, + { + "code": "GL", + "name": "格陵兰", + "enabled": true, + "name_zh": "格陵兰", + "name_en": "Greenland", + "sort_order": 0 + }, + { + "code": "GM", + "name": "冈比亚", + "enabled": true, + "name_zh": "冈比亚", + "name_en": "Gambia", + "sort_order": 0 + }, + { + "code": "GN", + "name": "几内亚", + "enabled": true, + "name_zh": "几内亚", + "name_en": "Guinea", + "sort_order": 0 + }, + { + "code": "GP", + "name": "瓜德罗普", + "enabled": true, + "name_zh": "瓜德罗普", + "name_en": "Guadeloupe", + "sort_order": 0 + }, + { + "code": "GQ", + "name": "赤道几内亚", + "enabled": true, + "name_zh": "赤道几内亚", + "name_en": "Equatorial Guinea", + "sort_order": 0 + }, + { + "code": "GR", + "name": "希腊", + "enabled": true, + "name_zh": "希腊", + "name_en": "Greece", + "sort_order": 0 + }, + { + "code": "GS", + "name": "南乔治亚和南桑威奇群岛", + "enabled": true, + "name_zh": "南乔治亚和南桑威奇群岛", + "name_en": "South Georgia & South Sandwich Islands", + "sort_order": 0 + }, + { + "code": "GT", + "name": "危地马拉", + "enabled": true, + "name_zh": "危地马拉", + "name_en": "Guatemala", + "sort_order": 0 + }, + { + "code": "GU", + "name": "关岛", + "enabled": true, + "name_zh": "关岛", + "name_en": "Guam", + "sort_order": 0 + }, + { + "code": "GW", + "name": "几内亚比绍", + "enabled": true, + "name_zh": "几内亚比绍", + "name_en": "Guinea-Bissau", + "sort_order": 0 + }, + { + "code": "GY", + "name": "圭亚那", + "enabled": true, + "name_zh": "圭亚那", + "name_en": "Guyana", + "sort_order": 0 + }, + { + "code": "HK", + "name": "中国香港特别行政区", + "enabled": true, + "name_zh": "中国香港特别行政区", + "name_en": "Hong Kong SAR China", + "sort_order": 0 + }, + { + "code": "HM", + "name": "赫德岛和麦克唐纳群岛", + "enabled": true, + "name_zh": "赫德岛和麦克唐纳群岛", + "name_en": "Heard & McDonald Islands", + "sort_order": 0 + }, + { + "code": "HN", + "name": "洪都拉斯", + "enabled": true, + "name_zh": "洪都拉斯", + "name_en": "Honduras", + "sort_order": 0 + }, + { + "code": "HR", + "name": "克罗地亚", + "enabled": true, + "name_zh": "克罗地亚", + "name_en": "Croatia", + "sort_order": 0 + }, + { + "code": "HT", + "name": "海地", + "enabled": true, + "name_zh": "海地", + "name_en": "Haiti", + "sort_order": 0 + }, + { + "code": "HU", + "name": "匈牙利", + "enabled": true, + "name_zh": "匈牙利", + "name_en": "Hungary", + "sort_order": 0 + }, + { + "code": "ID", + "name": "印度尼西亚", + "enabled": true, + "name_zh": "印度尼西亚", + "name_en": "Indonesia", + "sort_order": 0 + }, + { + "code": "IE", + "name": "爱尔兰", + "enabled": true, + "name_zh": "爱尔兰", + "name_en": "Ireland", + "sort_order": 0 + }, + { + "code": "IL", + "name": "以色列", + "enabled": true, + "name_zh": "以色列", + "name_en": "Israel", + "sort_order": 0 + }, + { + "code": "IM", + "name": "马恩岛", + "enabled": true, + "name_zh": "马恩岛", + "name_en": "Isle of Man", + "sort_order": 0 + }, + { + "code": "IN", + "name": "印度", + "enabled": true, + "name_zh": "印度", + "name_en": "India", + "sort_order": 0 + }, + { + "code": "IO", + "name": "英属印度洋领地", + "enabled": true, + "name_zh": "英属印度洋领地", + "name_en": "British Indian Ocean Territory", + "sort_order": 0 + }, + { + "code": "IQ", + "name": "伊拉克", + "enabled": true, + "name_zh": "伊拉克", + "name_en": "Iraq", + "sort_order": 0 + }, + { + "code": "IR", + "name": "伊朗", + "enabled": true, + "name_zh": "伊朗", + "name_en": "Iran", + "sort_order": 0 + }, + { + "code": "IS", + "name": "冰岛", + "enabled": true, + "name_zh": "冰岛", + "name_en": "Iceland", + "sort_order": 0 + }, + { + "code": "IT", + "name": "意大利", + "enabled": true, + "name_zh": "意大利", + "name_en": "Italy", + "sort_order": 0 + }, + { + "code": "JE", + "name": "泽西岛", + "enabled": true, + "name_zh": "泽西岛", + "name_en": "Jersey", + "sort_order": 0 + }, + { + "code": "JM", + "name": "牙买加", + "enabled": true, + "name_zh": "牙买加", + "name_en": "Jamaica", + "sort_order": 0 + }, + { + "code": "JO", + "name": "约旦", + "enabled": true, + "name_zh": "约旦", + "name_en": "Jordan", + "sort_order": 0 + }, + { + "code": "JP", + "name": "日本", + "enabled": true, + "name_zh": "日本", + "name_en": "Japan", + "sort_order": 0 + }, + { + "code": "KE", + "name": "肯尼亚", + "enabled": true, + "name_zh": "肯尼亚", + "name_en": "Kenya", + "sort_order": 0 + }, + { + "code": "KG", + "name": "吉尔吉斯斯坦", + "enabled": true, + "name_zh": "吉尔吉斯斯坦", + "name_en": "Kyrgyzstan", + "sort_order": 0 + }, + { + "code": "KH", + "name": "柬埔寨", + "enabled": true, + "name_zh": "柬埔寨", + "name_en": "Cambodia", + "sort_order": 0 + }, + { + "code": "KI", + "name": "基里巴斯", + "enabled": true, + "name_zh": "基里巴斯", + "name_en": "Kiribati", + "sort_order": 0 + }, + { + "code": "KM", + "name": "科摩罗", + "enabled": true, + "name_zh": "科摩罗", + "name_en": "Comoros", + "sort_order": 0 + }, + { + "code": "KN", + "name": "圣基茨和尼维斯", + "enabled": true, + "name_zh": "圣基茨和尼维斯", + "name_en": "St. Kitts & Nevis", + "sort_order": 0 + }, + { + "code": "KP", + "name": "朝鲜", + "enabled": true, + "name_zh": "朝鲜", + "name_en": "North Korea", + "sort_order": 0 + }, + { + "code": "KR", + "name": "韩国", + "enabled": true, + "name_zh": "韩国", + "name_en": "South Korea", + "sort_order": 0 + }, + { + "code": "KW", + "name": "科威特", + "enabled": true, + "name_zh": "科威特", + "name_en": "Kuwait", + "sort_order": 0 + }, + { + "code": "KY", + "name": "开曼群岛", + "enabled": true, + "name_zh": "开曼群岛", + "name_en": "Cayman Islands", + "sort_order": 0 + }, + { + "code": "KZ", + "name": "哈萨克斯坦", + "enabled": true, + "name_zh": "哈萨克斯坦", + "name_en": "Kazakhstan", + "sort_order": 0 + }, + { + "code": "LA", + "name": "老挝", + "enabled": true, + "name_zh": "老挝", + "name_en": "Laos", + "sort_order": 0 + }, + { + "code": "LB", + "name": "黎巴嫩", + "enabled": true, + "name_zh": "黎巴嫩", + "name_en": "Lebanon", + "sort_order": 0 + }, + { + "code": "LC", + "name": "圣卢西亚", + "enabled": true, + "name_zh": "圣卢西亚", + "name_en": "St. Lucia", + "sort_order": 0 + }, + { + "code": "LI", + "name": "列支敦士登", + "enabled": true, + "name_zh": "列支敦士登", + "name_en": "Liechtenstein", + "sort_order": 0 + }, + { + "code": "LK", + "name": "斯里兰卡", + "enabled": true, + "name_zh": "斯里兰卡", + "name_en": "Sri Lanka", + "sort_order": 0 + }, + { + "code": "LR", + "name": "利比里亚", + "enabled": true, + "name_zh": "利比里亚", + "name_en": "Liberia", + "sort_order": 0 + }, + { + "code": "LS", + "name": "莱索托", + "enabled": true, + "name_zh": "莱索托", + "name_en": "Lesotho", + "sort_order": 0 + }, + { + "code": "LT", + "name": "立陶宛", + "enabled": true, + "name_zh": "立陶宛", + "name_en": "Lithuania", + "sort_order": 0 + }, + { + "code": "LU", + "name": "卢森堡", + "enabled": true, + "name_zh": "卢森堡", + "name_en": "Luxembourg", + "sort_order": 0 + }, + { + "code": "LV", + "name": "拉脱维亚", + "enabled": true, + "name_zh": "拉脱维亚", + "name_en": "Latvia", + "sort_order": 0 + }, + { + "code": "LY", + "name": "利比亚", + "enabled": true, + "name_zh": "利比亚", + "name_en": "Libya", + "sort_order": 0 + }, + { + "code": "MA", + "name": "摩洛哥", + "enabled": true, + "name_zh": "摩洛哥", + "name_en": "Morocco", + "sort_order": 0 + }, + { + "code": "MC", + "name": "摩纳哥", + "enabled": true, + "name_zh": "摩纳哥", + "name_en": "Monaco", + "sort_order": 0 + }, + { + "code": "MD", + "name": "摩尔多瓦", + "enabled": true, + "name_zh": "摩尔多瓦", + "name_en": "Moldova", + "sort_order": 0 + }, + { + "code": "ME", + "name": "黑山", + "enabled": true, + "name_zh": "黑山", + "name_en": "Montenegro", + "sort_order": 0 + }, + { + "code": "MF", + "name": "法属圣马丁", + "enabled": true, + "name_zh": "法属圣马丁", + "name_en": "St. Martin", + "sort_order": 0 + }, + { + "code": "MG", + "name": "马达加斯加", + "enabled": true, + "name_zh": "马达加斯加", + "name_en": "Madagascar", + "sort_order": 0 + }, + { + "code": "MH", + "name": "马绍尔群岛", + "enabled": true, + "name_zh": "马绍尔群岛", + "name_en": "Marshall Islands", + "sort_order": 0 + }, + { + "code": "MK", + "name": "北马其顿", + "enabled": true, + "name_zh": "北马其顿", + "name_en": "North Macedonia", + "sort_order": 0 + }, + { + "code": "ML", + "name": "马里", + "enabled": true, + "name_zh": "马里", + "name_en": "Mali", + "sort_order": 0 + }, + { + "code": "MM", + "name": "缅甸", + "enabled": true, + "name_zh": "缅甸", + "name_en": "Myanmar (Burma)", + "sort_order": 0 + }, + { + "code": "MN", + "name": "蒙古", + "enabled": true, + "name_zh": "蒙古", + "name_en": "Mongolia", + "sort_order": 0 + }, + { + "code": "MO", + "name": "中国澳门特别行政区", + "enabled": true, + "name_zh": "中国澳门特别行政区", + "name_en": "Macao SAR China", + "sort_order": 0 + }, + { + "code": "MP", + "name": "北马里亚纳群岛", + "enabled": true, + "name_zh": "北马里亚纳群岛", + "name_en": "Northern Mariana Islands", + "sort_order": 0 + }, + { + "code": "MQ", + "name": "马提尼克", + "enabled": true, + "name_zh": "马提尼克", + "name_en": "Martinique", + "sort_order": 0 + }, + { + "code": "MR", + "name": "毛里塔尼亚", + "enabled": true, + "name_zh": "毛里塔尼亚", + "name_en": "Mauritania", + "sort_order": 0 + }, + { + "code": "MS", + "name": "蒙特塞拉特", + "enabled": true, + "name_zh": "蒙特塞拉特", + "name_en": "Montserrat", + "sort_order": 0 + }, + { + "code": "MT", + "name": "马耳他", + "enabled": true, + "name_zh": "马耳他", + "name_en": "Malta", + "sort_order": 0 + }, + { + "code": "MU", + "name": "毛里求斯", + "enabled": true, + "name_zh": "毛里求斯", + "name_en": "Mauritius", + "sort_order": 0 + }, + { + "code": "MV", + "name": "马尔代夫", + "enabled": true, + "name_zh": "马尔代夫", + "name_en": "Maldives", + "sort_order": 0 + }, + { + "code": "MW", + "name": "马拉维", + "enabled": true, + "name_zh": "马拉维", + "name_en": "Malawi", + "sort_order": 0 + }, + { + "code": "MX", + "name": "墨西哥", + "enabled": true, + "name_zh": "墨西哥", + "name_en": "Mexico", + "sort_order": 0 + }, + { + "code": "MY", + "name": "马来西亚", + "enabled": true, + "name_zh": "马来西亚", + "name_en": "Malaysia", + "sort_order": 0 + }, + { + "code": "MZ", + "name": "莫桑比克", + "enabled": true, + "name_zh": "莫桑比克", + "name_en": "Mozambique", + "sort_order": 0 + }, + { + "code": "NA", + "name": "纳米比亚", + "enabled": true, + "name_zh": "纳米比亚", + "name_en": "Namibia", + "sort_order": 0 + }, + { + "code": "NC", + "name": "新喀里多尼亚", + "enabled": true, + "name_zh": "新喀里多尼亚", + "name_en": "New Caledonia", + "sort_order": 0 + }, + { + "code": "NE", + "name": "尼日尔", + "enabled": true, + "name_zh": "尼日尔", + "name_en": "Niger", + "sort_order": 0 + }, + { + "code": "NF", + "name": "诺福克岛", + "enabled": true, + "name_zh": "诺福克岛", + "name_en": "Norfolk Island", + "sort_order": 0 + }, + { + "code": "NG", + "name": "尼日利亚", + "enabled": true, + "name_zh": "尼日利亚", + "name_en": "Nigeria", + "sort_order": 0 + }, + { + "code": "NI", + "name": "尼加拉瓜", + "enabled": true, + "name_zh": "尼加拉瓜", + "name_en": "Nicaragua", + "sort_order": 0 + }, + { + "code": "NL", + "name": "荷兰", + "enabled": true, + "name_zh": "荷兰", + "name_en": "Netherlands", + "sort_order": 0 + }, + { + "code": "NO", + "name": "挪威", + "enabled": true, + "name_zh": "挪威", + "name_en": "Norway", + "sort_order": 0 + }, + { + "code": "NP", + "name": "尼泊尔", + "enabled": true, + "name_zh": "尼泊尔", + "name_en": "Nepal", + "sort_order": 0 + }, + { + "code": "NR", + "name": "瑙鲁", + "enabled": true, + "name_zh": "瑙鲁", + "name_en": "Nauru", + "sort_order": 0 + }, + { + "code": "NU", + "name": "纽埃", + "enabled": true, + "name_zh": "纽埃", + "name_en": "Niue", + "sort_order": 0 + }, + { + "code": "NZ", + "name": "新西兰", + "enabled": true, + "name_zh": "新西兰", + "name_en": "New Zealand", + "sort_order": 0 + }, + { + "code": "OM", + "name": "阿曼", + "enabled": true, + "name_zh": "阿曼", + "name_en": "Oman", + "sort_order": 0 + }, + { + "code": "PA", + "name": "巴拿马", + "enabled": true, + "name_zh": "巴拿马", + "name_en": "Panama", + "sort_order": 0 + }, + { + "code": "PE", + "name": "秘鲁", + "enabled": true, + "name_zh": "秘鲁", + "name_en": "Peru", + "sort_order": 0 + }, + { + "code": "PF", + "name": "法属波利尼西亚", + "enabled": true, + "name_zh": "法属波利尼西亚", + "name_en": "French Polynesia", + "sort_order": 0 + }, + { + "code": "PG", + "name": "巴布亚新几内亚", + "enabled": true, + "name_zh": "巴布亚新几内亚", + "name_en": "Papua New Guinea", + "sort_order": 0 + }, + { + "code": "PH", + "name": "菲律宾", + "enabled": true, + "name_zh": "菲律宾", + "name_en": "Philippines", + "sort_order": 0 + }, + { + "code": "PK", + "name": "巴基斯坦", + "enabled": true, + "name_zh": "巴基斯坦", + "name_en": "Pakistan", + "sort_order": 0 + }, + { + "code": "PL", + "name": "波兰", + "enabled": true, + "name_zh": "波兰", + "name_en": "Poland", + "sort_order": 0 + }, + { + "code": "PM", + "name": "圣皮埃尔和密克隆群岛", + "enabled": true, + "name_zh": "圣皮埃尔和密克隆群岛", + "name_en": "St. Pierre & Miquelon", + "sort_order": 0 + }, + { + "code": "PN", + "name": "皮特凯恩群岛", + "enabled": true, + "name_zh": "皮特凯恩群岛", + "name_en": "Pitcairn Islands", + "sort_order": 0 + }, + { + "code": "PR", + "name": "波多黎各", + "enabled": true, + "name_zh": "波多黎各", + "name_en": "Puerto Rico", + "sort_order": 0 + }, + { + "code": "PS", + "name": "巴勒斯坦领土", + "enabled": true, + "name_zh": "巴勒斯坦领土", + "name_en": "Palestinian Territories", + "sort_order": 0 + }, + { + "code": "PT", + "name": "葡萄牙", + "enabled": true, + "name_zh": "葡萄牙", + "name_en": "Portugal", + "sort_order": 0 + }, + { + "code": "PW", + "name": "帕劳", + "enabled": true, + "name_zh": "帕劳", + "name_en": "Palau", + "sort_order": 0 + }, + { + "code": "PY", + "name": "巴拉圭", + "enabled": true, + "name_zh": "巴拉圭", + "name_en": "Paraguay", + "sort_order": 0 + }, + { + "code": "QA", + "name": "卡塔尔", + "enabled": true, + "name_zh": "卡塔尔", + "name_en": "Qatar", + "sort_order": 0 + }, + { + "code": "RE", + "name": "留尼汪", + "enabled": true, + "name_zh": "留尼汪", + "name_en": "Réunion", + "sort_order": 0 + }, + { + "code": "RO", + "name": "罗马尼亚", + "enabled": true, + "name_zh": "罗马尼亚", + "name_en": "Romania", + "sort_order": 0 + }, + { + "code": "RS", + "name": "塞尔维亚", + "enabled": true, + "name_zh": "塞尔维亚", + "name_en": "Serbia", + "sort_order": 0 + }, + { + "code": "RU", + "name": "俄罗斯", + "enabled": true, + "name_zh": "俄罗斯", + "name_en": "Russia", + "sort_order": 0 + }, + { + "code": "RW", + "name": "卢旺达", + "enabled": true, + "name_zh": "卢旺达", + "name_en": "Rwanda", + "sort_order": 0 + }, + { + "code": "SA", + "name": "沙特阿拉伯", + "enabled": true, + "name_zh": "沙特阿拉伯", + "name_en": "Saudi Arabia", + "sort_order": 0 + }, + { + "code": "SB", + "name": "所罗门群岛", + "enabled": true, + "name_zh": "所罗门群岛", + "name_en": "Solomon Islands", + "sort_order": 0 + }, + { + "code": "SC", + "name": "塞舌尔", + "enabled": true, + "name_zh": "塞舌尔", + "name_en": "Seychelles", + "sort_order": 0 + }, + { + "code": "SD", + "name": "苏丹", + "enabled": true, + "name_zh": "苏丹", + "name_en": "Sudan", + "sort_order": 0 + }, + { + "code": "SE", + "name": "瑞典", + "enabled": true, + "name_zh": "瑞典", + "name_en": "Sweden", + "sort_order": 0 + }, + { + "code": "SG", + "name": "新加坡", + "enabled": true, + "name_zh": "新加坡", + "name_en": "Singapore", + "sort_order": 0 + }, + { + "code": "SH", + "name": "圣赫勒拿", + "enabled": true, + "name_zh": "圣赫勒拿", + "name_en": "St. Helena", + "sort_order": 0 + }, + { + "code": "SI", + "name": "斯洛文尼亚", + "enabled": true, + "name_zh": "斯洛文尼亚", + "name_en": "Slovenia", + "sort_order": 0 + }, + { + "code": "SJ", + "name": "斯瓦尔巴和扬马延", + "enabled": true, + "name_zh": "斯瓦尔巴和扬马延", + "name_en": "Svalbard & Jan Mayen", + "sort_order": 0 + }, + { + "code": "SK", + "name": "斯洛伐克", + "enabled": true, + "name_zh": "斯洛伐克", + "name_en": "Slovakia", + "sort_order": 0 + }, + { + "code": "SL", + "name": "塞拉利昂", + "enabled": true, + "name_zh": "塞拉利昂", + "name_en": "Sierra Leone", + "sort_order": 0 + }, + { + "code": "SM", + "name": "圣马力诺", + "enabled": true, + "name_zh": "圣马力诺", + "name_en": "San Marino", + "sort_order": 0 + }, + { + "code": "SN", + "name": "塞内加尔", + "enabled": true, + "name_zh": "塞内加尔", + "name_en": "Senegal", + "sort_order": 0 + }, + { + "code": "SO", + "name": "索马里", + "enabled": true, + "name_zh": "索马里", + "name_en": "Somalia", + "sort_order": 0 + }, + { + "code": "SR", + "name": "苏里南", + "enabled": true, + "name_zh": "苏里南", + "name_en": "Suriname", + "sort_order": 0 + }, + { + "code": "SS", + "name": "南苏丹", + "enabled": true, + "name_zh": "南苏丹", + "name_en": "South Sudan", + "sort_order": 0 + }, + { + "code": "ST", + "name": "圣多美和普林西比", + "enabled": true, + "name_zh": "圣多美和普林西比", + "name_en": "São Tomé & Príncipe", + "sort_order": 0 + }, + { + "code": "SV", + "name": "萨尔瓦多", + "enabled": true, + "name_zh": "萨尔瓦多", + "name_en": "El Salvador", + "sort_order": 0 + }, + { + "code": "SX", + "name": "荷属圣马丁", + "enabled": true, + "name_zh": "荷属圣马丁", + "name_en": "Sint Maarten", + "sort_order": 0 + }, + { + "code": "SY", + "name": "叙利亚", + "enabled": true, + "name_zh": "叙利亚", + "name_en": "Syria", + "sort_order": 0 + }, + { + "code": "SZ", + "name": "斯威士兰", + "enabled": true, + "name_zh": "斯威士兰", + "name_en": "Eswatini", + "sort_order": 0 + }, + { + "code": "TC", + "name": "特克斯和凯科斯群岛", + "enabled": true, + "name_zh": "特克斯和凯科斯群岛", + "name_en": "Turks & Caicos Islands", + "sort_order": 0 + }, + { + "code": "TD", + "name": "乍得", + "enabled": true, + "name_zh": "乍得", + "name_en": "Chad", + "sort_order": 0 + }, + { + "code": "TF", + "name": "法属南部领地", + "enabled": true, + "name_zh": "法属南部领地", + "name_en": "French Southern Territories", + "sort_order": 0 + }, + { + "code": "TG", + "name": "多哥", + "enabled": true, + "name_zh": "多哥", + "name_en": "Togo", + "sort_order": 0 + }, + { + "code": "TH", + "name": "泰国", + "enabled": true, + "name_zh": "泰国", + "name_en": "Thailand", + "sort_order": 0 + }, + { + "code": "TJ", + "name": "塔吉克斯坦", + "enabled": true, + "name_zh": "塔吉克斯坦", + "name_en": "Tajikistan", + "sort_order": 0 + }, + { + "code": "TK", + "name": "托克劳", + "enabled": true, + "name_zh": "托克劳", + "name_en": "Tokelau", + "sort_order": 0 + }, + { + "code": "TL", + "name": "东帝汶", + "enabled": true, + "name_zh": "东帝汶", + "name_en": "Timor-Leste", + "sort_order": 0 + }, + { + "code": "TM", + "name": "土库曼斯坦", + "enabled": true, + "name_zh": "土库曼斯坦", + "name_en": "Turkmenistan", + "sort_order": 0 + }, + { + "code": "TN", + "name": "突尼斯", + "enabled": true, + "name_zh": "突尼斯", + "name_en": "Tunisia", + "sort_order": 0 + }, + { + "code": "TO", + "name": "汤加", + "enabled": true, + "name_zh": "汤加", + "name_en": "Tonga", + "sort_order": 0 + }, + { + "code": "TR", + "name": "土耳其", + "enabled": true, + "name_zh": "土耳其", + "name_en": "Turkey", + "sort_order": 0 + }, + { + "code": "TT", + "name": "特立尼达和多巴哥", + "enabled": true, + "name_zh": "特立尼达和多巴哥", + "name_en": "Trinidad & Tobago", + "sort_order": 0 + }, + { + "code": "TV", + "name": "图瓦卢", + "enabled": true, + "name_zh": "图瓦卢", + "name_en": "Tuvalu", + "sort_order": 0 + }, + { + "code": "TW", + "name": "台湾", + "enabled": true, + "name_zh": "台湾", + "name_en": "Taiwan", + "sort_order": 0 + }, + { + "code": "TZ", + "name": "坦桑尼亚", + "enabled": true, + "name_zh": "坦桑尼亚", + "name_en": "Tanzania", + "sort_order": 0 + }, + { + "code": "UA", + "name": "乌克兰", + "enabled": true, + "name_zh": "乌克兰", + "name_en": "Ukraine", + "sort_order": 0 + }, + { + "code": "UG", + "name": "乌干达", + "enabled": true, + "name_zh": "乌干达", + "name_en": "Uganda", + "sort_order": 0 + }, + { + "code": "UM", + "name": "美国本土外小岛屿", + "enabled": true, + "name_zh": "美国本土外小岛屿", + "name_en": "U.S. Outlying Islands", + "sort_order": 0 + }, + { + "code": "US", + "name": "美国", + "enabled": true, + "name_zh": "美国", + "name_en": "United States", + "sort_order": 0 + }, + { + "code": "UY", + "name": "乌拉圭", + "enabled": true, + "name_zh": "乌拉圭", + "name_en": "Uruguay", + "sort_order": 0 + }, + { + "code": "UZ", + "name": "乌兹别克斯坦", + "enabled": true, + "name_zh": "乌兹别克斯坦", + "name_en": "Uzbekistan", + "sort_order": 0 + }, + { + "code": "VA", + "name": "梵蒂冈", + "enabled": true, + "name_zh": "梵蒂冈", + "name_en": "Vatican City", + "sort_order": 0 + }, + { + "code": "VC", + "name": "圣文森特和格林纳丁斯", + "enabled": true, + "name_zh": "圣文森特和格林纳丁斯", + "name_en": "St. Vincent & Grenadines", + "sort_order": 0 + }, + { + "code": "VE", + "name": "委内瑞拉", + "enabled": true, + "name_zh": "委内瑞拉", + "name_en": "Venezuela", + "sort_order": 0 + }, + { + "code": "VG", + "name": "英属维尔京群岛", + "enabled": true, + "name_zh": "英属维尔京群岛", + "name_en": "British Virgin Islands", + "sort_order": 0 + }, + { + "code": "VI", + "name": "美属维尔京群岛", + "enabled": true, + "name_zh": "美属维尔京群岛", + "name_en": "U.S. Virgin Islands", + "sort_order": 0 + }, + { + "code": "VN", + "name": "越南", + "enabled": true, + "name_zh": "越南", + "name_en": "Vietnam", + "sort_order": 0 + }, + { + "code": "VU", + "name": "瓦努阿图", + "enabled": true, + "name_zh": "瓦努阿图", + "name_en": "Vanuatu", + "sort_order": 0 + }, + { + "code": "WF", + "name": "瓦利斯和富图纳", + "enabled": true, + "name_zh": "瓦利斯和富图纳", + "name_en": "Wallis & Futuna", + "sort_order": 0 + }, + { + "code": "WS", + "name": "萨摩亚", + "enabled": true, + "name_zh": "萨摩亚", + "name_en": "Samoa", + "sort_order": 0 + }, + { + "code": "YE", + "name": "也门", + "enabled": true, + "name_zh": "也门", + "name_en": "Yemen", + "sort_order": 0 + }, + { + "code": "YT", + "name": "马约特", + "enabled": true, + "name_zh": "马约特", + "name_en": "Mayotte", + "sort_order": 0 + }, + { + "code": "ZA", + "name": "南非", + "enabled": true, + "name_zh": "南非", + "name_en": "South Africa", + "sort_order": 0 + }, + { + "code": "ZM", + "name": "赞比亚", + "enabled": true, + "name_zh": "赞比亚", + "name_en": "Zambia", + "sort_order": 0 + }, + { + "code": "ZW", + "name": "津巴布韦", + "enabled": true, + "name_zh": "津巴布韦", + "name_en": "Zimbabwe", + "sort_order": 0 + } +] \ No newline at end of file diff --git a/Assets/Res/language/country.json.meta b/Assets/Res/language/country.json.meta new file mode 100644 index 0000000..fbc74e1 --- /dev/null +++ b/Assets/Res/language/country.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f081b83564ce6a42ac50aa5549bd454 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index b31d0c5..10bfc24 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -1513,6 +1513,11 @@ "key": "100303", "zh": "获取到{0}条消杀数据,正在上传,请稍后", "en": "Uploading {0} elimination records,please wait..." + }, + { + "key": "100304", + "zh": "请选择国家/地区", + "en": "Select country/region" } diff --git a/Assets/Res/ui/common/搜索.png b/Assets/Res/ui/common/搜索.png new file mode 100644 index 0000000000000000000000000000000000000000..c1760fc2c0bed8fbf59ebbc4f6934f0d691745b1 GIT binary patch literal 1350 zcmV-M1-bf(P)kSzQ7dT;zBlO&dSj@X zz~W}n28GL*TaKszZ}_^?={S%Ri^ZaifFq*7*mWF1B9*|+%}v8nwa=0Fu*6;WsZ&OG znaBtT$B`QaNhA^obl#_jh@_Cly z^0ILYVU)u=F%cNY5s6n-y6^RSA2QYi6*nkGW-N9aw|R*P?42HRx>lQ|b<4u}Xx>dQ#3Gn3i;cJm- zk|&UtDGPt#jkm>PbfcSp0SCGbDtsp-lgg%<~1g%Aw4S$X}N36^#J!uoDTol@vQRR= z@G01=mzjBaSx9BaUZiadPqUtj5D22LaSBp|2BvCk-NQ~+LZkY2ZOTlkQ7qg z{9+To3lgvQCDKfTY!Zb&aO6GyypW~=d%W?XArRXUgme languageList; + public List countryList; [System.Serializable] public enum LanguageType @@ -80,6 +89,9 @@ namespace Kill.Managers { TextAsset textAsset = await LoadRes.Instance.LoadAssetAsync("language", "language.json"); languageList = JsonConvert.DeserializeObject>(textAsset.text); + TextAsset countryAsset = await LoadRes.Instance.LoadAssetAsync("language", "country.json"); + countryList = JsonConvert.DeserializeObject>(countryAsset.text); + Debug.Log(countryList[0].name_zh); } public string GetLanguage(string key) { @@ -91,5 +103,9 @@ namespace Kill.Managers else return languageList[index].en; } + public Country GetCountry(string code) + { + return countryList.Find((x)=>x.code==code); + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/Components/SelectCountry.cs b/Assets/Scripts/UI/Components/SelectCountry.cs new file mode 100644 index 0000000..96b614e --- /dev/null +++ b/Assets/Scripts/UI/Components/SelectCountry.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Kill.Managers; +public class SelectCountry : MonoBehaviour +{ + public GameObject countryPrefab; + public Transform countryParent; + LanguageManager.Country selectCountry; + public void Init(string code) + { + + } + +} diff --git a/Assets/Scripts/UI/Components/SelectCountry.cs.meta b/Assets/Scripts/UI/Components/SelectCountry.cs.meta new file mode 100644 index 0000000..e0632c5 --- /dev/null +++ b/Assets/Scripts/UI/Components/SelectCountry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: af83b5b432e9529459b9439c61275924 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs b/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs index ed44e13..a8e5ee5 100644 --- a/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs +++ b/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs @@ -57,12 +57,12 @@ namespace Kill.UI.Pages string[] nowVersionParts = nowVersion.Split('.'); int nowversionNum = 0; int versionNum = 0; - int index=0; + int index=1; for(int i=nowVersionParts.Length-1;i>=0;i--) { nowversionNum += int.Parse(nowVersionParts[i]) * 10*index++; } - index = 0; + index = 1; for (int i = versionParts.Length - 1; i >= 0; i--) { versionNum += int.Parse(versionParts[i]) * 10 * index++; diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs index 1720576..5fd5da9 100644 --- a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs +++ b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs @@ -1241,6 +1241,7 @@ namespace Kill.UI.Pages while(hasBluetooth) { GetDeviceStatus(); + UploadStatisticsData(); yield return new WaitForSeconds(30); } } @@ -1395,6 +1396,30 @@ namespace Kill.UI.Pages waitTime = 0; homePageChartsCtrl.Init(); } + + /// + /// 读取设备统计数据并上传到服务器 + /// + public async void UploadStatisticsData() + { + if (!hasBluetooth || selectedDevice == null) return; + + BLECommunicationManager.Instance.ReadStatisticsData((stats) => + { + Loom.QueueOnMainThread(async () => + { + var postData = new PostStatisticsData + { + device_sn = selectedDevice.ble_mac, + kill_count = stats.EliminateCount, + total_work_time = stats.TotalWorkTime, + }; + var response = await NetworkCtrl.Instance.Post("/api/v1/device/stats", postData); + ResponseCodeHandler.HandleResponse(response, null, null); + Debug.Log($"[HomePageCtrl] 上传统计数据: 灭虫={stats.EliminateCount}, 总工时={stats.TotalWorkTime}s"); + }); + }); + } List mosquitoDatas; int aimMosquitoDataCount=0; Coroutine waitToPostMosquitoDatas=null;