Merge branch 'master' of https://github.com/LTCatt/LTW3

data/mini/functions/trade/game/set_trade.mcfunction

@@ -0,0 +1,32 @@
+scoreboard players set @s temp 1
+function mini:trade/game/new_trade
+scoreboard players set @s temp 2
+function mini:trade/game/new_trade
+scoreboard players set @s temp 2
+function mini:trade/game/new_trade
+scoreboard players set @s temp 3
+function mini:trade/game/new_trade
+scoreboard players set @s temp 1
+function mini:trade/game/new_trade
+scoreboard players set @s temp 3
+function mini:trade/game/new_trade
+scoreboard players set @s temp 3
+function mini:trade/game/new_trade
+scoreboard players set @s temp 4
+function mini:trade/game/new_trade
+scoreboard players set @s temp 1
+function mini:trade/game/new_trade
+scoreboard players set @s temp 4
+function mini:trade/game/new_trade
+scoreboard players set @s temp 4
+function mini:trade/game/new_trade
+scoreboard players set @s temp 5
+function mini:trade/game/new_trade
+scoreboard players set @s temp 5
+function mini:trade/game/new_trade
+scoreboard players set @s temp 5
+function mini:trade/game/new_trade
+scoreboard players set @s temp 6
+function mini:trade/game/new_trade
+scoreboard players set @s temp 6
+function mini:trade/game/new_trade

data/mini/functions/trade/game/villager_init.mcfunction

@@ -1,5 +1,5 @@
 # 每个玩家生成村民
-summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[]},VillagerData:{level:2,type:"jungle"},Xp:10}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{},VillagerData:{level:2,type:"jungle"},Xp:10}
 # 设置对应的积分
 scoreboard players operation @e[type=villager,tag=newVillager] player_id = @s player_id
 tag @e[type=villager,tag=newVillager] remove newVillager

data/mini/functions/trade/game_init.mcfunction

@@ -35,13 +35,16 @@ gamerule doEntityDrops true
 gamerule doMobLoot true
 
 # 生成实体
-summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[{buy:{id:"emerald",Count:4},maxUses:999999,rewardExp:false,xp:20,sell:{id:"spider_spawn_egg",Count:1b}}]},CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{},CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
 # 设置交易列表
+execute as @e[type=villager,tag=TradeMarker] at @s run function mini:trade/game/set_trade
+
+# 玩家村民生成
 execute as @a[team=playing] run function mini:trade/game/villager_init
 # 复制交易列表
 execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]
-execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]
-execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]
-execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]
+execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[1]
+execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[2]
+execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[3]
 # 村民碰撞箱处理
 team join playing @e[type=villager,tag=TradePlayer]

data/mini/loot_tables/trade_e.json

@@ -53,7 +53,7 @@
                                 },
                                 {
                                     "function": "set_nbt",
-                                    "tag":"{sell:{id:\"nether_star\",Count:1}}"
+                                    "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
                                 },
                                 {
                                     "function": "set_nbt",
@@ -152,7 +152,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"nether_star\",Count:1}}"
+                            "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
                         },
                         {
                             "function": "set_nbt",
@@ -226,7 +226,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"nether_star\",Count:1}}"
+                            "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
                         },
                         {
                             "function": "set_nbt",

data/mini/loot_tables/trade_s.json

@@ -173,7 +173,7 @@
                                 },
                                 {
                                     "function": "set_nbt",
-                                    "tag":"{sell:{id:\"nether_star\",Count:1}}"
+                                    "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
                                 },
                                 {
                                     "function": "set_nbt",