抓马播报
@@ -49,6 +45,7 @@ import SimpleServer from "./daily/SimpleServer.vue";
import SimpleDaily from "./daily/SimpleDaily.vue";
import SimpleWeek from "./daily/SimpleWeek.vue";
import SimpleCelebrity from "./daily/SimpleCelebrity.vue";
+import SimpleReputation from "./daily/SimpleReputation.vue";
import SimpleFurniture from "./daily/SimpleFurniture.vue";
import SimpleHorse from "./daily/SimpleHorse.vue";
import dailyKeys from "@/assets/data/daily_keys.json";
@@ -58,6 +55,7 @@ export default {
SimpleNotice,
SimpleServer,
SimpleDaily,
+ SimpleReputation,
SimpleCelebrity,
SimpleWeek,
SimpleFurniture,
diff --git a/src/components/gonggao/daily/SimpleFurniture.vue b/src/components/gonggao/daily/SimpleFurniture.vue
index 9f2f97f08..de4dfb8a2 100644
--- a/src/components/gonggao/daily/SimpleFurniture.vue
+++ b/src/components/gonggao/daily/SimpleFurniture.vue
@@ -1,20 +1,23 @@
-
+
@@ -26,10 +29,10 @@ export default {
type: Object,
required: true,
},
- title : {
- type: String,
- default: ''
- }
+ nextFurniture: {
+ type: Object,
+ required: true,
+ },
},
};
diff --git a/src/components/gonggao/daily/SimpleHorse.vue b/src/components/gonggao/daily/SimpleHorse.vue
index 08f21ae3b..b34f77e3e 100644
--- a/src/components/gonggao/daily/SimpleHorse.vue
+++ b/src/components/gonggao/daily/SimpleHorse.vue
@@ -1,54 +1,134 @@
{{title}}
+ 园宅会赛
评分标准：
- {{ furniture.property }}
+ {{ furniture.property || "-" }}
-
-
-
-
-
切换
+
+
+
+
- 马场
+
+
{{ item.map_name }}
+
+ {{ item.fromTime }}
+ ~
+ {{ item.toTime }}
+
+ 暂无信息
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
-
+
+
坐标：(${coor.x},${coor.y},${coor.z})`, - ...coor, - }, - ]; + ...coor, + }, + ] + : []; const obj = { mapDatas: result, map_id: mapId, @@ -255,12 +335,20 @@ export default { minute: minute, horseIndex: index, }); + } else { + newThreeList.push({ + map_name: item.map_name, + id: index ? Number(index + item.id.toString()) : item.id, + subtype: item.subtype, + map_id: item.map_id, + horseIndex: -1, // 没有马驹 + }); } } }); }); const newList = newThreeList.concat(bList); - this.list = newList + const allList = newList .map((item) => { let fromTime = ""; let toTime = ""; @@ -285,6 +373,17 @@ export default { .sort(function (a, b) { return dayjs.tz(b.created_at).valueOf() - dayjs.tz(a.created_at).valueOf(); }); + this.list = allList.filter( + (item) => item.subtype !== "npc_chat" && !this.defaultKeys.includes(item.map_name) + ); + this.defaultList = this.defaultKeys.map((name) => { + const item = allList.find((item) => item.map_name === name) || { + map_name: name, + id: name, + horses: [], + }; + return item; + }); }); }, }, diff --git a/src/components/gonggao/daily/SimpleReputation.vue b/src/components/gonggao/daily/SimpleReputation.vue new file mode 100644 index 000000000..5f4b44af3 --- /dev/null +++ b/src/components/gonggao/daily/SimpleReputation.vue @@ -0,0 +1,51 @@ + +
+
-
@@ -66,6 +146,8 @@ export default {
return {
noList: [],
list: [],
+ // 固定三大马场
+ defaultList: [],
params: {
pageIndex: 1,
pageSize: 50,
@@ -85,6 +167,8 @@ export default {
time: "",
},
chituLoading: false,
+ listIndex: 0,
+ remainNum: 2, // 第一页还能展示几个播报
};
},
computed: {
@@ -101,6 +185,9 @@ export default {
server() {
return this.$store.state.server;
},
+ defaultKeys() {
+ return Object.values(this.chituMap);
+ },
},
watch: {
server: {
@@ -115,9 +202,11 @@ export default {
},
},
methods: {
+ switchList() {
+ this.listIndex = ~~!this.listIndex;
+ },
loadChituData() {
const server = this.server;
- console.log(server);
// 周二7点到下周一7点为一个CD， 7天内随机刷一只，地图为黑戈壁、阴山大草原、鲲鹏岛
this.chituLoading = true;
getChituHorse(server)
@@ -126,17 +215,6 @@ export default {
if (!list.length) {
return;
}
- // // 最近刷新时间
- // const created_at = dayjs.tz(list?.[0].created_at);
- // // 本周时间
- // const weekTime = [dayjs.tz().startOf("isoWeek"), dayjs.tz().endOf("isoWeek")];
- // // 本CD时间
- // const cdTime = [
- // dayjs.tz(weekTime[0]).add(1, "day").add(7, "hour"),
- // dayjs.tz(weekTime[1]).add(1, "day").add(7, "hour"),
- // ];
- // // 本cd是否刷新
- // const isBetween = dayjs.tz(created_at).isBetween(cdTime[0], cdTime[1]);
// 最近刷新时间
const created_at = dayjs.tz(list?.[0].created_at || dayjs.tz());
@@ -191,8 +269,8 @@ export default {
// 预测
mapId = String(item.map_id);
mapName = item.map_name;
- coordinates = horseSites[mapId].coordinates;
- horses = horseSites[mapId].horses[item.horseIndex];
+ coordinates = item.horseIndex !== -1 ? horseSites[mapId].coordinates : [];
+ horses = item.horseIndex !== -1 ? horseSites[mapId].horses[item.horseIndex] : [];
} else {
// 播报
mapName = item.content.match(/在(\S*)出没/) ? item.content.match(/在(\S*)出没/)[1] : "";
@@ -204,14 +282,16 @@ export default {
}
}
}
- const coor = coordinates[0];
- result[mapId] = [
- {
- content: `${horses.join()}
+ const coor = coordinates?.[0];
+ result[mapId] = coor
+ ? [
+ {
+ content: `${horses.join()}
赤兔
+
+
+
+ {{ existData.map }}
+
+
+
+ {{ existData.time }}
+
+
+ 本CD尚未刷新
{{ existData.map }}
+ >
+
+
+
- {{ existData.time }}
- 本CD尚未刷新
坐标：(${coor.x},${coor.y},${coor.z})`, - ...coor, - }, - ]; + ...coor, + }, + ] + : []; const obj = { mapDatas: result, map_id: mapId, @@ -255,12 +335,20 @@ export default { minute: minute, horseIndex: index, }); + } else { + newThreeList.push({ + map_name: item.map_name, + id: index ? Number(index + item.id.toString()) : item.id, + subtype: item.subtype, + map_id: item.map_id, + horseIndex: -1, // 没有马驹 + }); } } }); }); const newList = newThreeList.concat(bList); - this.list = newList + const allList = newList .map((item) => { let fromTime = ""; let toTime = ""; @@ -285,6 +373,17 @@ export default { .sort(function (a, b) { return dayjs.tz(b.created_at).valueOf() - dayjs.tz(a.created_at).valueOf(); }); + this.list = allList.filter( + (item) => item.subtype !== "npc_chat" && !this.defaultKeys.includes(item.map_name) + ); + this.defaultList = this.defaultKeys.map((name) => { + const item = allList.find((item) => item.map_name === name) || { + map_name: name, + id: name, + horses: [], + }; + return item; + }); }); }, }, diff --git a/src/components/gonggao/daily/SimpleReputation.vue b/src/components/gonggao/daily/SimpleReputation.vue new file mode 100644 index 000000000..5f4b44af3 --- /dev/null +++ b/src/components/gonggao/daily/SimpleReputation.vue @@ -0,0 +1,51 @@ + +
+
+
+
+
+
+
diff --git a/src/components/gonggao/daily/SimpleWeek.vue b/src/components/gonggao/daily/SimpleWeek.vue
index 32124edd2..49c557a51 100644
--- a/src/components/gonggao/daily/SimpleWeek.vue
+++ b/src/components/gonggao/daily/SimpleWeek.vue
@@ -52,8 +52,9 @@ export default {
},
methods: {
getItem(val) {
- if (val.indexOf("英雄") > -1) {
- return val.split("英雄")[1];
+ const str = "英雄";
+ if (val.indexOf(str) > -1) {
+ return val.split(str)[1];
}
return val;
},
声望
+
+
+
+
+ {{ name }}
+