diff --git a/game-server/app/servers/guild/handler/raceActivityHandler.ts b/game-server/app/servers/guild/handler/raceActivityHandler.ts index 4b4f4c781..b0db6d4a3 100644 --- a/game-server/app/servers/guild/handler/raceActivityHandler.ts +++ b/game-server/app/servers/guild/handler/raceActivityHandler.ts @@ -112,6 +112,7 @@ export class RaceActivityHandler { let events = obj.getEvents(guildCode, woodenHorse.distance); let hasJoin = obj.hasJoin(guildCode, roleId); + let items = obj.getItem(roleId); let woodenHorseList = await getWoodenHorseList(guildCode, serverId); @@ -119,7 +120,8 @@ export class RaceActivityHandler { ...statusResult, hasJoin, woodenHorseList, - events + events, + items }); } @@ -144,7 +146,7 @@ export class RaceActivityHandler { return resResult(STATUS.SUCCESS, { timestamp: Date.now(), - event: obj.getEvents(guildCode, 0) + events: obj.getEvents(guildCode, 0) }); } diff --git a/game-server/app/servers/role/handler/shopHandler.ts b/game-server/app/servers/role/handler/shopHandler.ts index 11119ee74..2bfe6735a 100644 --- a/game-server/app/servers/role/handler/shopHandler.ts +++ b/game-server/app/servers/role/handler/shopHandler.ts @@ -10,6 +10,7 @@ import { handleCost, addItems } from "../../../services/rewardService"; import { GuildModel } from "../../../db/Guild"; import { SHOP } from "../../../pubUtils/dicParam"; import { getHonourObject } from "../../../pubUtils/itemUtils"; +import { HeroModel } from "../../../db/Hero"; export default function(app: Application) { return new ShopHandler(app); @@ -94,6 +95,13 @@ export class ShopHandler { } } + let goodsId = dicShopItem.goodid; + let skinInfo = gameData.fashion.get(goodsId); + if (skinInfo) { + let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId); + if(!hero) return resResult(STATUS.SKIN_HAS_NOT_HERO); + } + let dbShop = await DicShopListModel.findByShopId(dicShopItem.shop); let discount = 1; @@ -105,8 +113,10 @@ export class ShopHandler { } let userShop = await UserShopModel.findByRoleAndItem(roleId, dicShopItem.id); - if(userShop && userShop.count + count > dicShopItem.purchaseLimit) { - return resResult(STATUS.BUY_COUNT_OVER); + if(dicShopItem.purchaseLimit != -1) { + if(userShop && userShop.count + count > dicShopItem.purchaseLimit) { + return resResult(STATUS.BUY_COUNT_OVER); + } } // 消耗 @@ -184,4 +194,12 @@ export class ShopHandler { await DicShopListModel.createShop(dic.shop, true, { id, order: index--, discount: 1 }) } } + + // !测试接口。 去除限购次数 + async clearPurchaseLimit(msg: { goodsId: number, count: number }, session: BackendSession) { + let roleId = session.get('roleId'); + + await UserShopModel.deleteAccount(roleId); + return resResult(STATUS.SUCCESS); + } } \ No newline at end of file diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts index d8ed1026f..b7b172e0f 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/rewardService.ts @@ -158,6 +158,7 @@ export async function addItems(roleId: string, roleName: string, sid: string, go let skinInfos = []; let addSkinIds = []; + for (let skinId of skins) {//皮肤推送 let result = await addSkins(roleId, skinId); if (!!result) { diff --git a/shared/consts/constModules/itemConst.ts b/shared/consts/constModules/itemConst.ts index 36830095d..dc99c1259 100644 --- a/shared/consts/constModules/itemConst.ts +++ b/shared/consts/constModules/itemConst.ts @@ -154,7 +154,9 @@ export const CURRENCY_TYPE = { EXPEDITION_POINT: "expeditionPoint", DUNGEON_POINT: "dungeonPoint", FRIEND_POINT: "friendPoint", - HONOUR: "honour" + HONOUR: "honour", + SKIN_COIN: "skinCoin", + DUNGEON: "dungeon" } @@ -170,7 +172,9 @@ const currencyArr = [ { "gid": 40002, "name": "寻宝币", "type": CURRENCY_TYPE.TREASURE_POINT }, { "gid": 40003, "name": "情谊点", "type": CURRENCY_TYPE.FRIEND_POINT }, { "gid": 40004, "name": "秘境币", "type": CURRENCY_TYPE.DUNGEON_POINT }, - { "gid": 40005, "name": "功勋", "type": CURRENCY_TYPE.HONOUR } + { "gid": 40005, "name": "功勋", "type": CURRENCY_TYPE.HONOUR }, + { "gid": 40006, "name": "蜀锦", "type": CURRENCY_TYPE.SKIN_COIN }, + { "gid": 40007, "name": "秘境币", "type": CURRENCY_TYPE.DUNGEON } ]; export const CURRENCY = new Map(); export const CURRENCY_BY_TYPE = new Map(); diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 988d08442..509ae0355 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -307,6 +307,7 @@ export const STATUS = { BUY_COUNT_OVER: { code: 30900, simStr: '已超过限购次数' }, GUILD_LV_LIMIT: { code: 30901, simStr: '军团等级不足' }, ITEM_NOT_SOUL: { code: 30902, simStr: '该物品不是将魂' }, + SKIN_HAS_NOT_HERO: { code: 30903, simStr: '未拥有该武将不可获得皮肤' }, // 社交相关状态 40000 - 49999 SYS_CHANNEL_AUTH_NOT_ENOUGH: {code: 40000, simStr: '无法在系统频道发送消息'}, diff --git a/shared/db/UserShop.ts b/shared/db/UserShop.ts index e305c7887..4ca377872 100644 --- a/shared/db/UserShop.ts +++ b/shared/db/UserShop.ts @@ -86,6 +86,10 @@ export default class UserShop extends BaseModel { return rec; } + public static async deleteAccount(roleId: string) { + let result = await UserShopModel.deleteMany({roleId}); + return result; + } } export const UserShopModel = getModelForClass(UserShop); diff --git a/shared/domain/battleField/guildActivity.ts b/shared/domain/battleField/guildActivity.ts index 2379b4cbc..8db0043c7 100644 --- a/shared/domain/battleField/guildActivity.ts +++ b/shared/domain/battleField/guildActivity.ts @@ -222,6 +222,10 @@ export class RaceActivityObject { private events: Map = new Map(); // 每个军团遇到的事件 private items: Map = new Map(); // 每个玩家的道具 roleId => [{id, count}] + public getItem(roleId: string) { + return this.items.get(roleId)||[] + } + // 是否加入过 public hasJoin(guildCode: string, roleId: string) { let member = this.members.get(guildCode)||[]; @@ -425,7 +429,7 @@ export class WoodenHorse { @prop({required: true}) status: number = 0; // 状态 0-停止 1-开启 2-结束 @prop({required: true}) - speed: number = 0; // 速度 + speed: number = GUILDACTIVITY.RACE_INIT_SPEED; // 速度 @prop({required: true}) durability: number = 100; // 耐久度 @prop({required: true}) @@ -470,7 +474,9 @@ export class WoodenHorse { this.status = 2; return true; } - this.distance += Math.floor((Date.now() - this.time)/1000 * 10 * this.speed)/10; // 1位小数点 + console.log('*********', this.distance, Date.now(), this.speed) + + this.distance = Math.floor((this.distance + (Date.now() - this.time)/1000 * this.speed ) * 1000)/1000; // 1位小数点 this.time = Date.now(); } let effectiveEvents = new Array(); @@ -501,7 +507,7 @@ export class WoodenHorse { } for(let i of delEvents) events.splice(i, 1); // 删除过期事件 effectiveEvents.sort((a, b) => a.startTime - b.startTime); - this.speed = this.memberCnt * 10; + this.speed = GUILDACTIVITY.RACE_INIT_SPEED + this.memberCnt * GUILDACTIVITY.RACE_PER_SPEED; for(let { id, count, endTime } of effectiveEvents) { this.calEvent(id, count, endTime); } @@ -511,7 +517,6 @@ export class WoodenHorse { private calEvent(id: number, count: number = 1, endTime?: number) { let { effect } = gameData.raceActivityEvents.get(id); - console.log('**********', effect, id) switch (id) { case RACE_EVENT.LIANNU: if (this.shieldTime < Date.now()) { diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts index 5c99fcff3..5eab8d580 100644 --- a/shared/pubUtils/dicParam.ts +++ b/shared/pubUtils/dicParam.ts @@ -101,6 +101,8 @@ export const GUILDACTIVITY = { RACEACTIVITY_NORMAL_ITEMS: '1&8&15|3&5&10|5&0&1', // 粮草先行普通道具 RACEACTIVITY_EVENT_MEMBERCNT: 3, // 粮草先行随机道具获得人数 RACEACTIVITY_EVENT_ITEMS: '2&1|4&1|6&1', // 粮草先行根据事件随机人可获得道具 + RACE_INIT_SPEED: 2, // 粮草先行军团初始速度 + RACE_PER_SPEED: 0.1, // 粮草先行军团每人参加增速 }; export const GUILD_AUCTION = { DIVIDEND_RATE: 1, // 总金额分红比例,1表示总金额 100% 分红 diff --git a/shared/resource/jsons/dic_goods.json b/shared/resource/jsons/dic_goods.json index 1a81fa650..d4e75e93d 100644 --- a/shared/resource/jsons/dic_goods.json +++ b/shared/resource/jsons/dic_goods.json @@ -56175,7 +56175,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40011, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56216,7 +56216,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40012, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56257,7 +56257,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40013, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56298,7 +56298,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40014, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56339,7 +56339,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40015, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56380,7 +56380,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40016, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -56421,7 +56421,7 @@ "lvLimited": 1, "quality": 1, "image_id": 40017, - "itid": 27, + "itid": 34, "goodType": 2, "pieces": 0, "pieceId": 0, @@ -91680,7 +91680,7 @@ "name": "夏侯惇头像", "lvLimited": 1, "quality": 1, - "image_id": 41002, + "image_id": 41003, "itid": 50, "goodType": 9, "pieces": 0, @@ -91721,7 +91721,7 @@ "name": "张辽头像", "lvLimited": 1, "quality": 1, - "image_id": 41003, + "image_id": 41004, "itid": 50, "goodType": 9, "pieces": 0, @@ -91762,7 +91762,7 @@ "name": "夏侯渊头像", "lvLimited": 1, "quality": 1, - "image_id": 41004, + "image_id": 41005, "itid": 50, "goodType": 9, "pieces": 0, @@ -91803,7 +91803,7 @@ "name": "郭嘉头像", "lvLimited": 1, "quality": 1, - "image_id": 41005, + "image_id": 41006, "itid": 50, "goodType": 9, "pieces": 0, @@ -91844,7 +91844,7 @@ "name": "司马懿头像", "lvLimited": 1, "quality": 1, - "image_id": 41006, + "image_id": 41007, "itid": 50, "goodType": 9, "pieces": 0, @@ -91885,7 +91885,7 @@ "name": "典韦头像", "lvLimited": 1, "quality": 1, - "image_id": 41007, + "image_id": 41008, "itid": 50, "goodType": 9, "pieces": 0, @@ -91926,7 +91926,7 @@ "name": "庞德头像", "lvLimited": 1, "quality": 1, - "image_id": 41008, + "image_id": 41009, "itid": 50, "goodType": 9, "pieces": 0, @@ -91967,7 +91967,7 @@ "name": "邓艾头像", "lvLimited": 1, "quality": 1, - "image_id": 41009, + "image_id": 41010, "itid": 50, "goodType": 9, "pieces": 0, @@ -92008,7 +92008,7 @@ "name": "徐晃头像", "lvLimited": 1, "quality": 1, - "image_id": 41010, + "image_id": 41011, "itid": 50, "goodType": 9, "pieces": 0, @@ -92049,7 +92049,7 @@ "name": "曹仁头像", "lvLimited": 1, "quality": 1, - "image_id": 41011, + "image_id": 41012, "itid": 50, "goodType": 9, "pieces": 0, @@ -92090,7 +92090,7 @@ "name": "李典头像", "lvLimited": 1, "quality": 1, - "image_id": 41012, + "image_id": 41013, "itid": 50, "goodType": 9, "pieces": 0, @@ -92131,7 +92131,7 @@ "name": "蔡琰头像", "lvLimited": 1, "quality": 1, - "image_id": 41013, + "image_id": 41014, "itid": 50, "goodType": 9, "pieces": 0, @@ -92172,7 +92172,7 @@ "name": "贾诩头像", "lvLimited": 1, "quality": 1, - "image_id": 41014, + "image_id": 41015, "itid": 50, "goodType": 9, "pieces": 0, @@ -92213,7 +92213,7 @@ "name": "许褚头像", "lvLimited": 1, "quality": 1, - "image_id": 41015, + "image_id": 41016, "itid": 50, "goodType": 9, "pieces": 0, @@ -92254,7 +92254,7 @@ "name": "乐进头像", "lvLimited": 1, "quality": 1, - "image_id": 41016, + "image_id": 41017, "itid": 50, "goodType": 9, "pieces": 0, @@ -92295,7 +92295,7 @@ "name": "张飞头像", "lvLimited": 1, "quality": 1, - "image_id": 41017, + "image_id": 41018, "itid": 50, "goodType": 9, "pieces": 0, @@ -92336,7 +92336,7 @@ "name": "关羽头像", "lvLimited": 1, "quality": 1, - "image_id": 41018, + "image_id": 41019, "itid": 50, "goodType": 9, "pieces": 0, @@ -92377,7 +92377,7 @@ "name": "赵云头像", "lvLimited": 1, "quality": 1, - "image_id": 41019, + "image_id": 41020, "itid": 50, "goodType": 9, "pieces": 0, @@ -92418,7 +92418,7 @@ "name": "刘备头像", "lvLimited": 1, "quality": 1, - "image_id": 41020, + "image_id": 41021, "itid": 50, "goodType": 9, "pieces": 0, @@ -92459,7 +92459,7 @@ "name": "黄忠头像", "lvLimited": 1, "quality": 1, - "image_id": 41021, + "image_id": 41022, "itid": 50, "goodType": 9, "pieces": 0, @@ -92500,7 +92500,7 @@ "name": "诸葛亮头像", "lvLimited": 1, "quality": 1, - "image_id": 41022, + "image_id": 41023, "itid": 50, "goodType": 9, "pieces": 0, @@ -92541,7 +92541,7 @@ "name": "庞统头像", "lvLimited": 1, "quality": 1, - "image_id": 41023, + "image_id": 41024, "itid": 50, "goodType": 9, "pieces": 0, @@ -92582,7 +92582,7 @@ "name": "魏延头像", "lvLimited": 1, "quality": 1, - "image_id": 41024, + "image_id": 41025, "itid": 50, "goodType": 9, "pieces": 0, @@ -92623,7 +92623,7 @@ "name": "陈到头像", "lvLimited": 1, "quality": 1, - "image_id": 41025, + "image_id": 41026, "itid": 50, "goodType": 9, "pieces": 0, @@ -92664,7 +92664,7 @@ "name": "关银屏头像", "lvLimited": 1, "quality": 1, - "image_id": 41026, + "image_id": 41027, "itid": 50, "goodType": 9, "pieces": 0, @@ -92705,7 +92705,7 @@ "name": "马云禄头像", "lvLimited": 1, "quality": 1, - "image_id": 41027, + "image_id": 41028, "itid": 50, "goodType": 9, "pieces": 0, @@ -92746,7 +92746,7 @@ "name": "马良头像", "lvLimited": 1, "quality": 1, - "image_id": 41028, + "image_id": 41029, "itid": 50, "goodType": 9, "pieces": 0, @@ -92787,7 +92787,7 @@ "name": "黄月英头像", "lvLimited": 1, "quality": 1, - "image_id": 41029, + "image_id": 41030, "itid": 50, "goodType": 9, "pieces": 0, @@ -92828,7 +92828,7 @@ "name": "王平头像", "lvLimited": 1, "quality": 1, - "image_id": 41030, + "image_id": 41031, "itid": 50, "goodType": 9, "pieces": 0, @@ -92869,7 +92869,7 @@ "name": "孙乾头像", "lvLimited": 1, "quality": 1, - "image_id": 41031, + "image_id": 41032, "itid": 50, "goodType": 9, "pieces": 0, @@ -92910,7 +92910,7 @@ "name": "周泰头像", "lvLimited": 1, "quality": 1, - "image_id": 41032, + "image_id": 41033, "itid": 50, "goodType": 9, "pieces": 0, @@ -92951,7 +92951,7 @@ "name": "孙策头像", "lvLimited": 1, "quality": 1, - "image_id": 41033, + "image_id": 41034, "itid": 50, "goodType": 9, "pieces": 0, @@ -92992,7 +92992,7 @@ "name": "周瑜头像", "lvLimited": 1, "quality": 1, - "image_id": 41034, + "image_id": 41035, "itid": 50, "goodType": 9, "pieces": 0, @@ -93033,7 +93033,7 @@ "name": "太史慈头像", "lvLimited": 1, "quality": 1, - "image_id": 41035, + "image_id": 41036, "itid": 50, "goodType": 9, "pieces": 0, @@ -93074,7 +93074,7 @@ "name": "孙权头像", "lvLimited": 1, "quality": 1, - "image_id": 41036, + "image_id": 41037, "itid": 50, "goodType": 9, "pieces": 0, @@ -93115,7 +93115,7 @@ "name": "甘宁头像", "lvLimited": 1, "quality": 1, - "image_id": 41037, + "image_id": 41038, "itid": 50, "goodType": 9, "pieces": 0, @@ -93156,7 +93156,7 @@ "name": "孙尚香头像", "lvLimited": 1, "quality": 1, - "image_id": 41038, + "image_id": 41039, "itid": 50, "goodType": 9, "pieces": 0, @@ -93197,7 +93197,7 @@ "name": "陆逊头像", "lvLimited": 1, "quality": 1, - "image_id": 41039, + "image_id": 41040, "itid": 50, "goodType": 9, "pieces": 0, @@ -93238,7 +93238,7 @@ "name": "小乔头像", "lvLimited": 1, "quality": 1, - "image_id": 41040, + "image_id": 41041, "itid": 50, "goodType": 9, "pieces": 0, @@ -93279,7 +93279,7 @@ "name": "大乔头像", "lvLimited": 1, "quality": 1, - "image_id": 41041, + "image_id": 41042, "itid": 50, "goodType": 9, "pieces": 0, @@ -93320,7 +93320,7 @@ "name": "步练师头像", "lvLimited": 1, "quality": 1, - "image_id": 41042, + "image_id": 41043, "itid": 50, "goodType": 9, "pieces": 0, @@ -93361,7 +93361,7 @@ "name": "左慈头像", "lvLimited": 1, "quality": 1, - "image_id": 41043, + "image_id": 41044, "itid": 50, "goodType": 9, "pieces": 0, @@ -93402,7 +93402,7 @@ "name": "吕布头像", "lvLimited": 1, "quality": 1, - "image_id": 41044, + "image_id": 41045, "itid": 50, "goodType": 9, "pieces": 0, @@ -93443,7 +93443,7 @@ "name": "张任头像", "lvLimited": 1, "quality": 1, - "image_id": 41045, + "image_id": 41046, "itid": 50, "goodType": 9, "pieces": 0, @@ -93484,7 +93484,7 @@ "name": "华佗头像", "lvLimited": 1, "quality": 1, - "image_id": 41046, + "image_id": 41047, "itid": 50, "goodType": 9, "pieces": 0, @@ -93525,7 +93525,7 @@ "name": "张角头像", "lvLimited": 1, "quality": 1, - "image_id": 41047, + "image_id": 41048, "itid": 50, "goodType": 9, "pieces": 0, @@ -93566,7 +93566,7 @@ "name": "南华头像", "lvLimited": 1, "quality": 1, - "image_id": 41048, + "image_id": 41049, "itid": 50, "goodType": 9, "pieces": 0, @@ -93607,7 +93607,7 @@ "name": "高顺头像", "lvLimited": 1, "quality": 1, - "image_id": 41049, + "image_id": 41050, "itid": 50, "goodType": 9, "pieces": 0, @@ -93648,7 +93648,7 @@ "name": "麹义头像", "lvLimited": 1, "quality": 1, - "image_id": 41050, + "image_id": 41051, "itid": 50, "goodType": 9, "pieces": 0, @@ -93689,7 +93689,7 @@ "name": "李儒头像", "lvLimited": 1, "quality": 1, - "image_id": 41051, + "image_id": 41052, "itid": 50, "goodType": 9, "pieces": 0, @@ -93730,7 +93730,7 @@ "name": "庞舞头像", "lvLimited": 1, "quality": 1, - "image_id": 41052, + "image_id": 41053, "itid": 50, "goodType": 9, "pieces": 0, @@ -93771,7 +93771,7 @@ "name": "夏侯轻衣头像", "lvLimited": 1, "quality": 1, - "image_id": 41053, + "image_id": 41054, "itid": 50, "goodType": 9, "pieces": 0, @@ -93812,7 +93812,7 @@ "name": "文丑头像", "lvLimited": 1, "quality": 1, - "image_id": 41054, + "image_id": 41055, "itid": 50, "goodType": 9, "pieces": 0, @@ -93853,7 +93853,7 @@ "name": "颜良头像", "lvLimited": 1, "quality": 1, - "image_id": 41055, + "image_id": 41056, "itid": 50, "goodType": 9, "pieces": 0, @@ -93894,7 +93894,7 @@ "name": "貂蝉头像", "lvLimited": 1, "quality": 1, - "image_id": 41056, + "image_id": 41057, "itid": 50, "goodType": 9, "pieces": 0, diff --git a/shared/resource/jsons/dic_zyz_shop.json b/shared/resource/jsons/dic_zyz_shop.json index 121721697..8dad50fc2 100644 --- a/shared/resource/jsons/dic_zyz_shop.json +++ b/shared/resource/jsons/dic_zyz_shop.json @@ -18,7 +18,7 @@ "shop": 3, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 2, "money": 40001, "price": 50 @@ -30,7 +30,7 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 3, "money": 40007, "price": 300 @@ -42,7 +42,7 @@ "shop": 2, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 1, "money": 40005, "price": 100 @@ -54,7 +54,7 @@ "shop": 2, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 2, "money": 40005, "price": 100 @@ -78,7 +78,7 @@ "shop": 3, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 1, "money": 40001, "price": 50 @@ -90,7 +90,7 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 2, "money": 40007, "price": 300 @@ -102,7 +102,7 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 3, "money": 40007, "price": 300 @@ -114,7 +114,7 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 1, "money": 40007, "price": 300 @@ -138,7 +138,7 @@ "shop": 3, "type": 2, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 3, "money": 40001, "price": 500 @@ -150,7 +150,7 @@ "shop": 3, "type": 2, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 1, "money": 40001, "price": 500 @@ -162,7 +162,7 @@ "shop": 7, "type": 2, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 150, "refreshType": 2, "money": 40007, "price": 500 @@ -174,7 +174,7 @@ "shop": 7, "type": 2, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 3, "money": 40007, "price": 500 @@ -186,7 +186,7 @@ "shop": 7, "type": 2, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 1, "money": 40007, "price": 500 @@ -198,7 +198,7 @@ "shop": 3, "type": 3, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 50, "refreshType": 2, "money": 40001, "price": 800 @@ -210,7 +210,7 @@ "shop": 3, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 3, "money": 40001, "price": 800 @@ -222,7 +222,7 @@ "shop": 3, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 1, "money": 40001, "price": 800 @@ -234,7 +234,7 @@ "shop": 3, "type": 3, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 200, "refreshType": 2, "money": 40007, "price": 800 @@ -246,7 +246,7 @@ "shop": 3, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 3, "money": 40007, "price": 800 @@ -258,7 +258,7 @@ "shop": 7, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 1, "money": 40007, "price": 100 @@ -270,7 +270,7 @@ "shop": 7, "type": 3, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 100, "refreshType": 2, "money": 40001, "price": 100 @@ -282,7 +282,7 @@ "shop": 7, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 3, "money": 40001, "price": 100 @@ -294,7 +294,7 @@ "shop": 7, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 1, "money": 40001, "price": 100 @@ -306,7 +306,7 @@ "shop": 7, "type": 3, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 2, "money": 40007, "price": 100 @@ -318,7 +318,7 @@ "shop": 4, "type": 4, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 50, "refreshType": 3, "money": 40004, "price": 356 @@ -330,7 +330,7 @@ "shop": 4, "type": 4, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 1, "money": 40004, "price": 456 @@ -342,7 +342,7 @@ "shop": 4, "type": 4, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 2, "money": 40004, "price": 567 @@ -354,7 +354,7 @@ "shop": 6, "type": 4, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 3, "money": 40002, "price": 123 @@ -378,7 +378,7 @@ "shop": 6, "type": 4, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 2, "money": 40002, "price": 345 @@ -390,7 +390,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 3, "money": 31001, "price": 500 @@ -402,7 +402,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 1, "money": 31001, "price": 750 @@ -414,7 +414,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 200, "refreshType": 2, "money": 31001, "price": 1000 @@ -426,7 +426,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 3, "money": 31001, "price": 1500 @@ -438,7 +438,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 1, "money": 31002, "price": 500 @@ -450,7 +450,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 2, "money": 31002, "price": 750 @@ -462,7 +462,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 150, "refreshType": 3, "money": 31002, "price": 1000 @@ -474,7 +474,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 1, "money": 31002, "price": 1500 @@ -486,7 +486,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 2, "money": 31002, "price": 5000 @@ -498,7 +498,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 50, "refreshType": 3, "money": 31002, "price": 5000 @@ -510,7 +510,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 100, "refreshType": 1, "money": 31002, "price": 5000 @@ -522,7 +522,7 @@ "shop": 1, "type": 5, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 2, "money": 31002, "price": 5000 @@ -534,7 +534,7 @@ "shop": 2, "type": 1, "guildlvlimit": 3, - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 3, "money": 40005, "price": 100 @@ -546,7 +546,7 @@ "shop": 2, "type": 1, "guildlvlimit": 5, - "purchaselimit": "&", + "purchaselimit": 10, "refreshType": 1, "money": 40005, "price": 100 @@ -558,7 +558,7 @@ "shop": 3, "type": 1, "guildlvlimit": "&", - "purchaselimit": 10, + "purchaselimit": 50, "refreshType": 2, "money": 40001, "price": 50 @@ -570,7 +570,7 @@ "shop": 3, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 100, "refreshType": 3, "money": 40001, "price": 50 @@ -582,7 +582,7 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 150, "refreshType": 1, "money": 40001, "price": 300 @@ -594,9 +594,21 @@ "shop": 7, "type": 1, "guildlvlimit": "&", - "purchaselimit": "&", + "purchaselimit": 200, "refreshType": 2, "money": 40007, "price": 300 + }, + { + "id": 51, + "goodid": 41002, + "goodname": "漂亮衣服", + "shop": 5, + "type": 7, + "guildlvlimit": "&", + "purchaselimit": 1, + "refreshType": 4, + "money": 40006, + "price": 500 } ] \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json index 6d1bea3b7..855fc97d7 100644 --- a/shared/resource/jsons/dic_zyz_shopList.json +++ b/shared/resource/jsons/dic_zyz_shopList.json @@ -10,7 +10,7 @@ "shopid": 2, "shopname": "军团商店", "shopicon": "shoptubiaozi_juntuan", - "typeid": "1&6&9", + "typeid": "1&6", "moneyid": "31002&40005" }, {