From a82dd19ff3b233bc91ec036a7a7ee3d151408cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=99=BD?= <67080574+xbaimiao@users.noreply.github.com> Date: Sat, 10 Sep 2022 19:27:14 +0800 Subject: [PATCH] fix bugs --- gradle.properties | 2 +- .../xbaimiao/shoppro/core/shop/ShopImpl.kt | 5 ++-- src/main/resources/shops/limit-sell.yml | 26 ++++++++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11acfbb..ef4fa75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.github.xbaimiao.shoppro -version=1.0.2 \ No newline at end of file +version=1.0.3 \ No newline at end of file diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt index 9e15e7a..1931884 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt @@ -61,7 +61,7 @@ class ShopImpl(private val configuration: Configuration) : Shop() { section.getBoolean("$key.vanilla", true), section.getStringList("$key.commands"), this, - section.getString("item")!!.parseToMaterial() + section.getString("$key.item")!!.parseToMaterial() ) ) } else { @@ -94,7 +94,8 @@ class ShopImpl(private val configuration: Configuration) : Shop() { ) } } catch (e: Throwable) { - info("在加载Shop: ${getName()} 时,物品: $key 加载出现异常,跳过加载") + info("在加载Shop: ${getName()} 时,物品: $key 加载出现异常,跳过加载,错误信息如下") + e.printStackTrace() } } } diff --git a/src/main/resources/shops/limit-sell.yml b/src/main/resources/shops/limit-sell.yml index 18a72cb..73ac230 100644 --- a/src/main/resources/shops/limit-sell.yml +++ b/src/main/resources/shops/limit-sell.yml @@ -7,7 +7,7 @@ title: "系统收购商店" # 物品摆放顺序 slots: - 'NNNNNNNNN' - - 'NAB N' + - 'NABC N' - 'NNNNNNNNN' items: N: @@ -66,3 +66,27 @@ items: - '&e| &7全服限制出售: ${allLimit}' - '&e| &7您已出售: ${limit-player}' - '&e| &7全服剩余: ${limit-server}' + C: + material: 'HEAD:eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWU4ZTY3MGE3OWI2MTYzMzRiYzFmYjkxMzkxMzJmYjM1YzU3ZGRhNjk3NWFmOWNlNDgzMzNlOTRhYTZjOTU3MyJ9fX0=' + is-commodity: true + item: COAL + name: '煤炭' + # 每日限出售 + limit: 50000 + # 每个玩家限出售 + limit-player: 5000 + # 物品金额 + price: 0.1 + lore: + - '&e· &7出售你背包里面的&6 煤炭' + - '&e· &7收购单价 &x&F&F&C&B&4&2${price}&x&F&F&B&2&0&0⛂' + - '&e· &7你的余额 &x&F&F&C&B&4&2${money}&x&F&F&B&2&0&0⛂' + - '&x&3&C&2&F&3&B&M &x&5&D&5&2&5&B&M &x&7&E&7&5&7&B&M &x&9&F&9&8&9&B&M &x&C&0&B&B&B&B&M &x&E&1&D&E&D&B&M &x&C&1&B&B&B&E&M &x&A&0&9&8&9&E&M &x&7&F&7&5&7&E&M &x&5&E&5&2&5&E&M &x&3&D&2&F&3&E&M &x&1&C&0&C&1&E&M ' + - '&e· &6 左击 &7出售 &6单个' + - '&e· &6 右击 &7出售 &6一组 &7获得 &x&F&F&C&B&4&2${price64}&x&F&F&B&2&0&0⛂' + - '&e· &6 Shift + 右击 &7出售 &6背包所有 &7获得 &x&F&F&C&B&4&2${priceAll}&x&F&F&B&2&0&0⛂' + - '&x&3&C&2&F&3&B&M &x&5&D&5&2&5&B&M &x&7&E&7&5&7&B&M &x&9&F&9&8&9&B&M &x&C&0&B&B&B&B&M &x&E&1&D&E&D&B&M &x&C&1&B&B&B&E&M &x&A&0&9&8&9&E&M &x&7&F&7&5&7&E&M &x&5&E&5&2&5&E&M &x&3&D&2&F&3&E&M &x&1&C&0&C&1&E&M ' + - '&e· &7每人限制出售: ${limit}' + - '&e· &7全服限制出售: ${allLimit}' + - '&e· &7您当前已出售: ${limit-player} &8| &7全服剩余: ${limit-server}' + - '&x&F&5&A&5&0&E&M &x&E&E&A&2&1&C&M &x&E&7&9&F&2&A&M &x&E&0&9&C&3&8&M &x&D&9&9&9&4&6&M &x&D&2&9&6&5&4&M &x&C&B&9&3&6&2&M &x&C&4&9&C&7&0&M &x&B&D&9&F&7&E&M &x&B&D&9&F&7&E&M &x&B&6&A&2&8&C&M &x&A&F&A&5&9&A&M &M &M &x&A&F&A&5&9&A&M &M &M &x&B&6&A&2&8&C&M &x&B&D&9&F&7&E&M &x&C&4&9&C&7&0&M &x&C&B&9&9&6&2&M &x&D&2&9&6&5&4&M &x&D&9&9&3&4&6&M &x&E&0&9&0&3&8&M &x&E&7&8&D&2&A&M &x&E&E&8&A&1&C&M &x&F&5&8&7&0&E&M &x&F&C&8&4&0&0&M ' \ No newline at end of file