Merge pull request #2548 from poooi/eventfcd

Update ship tag & map data.
poooi · Mar 5, 2024 · b4216b8 · b4216b8
2 parents 365d14b + 39319f2
commit b4216b8
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 65 deletions.
diff --git a/assets/data/fcd/map.json b/assets/data/fcd/map.json
diff --git a/assets/data/fcd/meta.json b/assets/data/fcd/meta.json
@@ -1 +1 @@
-[{"name":"map","version":"2024/03/03/01"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2023/09/07/01"}]
+[{"name":"map","version":"2024/03/03/02"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2024/03/03/02"}]
diff --git a/assets/data/fcd/shiptag.json b/assets/data/fcd/shiptag.json
@@ -1 +1 @@
-{"meta":{"name":"shiptag","version":"2023/09/07/01"},"data":{"mapname":["第二艦隊","南沙哨戒部隊","輸送護衛部隊","第一水雷戦隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","米D-Day上陸部隊"],"color":["#78716c","#10b981","#f59e0b","#71717a","#06b6d4","#6366f1","#99cc00","#ff9900","#808000","#008000","#ff00ff"],"fleetname":{"zh-CN":["第二舰队","南沙巡逻部队","运输护卫部队","第一水雷战队","第五舰队主力","第一舰队","欧州远征先遣队","英国联络部队","英海军主力部隊","英D-Day上陆部队","美D-Day上陆部队"],"zh-TW":["第二艦隊","南沙巡邏部隊","運輸護衛部隊","第一水雷戰隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","美D-Day上陸部隊"],"ja-JP":["第二艦隊","南沙哨戒部隊","輸送護衛部隊","第一水雷戦隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","米D-Day上陸部隊"],"en-US":["2nd Fleet","Nansha Patrol Fleet","Transport Escort Fleet","1st Torpedo Squadron","5th Fleet Main Force","1st Fleet","European Expedition Advance Force","British Liaison Force","British Fleet Main Force","British D-Day Landing Force","American D-Day Landing Force"]}}}
+{"meta":{"name":"shiptag","version":"2024/03/03/02"},"data":{"mapname":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","ウェーキ島輸送部隊","新編竜巻部隊","Z決戦艦隊"],"color":["#6299f6","#57d8a8","#9f89fa","#7fdfff","#ffff00","#adff2f","#c2c2c2","#0bdb38","#fbce9d","#ffa500","#ba9334"],"fleetname":{"zh-CN":["第一舰队","第二舰队","第五舰队","机动部队","第六舰队","第三舰队先遣队","前卫舰队","第三舰队","威克岛运输部队","新编龙卷部队","Z决战舰队"],"zh-TW":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","威克島運輸部隊","新編龍捲部隊","Z決戰艦隊"],"ja-JP":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","ウェーキ島輸送部隊","新編竜巻部隊","Z決戦艦隊"],"en-US":["1st Fleet","2nd Fleet","5th Fleet","Task Force","6th Fleet","3rd Fleet Advance Force","Vanguard Fleet","3rd Fleet","Wake Island Transport Unit","New Tatsumaki Squadron","Z Decisive Battle Fleet"]}}}
diff --git a/fcd/map.json b/fcd/map.json
diff --git a/fcd/shiptag.cson b/fcd/shiptag.cson
@@ -3,81 +3,81 @@
 # color: https://material.io/design/color/the-color-system.html#color-usage-and-palettes
 
 mapname: [
-  "第二艦隊"
-  "南沙哨戒部隊"
-  "輸送護衛部隊"
-  "第一水雷戦隊"
-  "第五艦隊主力"
   "第一艦隊"
-  "欧州遠征先遣隊"
-  "イギリス連絡部隊"
-  "英海軍主力部隊"
-  "英D-Day上陸部隊"
-  "米D-Day上陸部隊"
+  "第二艦隊"
+  "第五艦隊"
+  "機動部隊"
+  "第六艦隊"
+  "第三艦隊先遣隊"
+  "前衛艦隊"
+  "第三艦隊"
+  "ウェーキ島輸送部隊"
+  "新編竜巻部隊"
+  "Z決戦艦隊"
 ]
 color: [
-  "#78716c"
-  "#10b981"
-  "#f59e0b"
-  "#71717a"
-  "#06b6d4"
-  "#6366f1"
-  "#99cc00"
-  "#ff9900"
-  "#808000"
-  "#008000"
-  "#ff00ff"
+  "#6299f6"
+  "#57d8a8"
+  "#9f89fa"
+  "#7fdfff"
+  "#ffff00"
+  "#adff2f"
+  "#c2c2c2"
+  "#0bdb38"
+  "#fbce9d"
+  "#ffa500"
+  "#ba9334"
 ]
 fleetname:
   "zh-CN": [
-    "第二舰队"
-    "南沙巡逻部队"
-    "运输护卫部队"
-    "第一水雷战队"
-    "第五舰队主力"
     "第一舰队"
-    "欧州远征先遣队"
-    "英国联络部队"
-    "英海军主力部隊"
-    "英D-Day上陆部队"
-    "美D-Day上陆部队"
+    "第二舰队"
+    "第五舰队"
+    "机动部队"
+    "第六舰队"
+    "第三舰队先遣队"
+    "前卫舰队"
+    "第三舰队"
+    "威克岛运输部队"
+    "新编龙卷部队"
+    "Z决战舰队"
   ]
   "zh-TW": [
-    "第二艦隊"
-    "南沙巡邏部隊"
-    "運輸護衛部隊"
-    "第一水雷戰隊"
-    "第五艦隊主力"
     "第一艦隊"
-    "欧州遠征先遣隊"
-    "イギリス連絡部隊"
-    "英海軍主力部隊"
-    "英D-Day上陸部隊"
-    "美D-Day上陸部隊"
+    "第二艦隊"
+    "第五艦隊"
+    "機動部隊"
+    "第六艦隊"
+    "第三艦隊先遣隊"
+    "前衛艦隊"
+    "第三艦隊"
+    "威克島運輸部隊"
+    "新編龍捲部隊"
+    "Z決戰艦隊"
   ]
   "ja-JP": [
-    "第二艦隊"
-    "南沙哨戒部隊"
-    "輸送護衛部隊"
-    "第一水雷戦隊"
-    "第五艦隊主力"
     "第一艦隊"
-    "欧州遠征先遣隊"
-    "イギリス連絡部隊"
-    "英海軍主力部隊"
-    "英D-Day上陸部隊"
-    "米D-Day上陸部隊"
+    "第二艦隊"
+    "第五艦隊"
+    "機動部隊"
+    "第六艦隊"
+    "第三艦隊先遣隊"
+    "前衛艦隊"
+    "第三艦隊"
+    "ウェーキ島輸送部隊"
+    "新編竜巻部隊"
+    "Z決戦艦隊"
   ]
   "en-US": [
-    "2nd Fleet"
-    "Nansha Patrol Fleet"
-    "Transport Escort Fleet"
-    "1st Torpedo Squadron"
-    "5th Fleet Main Force"
     "1st Fleet"
-    "European Expedition Advance Force"
-    "British Liaison Force"
-    "British Fleet Main Force"
-    "British D-Day Landing Force"
-    "American D-Day Landing Force"
+    "2nd Fleet"
+    "5th Fleet"
+    "Task Force"
+    "6th Fleet"
+    "3rd Fleet Advance Force"
+    "Vanguard Fleet"
+    "3rd Fleet"
+    "Wake Island Transport Unit"
+    "New Tatsumaki Squadron"
+    "Z Decisive Battle Fleet"
   ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"name":"map","version":"2024/03/03/01"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2023/09/07/01"}]
		[{"name":"map","version":"2024/03/03/02"},{"name":"shipavatar","version":"2018/09/08/02"},{"name":"shiptag","version":"2024/03/03/02"}]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"meta":{"name":"shiptag","version":"2023/09/07/01"},"data":{"mapname":["第二艦隊","南沙哨戒部隊","輸送護衛部隊","第一水雷戦隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","米D-Day上陸部隊"],"color":["#78716c","#10b981","#f59e0b","#71717a","#06b6d4","#6366f1","#99cc00","#ff9900","#808000","#008000","#ff00ff"],"fleetname":{"zh-CN":["第二舰队","南沙巡逻部队","运输护卫部队","第一水雷战队","第五舰队主力","第一舰队","欧州远征先遣队","英国联络部队","英海军主力部隊","英D-Day上陆部队","美D-Day上陆部队"],"zh-TW":["第二艦隊","南沙巡邏部隊","運輸護衛部隊","第一水雷戰隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","美D-Day上陸部隊"],"ja-JP":["第二艦隊","南沙哨戒部隊","輸送護衛部隊","第一水雷戦隊","第五艦隊主力","第一艦隊","欧州遠征先遣隊","イギリス連絡部隊","英海軍主力部隊","英D-Day上陸部隊","米D-Day上陸部隊"],"en-US":["2nd Fleet","Nansha Patrol Fleet","Transport Escort Fleet","1st Torpedo Squadron","5th Fleet Main Force","1st Fleet","European Expedition Advance Force","British Liaison Force","British Fleet Main Force","British D-Day Landing Force","American D-Day Landing Force"]}}}
		{"meta":{"name":"shiptag","version":"2024/03/03/02"},"data":{"mapname":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","ウェーキ島輸送部隊","新編竜巻部隊","Z決戦艦隊"],"color":["#6299f6","#57d8a8","#9f89fa","#7fdfff","#ffff00","#adff2f","#c2c2c2","#0bdb38","#fbce9d","#ffa500","#ba9334"],"fleetname":{"zh-CN":["第一舰队","第二舰队","第五舰队","机动部队","第六舰队","第三舰队先遣队","前卫舰队","第三舰队","威克岛运输部队","新编龙卷部队","Z决战舰队"],"zh-TW":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","威克島運輸部隊","新編龍捲部隊","Z決戰艦隊"],"ja-JP":["第一艦隊","第二艦隊","第五艦隊","機動部隊","第六艦隊","第三艦隊先遣隊","前衛艦隊","第三艦隊","ウェーキ島輸送部隊","新編竜巻部隊","Z決戦艦隊"],"en-US":["1st Fleet","2nd Fleet","5th Fleet","Task Force","6th Fleet","3rd Fleet Advance Force","Vanguard Fleet","3rd Fleet","Wake Island Transport Unit","New Tatsumaki Squadron","Z Decisive Battle Fleet"]}}}