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

script/module/absAct/HeroGrowUp.lua

@@ -649,9 +649,9 @@ function sendTaskQuery(human, mainType)
 	checkDB(human, actStartTime,groupID)
 	local list = getTaskIDList(mainType)
 	local msgRet = Msg.gc.GC_HERO_GROWUP_TASK_QUERY
-    msgRet.endTime = actEndTime
-    msgRet.startTime = actStartTime
-    msgRet.leftTime = actEndTime - os.time()
+    msgRet.endTime = os.time(actEndTime) 
+    msgRet.startTime = os.time(actStartTime) 
+    msgRet.leftTime =  os.time(actEndTime) - os.time()
 	fontBaseNet(msgRet.data, human, actStartTime, lvdefine)
     msgRet.data.hasTaskRed = isTaskRed(human) and 1 or 0
 	msgRet.mainType = mainType

script/module/bag/Grid.lua

@@ -30,6 +30,7 @@ function makeItem(net, itemID, itemCnt, shuijingAttrID, itemGrid, itemIndex, opF
 	net.price = itemConfig and itemConfig.price and itemConfig.price[2] or 0
 	net.rare  = itemConfig and itemConfig.rare or 0
 	net.score  = itemConfig and itemConfig.score or 0
+	net.getway = net.getway or {}
 	net.getway[0] = (itemConfig and itemConfig.getway) and #itemConfig.getway or 0	
 	for i=1, net.getway[0] do
 		net.getway[i] = itemConfig.getway[i]