From 747974551c537ea71562fcb0bf5c1836dacc52df Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Fri, 9 Dec 2022 21:49:26 +0800
Subject: [PATCH] Fixed some language issue

---
 .idea/workspace.xml            | 16 ++--------------
 IDManager.py                   |  4 ++--
 data/annotation.csv            |  1 +
 data/questionare.csv           |  1 +
 templates/GameAnnotation2.html |  6 +++---
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b2be68..f661026 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,22 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/img/welcome.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/templates/GameWelcome.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Flask/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Flask/.idea/Flask.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/IDManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/IDManager.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/GameAnnotation2.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation2.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameOver.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameOver.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameQuestion.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameQuestion.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/GameTutorial.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameTutorial.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/templates/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/templates/data.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -208,7 +196,7 @@
       <workItem from="1670345664686" duration="17000" />
       <workItem from="1670435705322" duration="282000" />
       <workItem from="1670478053954" duration="1683000" />
-      <workItem from="1670575237323" duration="8116000" />
+      <workItem from="1670575237323" duration="8674000" />
     </task>
     <servers />
   </component>
@@ -229,7 +217,7 @@
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/MarioWeb$MarioWeb.coverage" NAME="MarioWeb Coverage Results" MODIFIED="1669305478201" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1670592765804" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1670593217310" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) (1) Coverage Results" MODIFIED="1668079945407" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/IDManager.py b/IDManager.py
index 8d7d543..fd1fe96 100644
--- a/IDManager.py
+++ b/IDManager.py
@@ -6,7 +6,7 @@ class idManager():
     levelNum = 200
     typeNum = 100
 
-    timeMin = 0
+    timeMin = 1
     tutorialMax = 3
     ip_dic = {}
     ip_recent = {}
@@ -18,7 +18,7 @@ class idManager():
     def __int__(self):
         self.levelNum = 200
         self.typeNum = 100
-        self.timeMin = 0
+        self.timeMin = 1
 
     def getLevels(self, ip):
         if ip not in self.ip_dic.keys():
diff --git a/data/annotation.csv b/data/annotation.csv
index 3fef98b..5bfc95c 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -19,3 +19,4 @@ IP,A-ID,B-ID,Anno,
 127.0.0.1,38,154,N,
 127.0.0.1,168,74,B,
 127.0.0.1,82,101,N,
+127.0.0.1,178,4,A,
diff --git a/data/questionare.csv b/data/questionare.csv
index fa07f69..775047f 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -151,3 +151,4 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,B,A,C,A,A,A,,
 127.0.0.1,C,A,B,E,B,A,,
 127.0.0.1,A,A,A,E,E,A,,
+127.0.0.1,A,A,B,B,C,A,,
diff --git a/templates/GameAnnotation2.html b/templates/GameAnnotation2.html
index 573a01a..fe05696 100644
--- a/templates/GameAnnotation2.html
+++ b/templates/GameAnnotation2.html
@@ -206,7 +206,7 @@ function Replay(id){
       
       <br><br>
 
-      <button onclick="Replay(1)" class="cirButton"><b> Watch Collector Level Replay</b> </button>
+      <button onclick="Replay(1)" class="cirButton"><b> Watch Level A Replay</b> </button>
     </div>
 
 
@@ -220,7 +220,7 @@ function Replay(id){
             
       <br><br>
 
-      <button onclick="Replay(2)" class="cirButton"><b> Watch Killer Level Replay</b> </button>
+      <button onclick="Replay(2)" class="cirButton"><b> Watch Level B Replay</b> </button>
     </div>
 
     <div class="col-md-4">
@@ -233,7 +233,7 @@ function Replay(id){
 
       <br><br>
 
-      <button onclick="Replay(3)" class="cirButton"><b> Watch Runner Level Replay</b> </button>
+      <button onclick="Replay(3)" class="cirButton"><b> Watch Level C Replay</b> </button>
     </div>
   </div>
   </div>