Commit 7b4559a7 authored by Mythezone's avatar Mythezone
Browse files

update

parent 84ba7e88

.idea/workspace.xml

+19 −20
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<project version="4">

  <component name="ChangeListManager">

    <list default="true" id="cf5ee9ef-17ce-4737-b895-ac880f50218c" name="Default Changelist" comment="">

      <change beforePath="$PROJECT_DIR$" beforeDir="false" afterPath="$PROJECT_DIR$" afterDir="false" />

      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />

    </list>

    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />

    <option name="SHOW_DIALOG" value="false" />
@@ -38,14 +38,14 @@ 
      </usages-collector>

      <usages-collector id="statistics.file.extensions.edit">

        <counts>

          <entry key="md" value="1360" />

          <entry key="md" value="1375" />

          <entry key="py" value="919" />

          <entry key="txt" value="6" />

        </counts>

      </usages-collector>

      <usages-collector id="statistics.file.types.edit">

        <counts>

          <entry key="Markdown" value="1360" />

          <entry key="Markdown" value="1375" />

          <entry key="PLAIN_TEXT" value="6" />

          <entry key="Python" value="919" />

        </counts>
@@ -59,7 +59,7 @@ 
          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">

            <state split_layout="SPLIT">

              <first_editor relative-caret-position="673">

                <caret line="49" column="44" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />

                <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />

              </first_editor>

              <second_editor />

            </state>
@@ -77,6 +77,7 @@ 
  </component>

  <component name="Git.Settings">

    <option name="UPDATE_TYPE" value="MERGE" />

    <option name="PUSH_AUTO_UPDATE" value="true" />

    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />

  </component>

  <component name="IdeDocumentHistory">
@@ -91,7 +92,7 @@ 
    </option>

  </component>

  <component name="ProjectFrameBounds">

    <option name="x" value="1523" />

    <option name="x" value="1522" />

    <option name="y" value="92" />

    <option name="width" value="1550" />

    <option name="height" value="1259" />
@@ -110,11 +111,6 @@ 
              <item name="MyGameEngin" type="b2602c69:ProjectViewProjectNode" />

              <item name="MyGameEngin" type="462c0819:PsiDirectoryNode" />

            </path>

            <path>

              <item name="MyGameEngin" type="b2602c69:ProjectViewProjectNode" />

              <item name="MyGameEngin" type="462c0819:PsiDirectoryNode" />

              <item name="GameEngin" type="462c0819:PsiDirectoryNode" />

            </path>

          </expand>

          <select />

        </subPane>
@@ -333,13 +329,21 @@ 
      <option name="project" value="LOCAL" />

      <updated>1540365409645</updated>

    </task>

    <option name="localTasksCounter" value="7" />

    <task id="LOCAL-00007" summary="一个小的更新">

      <created>1540365694243</created>

      <option name="number" value="00007" />

      <option name="presentableId" value="LOCAL-00007" />

      <option name="project" value="LOCAL" />

      <updated>1540365694243</updated>

    </task>

    <option name="localTasksCounter" value="8" />

    <servers />

  </component>

  <component name="ToolWindowManager">

    <frame x="1523" y="92" width="1550" height="1259" extended-state="0" />

    <frame x="1522" y="92" width="1550" height="1259" extended-state="0" />

    <editor active="true" />

    <layout>

      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13865271" />

      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13865271" />

      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />

      <window_info id="Favorites" order="2" side_tool="true" />

      <window_info anchor="bottom" id="Message" order="0" />
@@ -349,7 +353,7 @@ 
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />

      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />

      <window_info anchor="bottom" id="TODO" order="6" />

      <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49901897" visible="true" weight="0.16195373" />

      <window_info active="true" anchor="bottom" id="Version Control" order="7" sideWeight="0.49901897" visible="true" weight="0.16195373" />

      <window_info anchor="bottom" id="Terminal" order="8" />

      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50098103" side_tool="true" visible="true" weight="0.16195373" />

      <window_info anchor="bottom" id="Python Console" order="10" />
@@ -362,13 +366,8 @@ 
    <option name="myLimit" value="2678400000" />

  </component>

  <component name="VcsManagerConfiguration">

    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />

    <option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />

    <MESSAGE value="一个小的更新" />

    <option name="LAST_COMMIT_MESSAGE" value="一个小的更新" />

    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />

    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />

    <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />

  </component>

  <component name="editorHistoryManager">

    <entry file="file://$PROJECT_DIR$/GameEngin/Game.py" />
@@ -383,7 +382,7 @@ 
      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">

        <state split_layout="SPLIT">

          <first_editor relative-caret-position="673">

            <caret line="49" column="44" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />

            <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />

          </first_editor>

          <second_editor />

        </state>

README.md

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 

 #### 1.4 更新日志

 

 2018.10.25 更新使用github进行版本管理,连接pycharm进行版本更新

 2018.10.25 更新使用github进行版本管理,连接pycharm进行版本更新（练习使用github，但是还没有成功）

 

 ---

 ### 2.基本架构

CRA Git | Maintained and supported by SUSTech CRA and CCSE