Merge branch 'master' of git.kingsome.cn:node/card_info_svr

This commit is contained in:
zhl 2021-01-26 19:14:11 +08:00
commit c99ccb328b

View File

@ -73,7 +73,7 @@ let ItemMan = {
* @returns * @returns
*/ */
getItemPrice(itemid: number): ItemInfo{ getItemPrice(itemid: number): ItemInfo{
let item: CommonItem = this._items.get(itemid); let item: CommonItem = this.findItem(itemid);
return item? item._priceinfo: new ItemInfo(); return item? item._priceinfo: new ItemInfo();
}, },
@ -146,7 +146,7 @@ let ItemMan = {
_openItemPkg(pkg: CommonItem, count: number, dpcard: boolean, reslst: CIC[]){ _openItemPkg(pkg: CommonItem, count: number, dpcard: boolean, reslst: CIC[]){
if(pkg._solidsubitems){ if(pkg._solidsubitems){
pkg._solidsubitems.forEach((item: ItemInfo) => { pkg._solidsubitems.forEach((item: ItemInfo) => {
let obj = this._items.get(item.id); let obj = this.findItem(item.id);
this._useItem(obj, item.count * count, false, reslst); this._useItem(obj, item.count * count, false, reslst);
}); });
} }
@ -158,7 +158,7 @@ let ItemMan = {
//todo: //todo:
continue; continue;
} }
let obj = this._items.get(info.id); let obj = this.findItem(info.id);
if(!obj){ if(!obj){
//todo: //todo:
continue; continue;
@ -238,7 +238,7 @@ let ItemMan = {
} }
v._randexitems && v._randexitems.forEach((item: ItemInfo) =>{ v._randexitems && v._randexitems.forEach((item: ItemInfo) =>{
let obj: CommonItem = this._items.get(item.id); let obj: CommonItem = this.findItem(item.id);
obj && (item.weight = obj._weight); obj && (item.weight = obj._weight);
}); });
}); });