-
+
@@ -36,6 +69,7 @@ import {MapChart} from 'echarts/charts';
import {CanvasRenderer} from 'echarts/renderers';
import {onMounted, onUnmounted, reactive, ref, watch} from "vue";
import {useStore} from "vuex";
+import {DisplayWeapon} from '@/utils'
import $ from 'jquery'
@@ -57,7 +91,8 @@ export default {
const data = reactive({
selectPlayer: 'All',
selectWeapon: 'All',
- eq_map: []
+ eq_map: [],
+ weaponDmg: []
})
let myChart1
@@ -70,6 +105,16 @@ export default {
return 650
}
+ const setDmgWidth = () => {
+ const windowWidth = getWindowWidth()
+ if (windowWidth >= 500)
+ return 500
+ else
+ return windowWidth - 10
+ }
+
+ const dmgWidth = ref(setDmgWidth())
+
const setHeight = () => {
const windowWidth = getWindowWidth()
if (windowWidth >= 751)
@@ -83,6 +128,17 @@ export default {
const width = ref(getWindowWidth())
const height = ref(setHeight())
+ const processWeaponDmg = (id) => {
+ let value = ''
+ data.weaponDmg.forEach(w => {
+ if (Object.keys(w).toString() === id) {
+ value = Object.values(w).toString()
+ }
+ })
+
+ return value
+ }
+
const processPlayerWeapon = () => {
let arr = []
if (data.selectPlayer === 'All') {
@@ -152,7 +208,7 @@ export default {
return arr2
}
- const processDmg = () => {
+ const processDmg = (by = 'hitgroup') => {
let arr = []
if (data.selectPlayer && data.selectWeapon) {
switch (data.selectPlayer) {
@@ -165,14 +221,26 @@ export default {
// 1: hitgroup
// 2: dmg
if (weapon) {
- if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
- } else if (data.selectWeapon === 'All') {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
+ if (by === 'hitgroup') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ }
+ } else if (by === 'weapon') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ }
}
}
})
@@ -192,14 +260,26 @@ export default {
// 1: hitgroup
// 2: dmg
if (weapon) {
- if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
- } else if (data.selectWeapon === 'All') {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
+ if (by === 'hitgroup') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ }
+ } else if (by === 'weapon') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ }
}
}
})
@@ -220,14 +300,26 @@ export default {
// 1: hitgroup
// 2: dmg
if (weapon) {
- if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
- } else if (data.selectWeapon === 'All') {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
+ if (by === 'hitgroup') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ }
+ } else if (by === 'weapon') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ }
}
}
})
@@ -247,14 +339,26 @@ export default {
// 1: hitgroup
// 2: dmg
if (weapon) {
- if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
- } else if (data.selectWeapon === 'All') {
- let obj = {}
- obj[weapon[1]] = weapon[2]
- arr.push(obj)
+ if (by === 'hitgroup') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[1]] = weapon[2]
+ arr.push(obj)
+ }
+ } else if (by === 'weapon') {
+ if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ } else if (data.selectWeapon === 'All') {
+ let obj = {}
+ obj[weapon[0]] = weapon[2]
+ arr.push(obj)
+ }
}
}
})
@@ -267,10 +371,15 @@ export default {
} else {
arr = []
}
- buildCharts(sumDmgArr(arr))
+
+ if (by === 'hitgroup') {
+ buildCharts(sumDmgArr(arr))
+ } else if (by === 'weapon') {
+ data.weaponDmg = sumDmgArr(arr, 'weapon')
+ }
}
- const sumDmgArr = (arr) => {
+ const sumDmgArr = (arr, by = 'hitgroup') => {
let holder = {};
arr.forEach(function (d) {
@@ -284,12 +393,26 @@ export default {
let arr2 = [];
- for (let i = 1; i < 8; i++) {
- if (holder[i] !== undefined) {
- arr2.push(holder[i])
- } else {
- arr2.push(0)
+ if (by === 'hitgroup') {
+ for (let i = 1; i < 8; i++) {
+ if (holder[i] !== undefined) {
+ arr2.push(holder[i])
+ } else {
+ arr2.push(0)
+ }
}
+ } else if (by === 'weapon') {
+ for (let i = 1; i < 312; i++) {
+ if (holder[i] !== undefined) {
+ let obj = {}
+ obj[i] = holder[i]
+ arr2.push(obj)
+ }
+ }
+
+ arr2.sort((a, b) => {
+ return Object.values(b).toString() - Object.values(a).toString()
+ })
}
return arr2
@@ -301,6 +424,7 @@ export default {
if (arr[i] > max)
max = arr[i]
}
+
return max
}
@@ -380,6 +504,7 @@ export default {
watch(() => props.stats, () => {
processDmg()
+ processDmg('weapon')
processPlayerWeapon()
})
}
@@ -393,6 +518,7 @@ export default {
if (window.innerWidth <= 750) {
width.value = getWindowWidth() - 20
height.value = setHeight()
+ dmgWidth.value = setDmgWidth()
}
buildCharts()
@@ -402,34 +528,29 @@ export default {
data.selectWeapon = 'All'
processPlayerWeapon()
processDmg()
+ processDmg('weapon')
})
watch(() => data.selectWeapon, () => {
processDmg()
+ processDmg('weapon')
})
- return {props, data, store, processPlayerWeapon}
+ return {props, data, store, dmgWidth, processPlayerWeapon, processWeaponDmg, DisplayWeapon}
}
}
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
|
+ |
+ + + {{ processWeaponDmg(Object.keys(value).toString()) }} + + | +