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

script/common/Dict.lua

@@ -55755,4 +55755,6 @@ _ENV[ [[xysame五六六us]] ]=true
 _ENV[ [[数卷残编言论集]] ]=true
 _ENV[ [[httpwwwbbbsndfcn]] ]=true
 _ENV[ [[异氟烷]] ]=true
-_ENV[ [[祈翠]] ]=true
+_ENV[ [[祈翠]] ]=true
+_ENV[ [[出版自由]] ]=true
+_ENV[ [[我方代表出习]] ]=true

script/common/Dict2.lua

@@ -55755,4 +55755,6 @@ _ENV[ [[xysame五六六us]] ]=true
 _ENV[ [[数卷残编言论集]] ]=true
 _ENV[ [[httpwwwbbbsndfcn]] ]=true
 _ENV[ [[异氟烷]] ]=true
-_ENV[ [[祈翠]] ]=true
+_ENV[ [[祈翠]] ]=true
+_ENV[ [[出版自由]] ]=true
+_ENV[ [[我方代表出习]] ]=true

script/module/combat/JibanLogic.lua

@@ -404,7 +404,7 @@ function getJibanHero(human,combatHeroDB)
 						icon = heroCfg and heroCfg.head or 0,
 						star = 1,
 						camp = heroCfg and heroCfg.camp or 1,
-						grade = heroCfg.grade or 1,
+						grade = heroCfg and heroCfg.grade or 1,
 					}
 				else
 					local heroGrid = HeroLogic.getHeroGridByUuid(human, uuid)

script/module/topup/BuyLogic.lua

@@ -188,7 +188,7 @@ function fontBuyItem(human, net, buyID)
 		net.voucher = conf.Voucher
 		-- net.productId = conf.productid
 		net.productId = getRealProductId(human, buyID, region)
-		if conf.module then
+		if conf.module and conf.module ~= "" then
 			local tModule = load("return require(\"" .. conf.module .. "\")")()
 			if tModule and tModule.GetRemainNum then
 				net.nCanBuyNum = tModule.GetRemainNum(human, buyID)