Merge remote-tracking branch 'origin/fmj' into fmj

日志
9 changed files with 313 additions and 0 deletions
--- a/.idea/Game.iml
+++ b/.idea/Game.iml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Game.iml" filepath="$PROJECT_DIR$/.idea/Game.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/shelf/Uncommitted_changes_before_rebase_[Default_Changelist]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_rebase_[Default_Changelist]/shelved.patch
@ -0,0 +1,179 @@
+Index: .idea/vcs.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- .idea/vcs.xml	(date 1712723456804)
+++ .idea/vcs.xml	(date 1712723456804)
+@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
+\ No newline at end of file
+Index: .idea/misc.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- .idea/misc.xml	(date 1712723456796)
+++ .idea/misc.xml	(date 1712723456796)
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
+\ No newline at end of file
+Index: .idea/modules.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- .idea/modules.xml	(date 1712723456812)
+++ .idea/modules.xml	(date 1712723456812)
+@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Game.iml" filepath="$PROJECT_DIR$/.idea/Game.iml" />
+    </modules>
+  </component>
+</project>
+\ No newline at end of file
+Index: .idea/Game.iml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- .idea/Game.iml	(date 1712723456786)
+++ .idea/Game.iml	(date 1712723456786)
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+\ No newline at end of file
+Index: .idea/workspace.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- .idea/workspace.xml	(date 1712724838733)
+++ .idea/workspace.xml	(date 1712724838733)
+@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4cf62424-7e6c-4a44-b3f2-8a3dc44f2df7" name="Default Changelist" comment="新建文本文档">
+      <change afterPath="$PROJECT_DIR$/.idea/Game.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="2etUbpOK5dhq80Q1B4zdGvUsGef" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.editor.code.editing" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4cf62424-7e6c-4a44-b3f2-8a3dc44f2df7" name="Default Changelist" comment="" />
+      <created>1712723441894</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1712723441894</updated>
+      <workItem from="1712723443784" duration="1391000" />
+    </task>
+    <task id="LOCAL-00001" summary="新建文本文档">
+      <created>1712723482913</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1712723482913</updated>
+    </task>
+    <task id="LOCAL-00002" summary="新建文本文档">
+      <created>1712723954614</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1712723954614</updated>
+    </task>
+    <task id="LOCAL-00003" summary="新建文本文档">
+      <created>1712724236228</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1712724236228</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="2" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="新建文本文档" />
+    <option name="LAST_COMMIT_MESSAGE" value="新建文本文档" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="528" y="233" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1712724141313">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="528" y="233" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.864@0.0.1536.864" timestamp="1712724141313" />
+    <state x="367" y="0" key="CommitChangelistDialog2" timestamp="1712724574560">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="367" y="0" key="CommitChangelistDialog2/0.0.1536.864@0.0.1536.864" timestamp="1712724574560" />
+    <state x="578" y="152" key="RollbackChangesDialog" timestamp="1712724523416">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="578" y="152" key="RollbackChangesDialog/0.0.1536.864@0.0.1536.864" timestamp="1712724523416" />
+    <state x="361" y="165" key="Vcs.Push.Dialog.v2" timestamp="1712724259761">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="361" y="165" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1712724259761" />
+    <state x="457" y="219" key="git4idea.merge.GitPullDialog" timestamp="1712724380999">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="457" y="219" key="git4idea.merge.GitPullDialog/0.0.1536.864@0.0.1536.864" timestamp="1712724380999" />
+  </component>
+</project>
+\ No newline at end of file
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4cf62424-7e6c-4a44-b3f2-8a3dc44f2df7" name="Default Changelist" comment="新建文本文档">
+      <change afterPath="$PROJECT_DIR$/.idea/Game.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="2etUbpOK5dhq80Q1B4zdGvUsGef" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.editor.code.editing" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4cf62424-7e6c-4a44-b3f2-8a3dc44f2df7" name="Default Changelist" comment="" />
+      <created>1712723441894</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1712723441894</updated>
+      <workItem from="1712723443784" duration="1391000" />
+    </task>
+    <task id="LOCAL-00001" summary="新建文本文档">
+      <created>1712723482913</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1712723482913</updated>
+    </task>
+    <task id="LOCAL-00002" summary="新建文本文档">
+      <created>1712723954614</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1712723954614</updated>
+    </task>
+    <task id="LOCAL-00003" summary="新建文本文档">
+      <created>1712724236228</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1712724236228</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="2" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="新建文本文档" />
+    <option name="LAST_COMMIT_MESSAGE" value="新建文本文档" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="528" y="233" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1712724141313">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="528" y="233" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.864@0.0.1536.864" timestamp="1712724141313" />
+    <state x="367" y="0" key="CommitChangelistDialog2" timestamp="1712724574560">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="367" y="0" key="CommitChangelistDialog2/0.0.1536.864@0.0.1536.864" timestamp="1712724574560" />
+    <state x="578" y="152" key="RollbackChangesDialog" timestamp="1712724523416">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="578" y="152" key="RollbackChangesDialog/0.0.1536.864@0.0.1536.864" timestamp="1712724523416" />
+    <state x="361" y="165" key="Vcs.Push.Dialog.v2" timestamp="1712724259761">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="361" y="165" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1712724259761" />
+    <state x="457" y="219" key="git4idea.merge.GitPullDialog" timestamp="1712724380999">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="457" y="219" key="git4idea.merge.GitPullDialog/0.0.1536.864@0.0.1536.864" timestamp="1712724380999" />
+  </component>
+</project>
--- a/log/demo1
+++ b/log/demo1
--- a/model/demo1
+++ b/model/demo1
--- a/model/demo
+++ b/model/demo
Author	SHA1	Message	Date
费敏洁	14f7f1bc90	Merge remote-tracking branch 'origin/fmj' into fmj	1 year ago
费敏洁	8e6ba80c4d	日志	1 year ago
费敏洁	89e712cc32	日志	1 year ago
费敏洁	9874101dcf	用于存储UMl模型	1 year ago
费敏洁	8f3a572db6	用于存储软件系统的源代码	1 year ago
费敏洁	5edb875a93	Merge remote-tracking branch 'origin/fmj' into fmj	1 year ago
费敏洁	f145f14d03	用于存储软件系统的源代码	1 year ago
费敏洁	8f6f45219e	新建文本文档	1 year ago
费敏洁	fba92a8176	新建文本文档	1 year ago
费敏洁	71201830d2	用于存储软件系统的源代码	1 year ago