Parcourir la source

CardCollectionDemo Bugged

Dim Dim il y a 6 ans
Parent
commit
702f08accf

+ 1 - 1
src/Game/views/base/Card.js

@@ -151,7 +151,7 @@ class Card extends GuiableContainer{
     attach(holder = null) { 
         this._holder = holder;
         setTimeout(() => {
-            this.moveTo(this.parent.toLocal(holder.getGlobalPosition()))
+            this.moveTo(this.parent.toLocal(holder.getGlobalPosition()));
         }, 10);
     }
     

+ 3 - 3
src/Game/views/base/CollectionHolder.js

@@ -17,7 +17,7 @@ class CollectionHolder extends CardHolder {
         let {
             counter,
             zInit,
-            cardNumber,
+            id,
             GameLayer,
             deckNumber
         } = props;
@@ -25,7 +25,7 @@ class CollectionHolder extends CardHolder {
         // Properties Component 
         this.counter = counter || 0;
         this.z = zInit || 10;
-        this.cardNumber = cardNumber;
+        this.id = id;
         this.GameLayer = GameLayer;
         this.deckNumber = deckNumber || 0;
         // this.count = 0;
@@ -88,7 +88,7 @@ class CollectionHolder extends CardHolder {
     }
 
     createCardGrey(){
-        let card = new Card({GameLayer: this.GameLayer, id:this.cardNumber});
+        let card = new Card({GameLayer: this.GameLayer, id: this.id});
         card.zIndex = this.z - 5;
         card.attach(this);
         card.unsetEvents();

+ 12 - 12
src/Game/views/buildings/Collection.js

@@ -2,11 +2,11 @@ import * as PIXI from 'pixi.js';
 // import config from '../../config';
 import GuiableContainer from '../../../helpers/Guiable';
 
-import CardHolder from '../base/CardHolder';
+import CollectionHolder from '../base/CollectionHolder';
 
 import Button from '../misc/Button.js';
-//to be deleted
-import Card from '../base/Card.js';
+
+//import Card from '../base/Card.js';
 
 const DefaultImageUrl = '/files/assets/ui/papyrus.jpg';
 const DefaultImage = PIXI.Texture.fromImage(DefaultImageUrl);
@@ -57,18 +57,18 @@ class CollectionHandler extends GuiableContainer{
         this.sprite.height= h;
         
         this.addChild(this.sprite);
-        let card = new Card({'x':100, 'y':120});
-        card.zIndex = 4;
-        this.addChild(card);
+        // let card = new Card({'x':100, 'y':120});
+        // card.zIndex = 4;
+        // this.addChild(card);
         //
         this.addUI(props);
         this.position.set(-500,-320);
 
-        this.cards.push(new CardHolder({GameLayer, 'x': 160, 'y': -230, team: 0, id: 3}).scaleTo(CollectionScale));
-        this.cards.push(new CardHolder({GameLayer, 'x': 160, 'y': 0, team: 1, id: 1}).scaleTo(CollectionScale));
-        this.cards.push(new CardHolder({GameLayer, 'x': 0, 'y': -230, team: 1, id: 5}).scaleTo(CollectionScale));
-        this.cards.push(new CardHolder({GameLayer, 'x': 0, 'y': 0, team: 1, id: 4}).scaleTo(CollectionScale));
-        this.cards.push(new CardHolder({GameLayer, 'x': 80, 'y': 230, team: 1, id: 3}).scaleTo(CollectionScale));
+        this.cards.push(new CollectionHolder({GameLayer, 'x': 0, 'y': 0, team: 0, id: 3}).scaleTo(CollectionScale));
+        this.cards.push(new CollectionHolder({GameLayer, 'x': 0, 'y': 0, team: 1, id: 1}).scaleTo(CollectionScale));
+        this.cards.push(new CollectionHolder({GameLayer, 'x': 0, 'y': -230, team: 1, id: 5}).scaleTo(CollectionScale));
+        this.cards.push(new CollectionHolder({GameLayer, 'x': 0, 'y': 0, team: 1, id: 4}).scaleTo(CollectionScale));
+        this.cards.push(new CollectionHolder({GameLayer, 'x': 80, 'y': 230, team: 1, id: 3}).scaleTo(CollectionScale));
         this.cards.forEach((c) => c.show());
         this.cards.forEach((c) => this.addChild(c));
 
@@ -87,7 +87,7 @@ class CollectionHandler extends GuiableContainer{
         super._kill();
     }
 
-    addUI(props){
+    addUI(){
         let leftButton = new Button({GameLayer: this.GameLayer, Text: {text: 'Alerta'}, 'x': 130, 'y': 540});
         leftButton.scale.set(0.3);
         this.addChild(leftButton.onClick(() =>{

+ 1 - 0
src/Game/views/demo/CardCollectionDemo.js

@@ -4,6 +4,7 @@ import 'pixi-layers';
 import Injector from '../../services/Injector';
 
 //import CardCollection from '../base/CardCollection';
+//import DeckCollection from '../buildings/DeckCollection';
 import Collection from '../buildings/Collection';
 import CollectionDeck from '../base/CollectionDeck';