Quellcode durchsuchen

did some work on the todo list

tags/v0.1.4^2
Big Bad Waffle vor 7 Jahren
Ursprung
Commit
4df5d03909
9 geänderte Dateien mit 11 neuen und 20 gelöschten Zeilen
  1. +2
    -2
      src/client/ui/templates/characters/styles.less
  2. +4
    -4
      src/client/ui/templates/inventory/inventory.js
  3. +3
    -3
      src/client/ui/templates/online/styles.less
  4. +2
    -11
      src/server/components/inventory.js
  5. BIN
     
  6. BIN
     
  7. BIN
     
  8. BIN
     
  9. BIN
     

+ 2
- 2
src/client/ui/templates/characters/styles.less Datei anzeigen

@@ -88,14 +88,14 @@
}

.name {
width: 60%;
width: 47%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.class {
width: 40%;
width: 53%;
text-align: right;
color: darken(@white, 25%);
}


+ 4
- 4
src/client/ui/templates/inventory/inventory.js Datei anzeigen

@@ -118,11 +118,11 @@ define([
var itemEl = $(tplItem)
.appendTo(container);

var spritesheet = item.spritesheet || 'items';
var spritesheet = item.spritesheet || '../../../images/items.png';
if (item.material)
spritesheet = 'materials';
spritesheet = '../../../images/materials.png';
else if (item.quest)
spritesheet = 'questItems';
spritesheet = '../../../images/questItems.png';

itemEl
.data('item', item)
@@ -132,7 +132,7 @@ define([
.on('mousemove', this.onHover.bind(this, itemEl, item))
.on('mouseleave', this.hideTooltip.bind(this, itemEl, item))
.find('.icon')
.css('background', 'url(../../../images/' + spritesheet + '.png) ' + imgX + 'px ' + imgY + 'px')
.css('background', 'url(' + spritesheet + ') ' + imgX + 'px ' + imgY + 'px')
.on('contextmenu', this.showContext.bind(this, item));

if (item.quantity)


+ 3
- 3
src/client/ui/templates/online/styles.less Datei anzeigen

@@ -6,7 +6,7 @@
width: 400px;
height: 400px;
background-color: @gray;
padding: 32px;
padding: 10px;
border: 4px solid @lightGray;
text-align: center;
@@ -30,11 +30,11 @@
}

&:nth-child(2) {
width: 60%;
width: 55%;
}

&:nth-child(3) {
width: 30%;
width: 35%;
}
}



+ 2
- 11
src/server/components/inventory.js Datei anzeigen

@@ -337,7 +337,7 @@ define([
);
});

//if (!hasSpell) {
if (!hasSpell) {
var item = generator.generate({
spell: true,
spellQuality: 'basic',
@@ -346,16 +346,7 @@ define([
item.eq = true;
item.noSalvage = true;
this.getItem(item);

item = generator.generate({
spell: true,
spellQuality: 'basic',
spellName: classes.spells[this.obj.class][1]
});
item.eq = true;
item.noSalvage = true;
this.getItem(item);
//}
}
},

createBag: function(x, y, items, ownerId) {







Laden…
Abbrechen
Speichern