diff --git a/resource/copilot/old/SSS_多索雷斯在建地块.json b/resource/copilot/SSS_多索雷斯在建地塊.json similarity index 100% rename from resource/copilot/old/SSS_多索雷斯在建地块.json rename to resource/copilot/SSS_多索雷斯在建地塊.json diff --git a/resource/copilot/old/SSS_多索雷斯在建地块_塞雷娅+泥岩+维什戴尔_任意元件.json b/resource/copilot/SSS_多索雷斯在建地塊_塞雷娅+泥岩+维什戴尔_任意元件.json similarity index 100% rename from resource/copilot/old/SSS_多索雷斯在建地块_塞雷娅+泥岩+维什戴尔_任意元件.json rename to resource/copilot/SSS_多索雷斯在建地塊_塞雷娅+泥岩+维什戴尔_任意元件.json diff --git a/resource/copilot/old/SSS_多索雷斯在建地块_维什戴尔+荒芜拉普兰德+浊心斯卡蒂_镀膜装置导能阀.json b/resource/copilot/SSS_多索雷斯在建地塊_维什戴尔+荒芜拉普兰德+浊心斯卡蒂_镀膜装置导能阀.json similarity index 100% rename from resource/copilot/old/SSS_多索雷斯在建地块_维什戴尔+荒芜拉普兰德+浊心斯卡蒂_镀膜装置导能阀.json rename to resource/copilot/SSS_多索雷斯在建地塊_维什戴尔+荒芜拉普兰德+浊心斯卡蒂_镀膜装置导能阀.json diff --git a/resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_1.json b/resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_1.json similarity index 100% rename from resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_1.json rename to resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_1.json diff --git a/resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_2.json b/resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_2.json similarity index 100% rename from resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_2.json rename to resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_2.json diff --git a/resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_3.json b/resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_3.json similarity index 100% rename from resource/copilot/SSS_BarrenBeastsConcertHall_LightweightRangeFinder_3.json rename to resource/copilot/SSS_荒地群獸音樂廳_BarrenBeastsConcertHall_LightweightRangeFinder_3.json diff --git a/resource/copilot/SSS_交戰荒野_WartornWilderness_1.json b/resource/copilot/old/SSS_交戰荒野_WartornWilderness_1.json similarity index 100% rename from resource/copilot/SSS_交戰荒野_WartornWilderness_1.json rename to resource/copilot/old/SSS_交戰荒野_WartornWilderness_1.json diff --git a/resource/copilot/SSS_交戰荒野_WartornWilderness_2.json b/resource/copilot/old/SSS_交戰荒野_WartornWilderness_2.json similarity index 100% rename from resource/copilot/SSS_交戰荒野_WartornWilderness_2.json rename to resource/copilot/old/SSS_交戰荒野_WartornWilderness_2.json diff --git a/resource/copilot/SSS_玉門市集_YumenMarket_1.json b/resource/copilot/old/SSS_玉門市集_YumenMarket_1.json similarity index 100% rename from resource/copilot/SSS_玉門市集_YumenMarket_1.json rename to resource/copilot/old/SSS_玉門市集_YumenMarket_1.json diff --git a/resource/copilot/SSS_玉門市集_YumenMarket_2.json b/resource/copilot/old/SSS_玉門市集_YumenMarket_2.json similarity index 100% rename from resource/copilot/SSS_玉門市集_YumenMarket_2.json rename to resource/copilot/old/SSS_玉門市集_YumenMarket_2.json diff --git a/resource/global/txwy/resource/tasks/tasks.json b/resource/global/txwy/resource/tasks/tasks.json index 38c7f98097..0184172e15 100644 --- a/resource/global/txwy/resource/tasks/tasks.json +++ b/resource/global/txwy/resource/tasks/tasks.json @@ -711,7 +711,7 @@ "text": ["贈送", "次"] }, "RecruitingActivitiesConfirm": { - "text": ["贈送", "次", "小時"] + "text": ["贈送", "次", "小時", "分鐘"] }, "RecruitingActivitiesRecruit": { "text": ["尋訪一次", "尋訪"] @@ -755,36 +755,6 @@ "InfrastReward": { "text": ["可收穫", "訂單交付", "幹員信賴"] }, - "InfrastDormMini": { - "roi": [620, 240, 360, 480] - }, - "InfrastOffice": { - "roi": [880, 330, 400, 160] - }, - "InfrastOfficeMini": { - "roi": [980, 320, 300, 160] - }, - "InfrastProcessing": { - "roi": [880, 200, 400, 200] - }, - "InfrastProcessingMini": { - "roi": [980, 240, 300, 160] - }, - "InfrastReception": { - "roi": [880, 120, 400, 160] - }, - "InfrastReceptionMini": { - "roi": [980, 180, 300, 140] - }, - "InfrastTraining": { - "roi": [880, 420, 400, 160] - }, - "InfrastTrainingMini": { - "roi": [980, 400, 300, 140] - }, - "InfrastControlMini": { - "roi": [620, 80, 360, 230] - }, "InfrastStationedInfo": { "text": ["進駐資訊", "焦駐資訊"] }, @@ -1089,7 +1059,8 @@ ["法術調和能量場", "法术调和能量场"], ["保全人才合作協議", "保全人才合作协议"], ["皇家科學院.*遠鏡", "皇家科学院望远镜"], - ["攀雲機", "攀云机"] + ["攀雲機", "攀云机"], + ["輕型瞄準測距儀", "轻型瞄准测距仪"] ] }, "SSSBuffChooseConfirm": { diff --git a/resource/global/txwy/resource/template/ControlCenter.png b/resource/global/txwy/resource/template/ControlCenter.png index 27306e0418..c0126de8a7 100644 Binary files a/resource/global/txwy/resource/template/ControlCenter.png and b/resource/global/txwy/resource/template/ControlCenter.png differ diff --git a/resource/global/txwy/resource/template/ControlCenterMini.png b/resource/global/txwy/resource/template/ControlCenterMini.png index 6ef3b33987..bf213e21ec 100644 Binary files a/resource/global/txwy/resource/template/ControlCenterMini.png and b/resource/global/txwy/resource/template/ControlCenterMini.png differ diff --git a/resource/global/txwy/resource/template/Dorm.png b/resource/global/txwy/resource/template/Dorm.png index f04522f73b..07f89eb656 100644 Binary files a/resource/global/txwy/resource/template/Dorm.png and b/resource/global/txwy/resource/template/Dorm.png differ diff --git a/resource/global/txwy/resource/template/DormMini.png b/resource/global/txwy/resource/template/DormMini.png index 999145a86f..f4021d4601 100644 Binary files a/resource/global/txwy/resource/template/DormMini.png and b/resource/global/txwy/resource/template/DormMini.png differ diff --git a/resource/global/txwy/resource/template/InfrastFilterMenu2.png b/resource/global/txwy/resource/template/InfrastFilterMenu2.png new file mode 100644 index 0000000000..9e490061fc Binary files /dev/null and b/resource/global/txwy/resource/template/InfrastFilterMenu2.png differ diff --git a/resource/global/txwy/resource/template/InfrastFilterMenu3.png b/resource/global/txwy/resource/template/InfrastFilterMenu3.png new file mode 100644 index 0000000000..da8e5bdb05 Binary files /dev/null and b/resource/global/txwy/resource/template/InfrastFilterMenu3.png differ diff --git a/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButton.png b/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButton.png index 392296be50..a0b5d62c0c 100644 Binary files a/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButton.png and b/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButton.png differ diff --git a/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButtonAlreadyClicked.png b/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButtonAlreadyClicked.png index 68aca55aae..4d2638ae9e 100644 Binary files a/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButtonAlreadyClicked.png and b/resource/global/txwy/resource/template/InfrastFilterMenuNotStationedButtonAlreadyClicked.png differ diff --git a/resource/global/txwy/resource/template/InfrastProcessing.png b/resource/global/txwy/resource/template/InfrastProcessing.png index a604f5a8ec..d741daf6b7 100644 Binary files a/resource/global/txwy/resource/template/InfrastProcessing.png and b/resource/global/txwy/resource/template/InfrastProcessing.png differ diff --git a/resource/global/txwy/resource/template/InfrastProcessingMini.png b/resource/global/txwy/resource/template/InfrastProcessingMini.png index 991dfa8f36..212c5f66c2 100644 Binary files a/resource/global/txwy/resource/template/InfrastProcessingMini.png and b/resource/global/txwy/resource/template/InfrastProcessingMini.png differ diff --git a/resource/global/txwy/resource/template/InfrastReceptionMessageBoard-CouldReceive.png b/resource/global/txwy/resource/template/InfrastReceptionMessageBoard-CouldReceive.png new file mode 100644 index 0000000000..ebace7fab5 Binary files /dev/null and b/resource/global/txwy/resource/template/InfrastReceptionMessageBoard-CouldReceive.png differ diff --git a/resource/global/txwy/resource/template/Manufacturing.png b/resource/global/txwy/resource/template/Manufacturing.png index 12263e76ce..9888a42e77 100644 Binary files a/resource/global/txwy/resource/template/Manufacturing.png and b/resource/global/txwy/resource/template/Manufacturing.png differ diff --git a/resource/global/txwy/resource/template/ManufacturingMini.png b/resource/global/txwy/resource/template/ManufacturingMini.png index 763251af82..37b82ad427 100644 Binary files a/resource/global/txwy/resource/template/ManufacturingMini.png and b/resource/global/txwy/resource/template/ManufacturingMini.png differ diff --git a/resource/global/txwy/resource/template/Office.png b/resource/global/txwy/resource/template/Office.png index ccba9bf929..08df59ecb4 100644 Binary files a/resource/global/txwy/resource/template/Office.png and b/resource/global/txwy/resource/template/Office.png differ diff --git a/resource/global/txwy/resource/template/OfficeMini.png b/resource/global/txwy/resource/template/OfficeMini.png index 544c1a0ae2..5d85bd8ae6 100644 Binary files a/resource/global/txwy/resource/template/OfficeMini.png and b/resource/global/txwy/resource/template/OfficeMini.png differ diff --git a/resource/global/txwy/resource/template/Power.png b/resource/global/txwy/resource/template/Power.png index ff90fe1021..bc2baf0150 100644 Binary files a/resource/global/txwy/resource/template/Power.png and b/resource/global/txwy/resource/template/Power.png differ diff --git a/resource/global/txwy/resource/template/PowerMini.png b/resource/global/txwy/resource/template/PowerMini.png index 162acdb469..431155f022 100644 Binary files a/resource/global/txwy/resource/template/PowerMini.png and b/resource/global/txwy/resource/template/PowerMini.png differ diff --git a/resource/global/txwy/resource/template/Reception.png b/resource/global/txwy/resource/template/Reception.png index 12b6560fdc..bf99d115d3 100644 Binary files a/resource/global/txwy/resource/template/Reception.png and b/resource/global/txwy/resource/template/Reception.png differ diff --git a/resource/global/txwy/resource/template/ReceptionMini.png b/resource/global/txwy/resource/template/ReceptionMini.png index 199c0f0ae4..d373198f79 100644 Binary files a/resource/global/txwy/resource/template/ReceptionMini.png and b/resource/global/txwy/resource/template/ReceptionMini.png differ diff --git a/resource/global/txwy/resource/template/Trade.png b/resource/global/txwy/resource/template/Trade.png index d71de76b87..319b35c1ae 100644 Binary files a/resource/global/txwy/resource/template/Trade.png and b/resource/global/txwy/resource/template/Trade.png differ diff --git a/resource/global/txwy/resource/template/TradeMini.png b/resource/global/txwy/resource/template/TradeMini.png index 0e555a7408..a8498c673b 100644 Binary files a/resource/global/txwy/resource/template/TradeMini.png and b/resource/global/txwy/resource/template/TradeMini.png differ diff --git a/resource/global/txwy/resource/template/Training.png b/resource/global/txwy/resource/template/Training.png index 0dc82793f4..c2f6e2a81d 100644 Binary files a/resource/global/txwy/resource/template/Training.png and b/resource/global/txwy/resource/template/Training.png differ diff --git a/resource/global/txwy/resource/template/TrainingMini.png b/resource/global/txwy/resource/template/TrainingMini.png index a58fd6e3af..68353a960e 100644 Binary files a/resource/global/txwy/resource/template/TrainingMini.png and b/resource/global/txwy/resource/template/TrainingMini.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Dark/EnterInfrast.png b/resource/global/txwy/resource/template/UiTheme/Dark/EnterInfrast.png index 64d79b42d6..dad337bcd8 100644 Binary files a/resource/global/txwy/resource/template/UiTheme/Dark/EnterInfrast.png and b/resource/global/txwy/resource/template/UiTheme/Dark/EnterInfrast.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Default/EnterInfrast.png b/resource/global/txwy/resource/template/UiTheme/Default/EnterInfrast.png index 438b3f0dd3..497aeef855 100644 Binary files a/resource/global/txwy/resource/template/UiTheme/Default/EnterInfrast.png and b/resource/global/txwy/resource/template/UiTheme/Default/EnterInfrast.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Delicious/EnterInfrast.png b/resource/global/txwy/resource/template/UiTheme/Delicious/EnterInfrast.png index ee1d279167..6bceb81305 100644 Binary files a/resource/global/txwy/resource/template/UiTheme/Delicious/EnterInfrast.png and b/resource/global/txwy/resource/template/UiTheme/Delicious/EnterInfrast.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Delicious/OperBoxEnter.png b/resource/global/txwy/resource/template/UiTheme/Delicious/OperBoxEnter.png new file mode 100644 index 0000000000..0d53883e3a Binary files /dev/null and b/resource/global/txwy/resource/template/UiTheme/Delicious/OperBoxEnter.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Delicious/Task.png b/resource/global/txwy/resource/template/UiTheme/Delicious/Task.png new file mode 100644 index 0000000000..5ff6ec2139 Binary files /dev/null and b/resource/global/txwy/resource/template/UiTheme/Delicious/Task.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Delicious/Terminal.png b/resource/global/txwy/resource/template/UiTheme/Delicious/Terminal.png new file mode 100644 index 0000000000..df22efcca9 Binary files /dev/null and b/resource/global/txwy/resource/template/UiTheme/Delicious/Terminal.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Sami/EnterInfrast.png b/resource/global/txwy/resource/template/UiTheme/Sami/EnterInfrast.png index a14df9d658..614ce7540a 100644 Binary files a/resource/global/txwy/resource/template/UiTheme/Sami/EnterInfrast.png and b/resource/global/txwy/resource/template/UiTheme/Sami/EnterInfrast.png differ diff --git a/resource/global/txwy/resource/template/UiTheme/Siege/EnterInfrast.png b/resource/global/txwy/resource/template/UiTheme/Siege/EnterInfrast.png deleted file mode 100644 index c42247ee92..0000000000 Binary files a/resource/global/txwy/resource/template/UiTheme/Siege/EnterInfrast.png and /dev/null differ