Merge branch 'Thailand' of https://gitee.com/wangwenfan/congkong into Thailand

script/module/chat/Gm.lua

@@ -449,9 +449,11 @@ function d3.osw(human, value)
 end
 
 function d3.chengjiu(human,val)
-	local param = Util.split(val, " ")
+	local ChengjiuExcel = require("excel.chengjiu").chengjiu
 	local ChengjiuLogic = require("chengjiu.ChengjiuLogic")
-	ChengjiuLogic.onCallback(human,3,3,4)
+	for k,v in pairs(ChengjiuExcel) do
+		ChengjiuLogic.onCallback(human,v.type, v.param)
+	end
 end
 
 function d3.jjczero()

script/module/present/OpenServerSingleCharge.lua

@@ -52,7 +52,7 @@ end
 
 local function wrapSChargeList(net, id, sChargeInfo, sChargeDB)
 	net.id = id
-	net.needPrice = BuyExcel.buy[sChargeInfo.needBuyId].CN
+	net.needPrice = BuyExcel.buy[sChargeInfo.needBuyId].THA
 	net.maxCnt = sChargeInfo.maxCnt
 	net.cnt = sChargeDB[id] and sChargeDB[id].cnt or 0