mafei 1 год назад
Родитель
Сommit
115f270c62

+ 1 - 0
script/common/Lang.lua

@@ -121,6 +121,7 @@ ZHUANPAN_GAIJI_NEED_LV = [[等级需要达到30级]]
 
 XIANZHI_NO_ITEM = [[你的{1}不足]]
 XIANZHI_OPEN_NEED_LV = [[等级需要达到25级]]
+XIANZHI_GOODS_NOT_FOUND = [[天命商店购买商品ID错误,id={1}]]
 JIBAN_OPEN_NEED_LV = [[等级需要达到10级]]
 
 JJC_OPEN_NEED_LV = [[等级需要达到8级]]

+ 1 - 0
script/common/LogDefine.lua

@@ -249,6 +249,7 @@ DEFINE = {
 	gift_buy                = 701,           -- 弹窗礼包购买
 	skin_buy                = 702,           -- 皮肤活动购买
 	newhero_reward			= 703,			 -- 新英雄礼包
+	xianzhi_buy             = 704,           -- 先知商店购买
 }
 
 

+ 5 - 1
script/common/ProtoID.lua

@@ -1258,4 +1258,8 @@ _ENV[1257]='GC_ABS_NEWHERO'
 _ENV[1258]="CG_ABS_NEWHERO_BUYGIFT"
 _ENV[1259]="CG_TEST_PROTO"
 _ENV[1260]="CG_SUIPIAN_SYNTHESIS"
-_ENV[1261]="GC_SUIPIAN_SYNTHESIS"
+_ENV[1261]="GC_SUIPIAN_SYNTHESIS"
+_ENV[1301]="CG_XIANZHI_SHOP_QUERY"
+_ENV[1302]="GC_XIANZHI_SHOP_QUERY"
+_ENV[1303]="CG_XIANZHI_SHOP_BUY"
+_ENV[1304]="GC_XIANZHI_SHOP_BUY"

+ 1 - 1
script/module/xianzhi/Proto.lua

@@ -69,7 +69,7 @@ XianZhiProduction= {
 
 GC_XIANZHI_SHOP_QUERY={
 	{"production",     50,          XianZhiProduction},
-	{"xianzhiCoin",    1,           "int"},
+	{"currency",       2,           ItemData},
 }
 
 CG_XIANZHI_SHOP_BUY={

+ 3 - 1
script/module/xianzhi/XianzhiLogic.lua

@@ -416,7 +416,9 @@ function shopQuery(human)
 		Broadcast.sendErr(human, Lang.SKIN_CONF_ERR)
 		return
 	end
-	msgRet.xianzhiCoin = BagLogic.getItemCnt(human,xianzhiOutPutId)
+	msgRet.currency[0] = 1 
+	local totalCoin = BagLogic.getItemCnt(human,xianzhiOutPutId)
+	Grid.makeItem(msgRet.currency[1],xianzhiOutPutId,totalCoin)
 	local length = 0
 	for id,cfg in pairs(xianzhiShopCfg) do
 	    length = length + 1