dos

Public/static/js/common.js

@@ -82,6 +82,7 @@ let flag = [
 
 
 let flagStack = [];
 let flagStack = [];
 let chooseNum = 0;
 let chooseNum = 0;
+let oldRandFlag = [];
 
 
 let flagTemplate = $('.flag-frame').find('.flag-block').clone();
 let flagTemplate = $('.flag-frame').find('.flag-block').clone();
 $('.flag-frame').html('').addClass('clearfix');
 $('.flag-frame').html('').addClass('clearfix');
@@ -147,14 +148,14 @@ function randomFlagArr(length) {
     arr.sort(function (a, b) {
     arr.sort(function (a, b) {
         return a - b;
         return a - b;
     });
     });
-    console.log(arr);
+    oldRandFlag = arr;
 
 
     return arr;
     return arr;
 }
 }
 
 
 function getRand(arr) {
 function getRand(arr) {
     let i = RandomNumBoth(0, flag.length - 1);
     let i = RandomNumBoth(0, flag.length - 1);
-    if (arr.indexOf(i) == -1) {
+    if (arr.indexOf(i) == -1 && oldRandFlag.indexOf(i) == -1) {
         return i;
         return i;
     } else {
     } else {
         return getRand(arr);
         return getRand(arr);