Merge branch 'version/v0.1' of gitlab.trgame.cn:zyztech/zyz_server

# Conflicts:
#	shared/resource/jsons/dic_api.json
This commit is contained in:
luying
2022-01-19 13:46:57 +08:00
27 changed files with 86 additions and 68 deletions

View File

@@ -773,7 +773,7 @@ export function getWishPoolReward(id: number) {
if(dicItid.type == CONSUME_TYPE.PIECE) {
starLevel = dicGoods.equipLvl;
}
console.log('*****', dicGoods.itid, starLevel, dicGoods.quality)
// console.log('*****', dicGoods.itid, starLevel, dicGoods.quality)
return gameData.guildWishReward.get(`${dicGoods.itid}_${starLevel}_${dicGoods.quality}`);
}