Merge branch 'doubling_cards_wip/cols_1' into doubling_cards

This commit is contained in:
2021-03-16 20:34:19 +00:00

View File

@@ -106,20 +106,23 @@
</v-col> </v-col>
<v-col cols="10"> <v-col cols="10">
<div cols="12"> <div cols="12">
{{ selected_shikigami_decks[index][index] }} <!-- {{ selected_shikigami_decks[index][index] }} -->
</div> </div>
<div cols="12"> <v-row cols="12" class="d-flex">
<v-card <v-card
v-for="i in selected_shikigami_decks[index][index]" v-for="i in selected_shikigami_decks[index][index]"
:key="i.id" :key="i.id"
max-width="12.5%" width="12.4%"
> >
<div class="text-center">
{{ i.name }} {{ i.name }}
</div>
<v-img <v-img
:src="require(`@/assets/deck_of_cards/${i.url}`)" :src="require(`@/assets/deck_of_cards/${i.url}`)"
></v-img> class="deck-card"
</v-card> ></v-img
</div> ></v-card>
</v-row>
</v-col> </v-col>
</v-row> </v-row>
</v-card> </v-card>
@@ -135,11 +138,6 @@ export default {
selected_shikigami_data: [], selected_shikigami_data: [],
selected_shikigami_decks: [{ 0: [] }, { 1: [] }, { 2: [] }, { 3: [] }], selected_shikigami_decks: [{ 0: [] }, { 1: [] }, { 2: [] }, { 3: [] }],
shikigami: shikigami, shikigami: shikigami,
colors: [
{ id: 1, title: "red" },
{ id: 2, title: "blue" },
{ id: 3, title: "red" },
],
}), }),
methods: { methods: {
get_chosen_shikigami_data: function (shikigami_name) { get_chosen_shikigami_data: function (shikigami_name) {
@@ -176,22 +174,6 @@ export default {
console.log(this.selected_shikigami_decks[shiki_index].shiki_index); console.log(this.selected_shikigami_decks[shiki_index].shiki_index);
console.log(shiki_index, card_index); console.log(shiki_index, card_index);
}, },
double_cards(index) {
console.log("looping");
const doubled_cards = this.doubled_cards;
console.log(doubled_cards[index].index);
console.log(this.doubled_cards[index][index]);
this.selected_shikigami_data[index].cards.forEach(function (el) {
let id_0 = Math.random().toString(36).slice(6);
let id_1 = Math.random().toString(36).slice(6);
doubled_cards[index][index].push(
{ id: id_0, card: el },
{ id: id_1, card: el }
);
});
this.doubled_cards = doubled_cards;
return this.doubled_cards;
},
}, },
computed: {}, computed: {},
watch: { watch: {
@@ -218,4 +200,16 @@ export default {
height: 60px !important; height: 60px !important;
width: 60px !important; width: 60px !important;
} }
.deck-card:hover {
position: relative;
animation: scaleMe 500ms ease-in-out 0s forwards;
z-index: 100;
}
@keyframes scaleMe {
100% {
transform: scale(1.25);
}
}
</style> </style>