Merge remote-tracking branch 'origin/master'

minigame/src/com/hssx/controller/PrizeController.java

@@ -84,8 +84,8 @@ public class PrizeController {
 			response.getWriter().println(msg.toJSONStr());
 			return;
 		}
-		// if (luckDrawCount == 0) {
-		// 直接抽奖
+		// if (luckDrawCount <= 1) {
+		// 直接抽奖(每日默认2次抽奖机会)
 		count = getLuckDraw(prizeRecord, count);
 		// 添加抽奖记录
 		UserPrizeCount userPrizeCount = new UserPrizeCount();
@@ -94,7 +94,7 @@ public class PrizeController {
 		map.put("prizeLevel", count);
 		map.put("prizeRecord", prizeRecord);
 		msg.data = map;
-		// } else if (luckDrawCount == 1) {
+		// } else if (luckDrawCount == 2) {
 		// int opportunityCount =
 		// prizeOpportunityMapper.selectCountByToday(userId);
 		// if (opportunityCount > 0) {