Commit 10c42be4 authored by Mythezone's avatar Mythezone
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	MyGameEngin
parents e7f3fd52 84ba7e88

.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 


GameEngin/__init__.py

GameEngin/Player.py

GameEngin/__init__.py

.idea/workspace.xml

+154 −14
Original line number Diff line number Diff line
@@ -2,9 +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$/../GameEngin/Player.py" beforeDir="false" />

      <change beforePath="$PROJECT_DIR$/../GameEngin/__init__.py" beforeDir="false" />

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

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

    </list>

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

    <option name="SHOW_DIALOG" value="false" />
@@ -28,32 +26,47 @@ 
      </usages-collector>

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

        <counts>

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

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

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

        </counts>

      </usages-collector>

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

        <counts>

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

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

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

        </counts>

      </usages-collector>

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

        <counts>

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

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

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

          <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="1339" />

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

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

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

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

        </counts>

      </usages-collector>

    </session>

  </component>

  <component name="FileEditorManager">

    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />

    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">

      <file pinned="false" current-in-tab="true">

        <entry file="file://$PROJECT_DIR$/README.md">

          <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" />

              </first_editor>

              <second_editor />

            </state>

          </provider>

        </entry>

      </file>

    </leaf>

  </component>

  <component name="FileTemplateManagerImpl">

    <option name="RECENT_TEMPLATES">
@@ -63,6 +76,7 @@ 
    </option>

  </component>

  <component name="Git.Settings">

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

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

  </component>

  <component name="IdeDocumentHistory">
@@ -115,6 +129,117 @@ 
      <recent name="$PROJECT_DIR$" />

    </key>

  </component>

  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">

    <UpdatedFiles>

      <FILE-GROUP>

        <option name="myUpdateName" value="Updated from server" />

        <option name="myStatusName" value="Changed on server" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="CHANGED_ON_SERVER" />

        <FILE-GROUP>

          <option name="myUpdateName" value="Updated" />

          <option name="myStatusName" value="Changed" />

          <option name="mySupportsDeletion" value="false" />

          <option name="myCanBeAbsent" value="false" />

          <option name="myId" value="UPDATED" />

          <PATH vcs="Git" revision="">$PROJECT_DIR$/../.idea/vcs.xml</PATH>

          <PATH vcs="Git" revision="">$PROJECT_DIR$/../.idea/workspace.xml</PATH>

        </FILE-GROUP>

        <FILE-GROUP>

          <option name="myUpdateName" value="Created" />

          <option name="myStatusName" value="Created" />

          <option name="mySupportsDeletion" value="false" />

          <option name="myCanBeAbsent" value="false" />

          <option name="myId" value="CREATED" />

        </FILE-GROUP>

        <FILE-GROUP>

          <option name="myUpdateName" value="Deleted" />

          <option name="myStatusName" value="Deleted" />

          <option name="mySupportsDeletion" value="false" />

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

          <option name="myId" value="REMOVED_FROM_REPOSITORY" />

        </FILE-GROUP>

        <FILE-GROUP>

          <option name="myUpdateName" value="Restored" />

          <option name="myStatusName" value="Will be restored" />

          <option name="mySupportsDeletion" value="false" />

          <option name="myCanBeAbsent" value="false" />

          <option name="myId" value="RESTORED" />

        </FILE-GROUP>

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Modified" />

        <option name="myStatusName" value="Modified" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="MODIFIED" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Skipped" />

        <option name="myStatusName" value="Skipped" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="SKIPPED" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Merged with conflicts" />

        <option name="myStatusName" value="Will be merged with conflicts" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="MERGED_WITH_CONFLICTS" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Merged with tree conflicts" />

        <option name="myStatusName" value="Merged with tree conflicts" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Merged with property conflicts" />

        <option name="myStatusName" value="Will be merged with property conflicts" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Merged" />

        <option name="myStatusName" value="Will be merged" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="MERGED" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Not in repository" />

        <option name="myStatusName" value="Not in repository" />

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

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="UNKNOWN" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Locally added" />

        <option name="myStatusName" value="Locally added" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="LOCALLY_ADDED" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Locally removed" />

        <option name="myStatusName" value="Locally removed" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="LOCALLY_REMOVED" />

      </FILE-GROUP>

      <FILE-GROUP>

        <option name="myUpdateName" value="Switched" />

        <option name="myStatusName" value="Switched" />

        <option name="mySupportsDeletion" value="false" />

        <option name="myCanBeAbsent" value="false" />

        <option name="myId" value="SWITCHED" />

      </FILE-GROUP>

    </UpdatedFiles>

  </component>

  <component name="RunDashboard">

    <option name="ruleStates">

      <list>
@@ -194,7 +319,21 @@ 
      <option name="project" value="LOCAL" />

      <updated>1540364393123</updated>

    </task>

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

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

      <created>1540365308202</created>

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

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

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

      <updated>1540365308202</updated>

    </task>

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

      <created>1540365409645</created>

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

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

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

      <updated>1540365409645</updated>

    </task>

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

    <servers />

  </component>

  <component name="ToolWindowManager">
@@ -225,7 +364,8 @@ 
  <component name="VcsManagerConfiguration">

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

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

    <option name="LAST_COMMIT_MESSAGE" value="" />

    <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" />
@@ -242,8 +382,8 @@ 
    <entry file="file://$PROJECT_DIR$/README.md">

      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">

        <state split_layout="SPLIT">

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

            <caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />

          <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" />

          </first_editor>

          <second_editor />

        </state>

README.md

0 → 100644
+65 −0
Original line number Diff line number Diff line 
# 我的游戏引擎







 这是个学习项目，一方面学习如何使用python和pyqt开发游戏引擎，另一方面也将会使用这个引擎来制作自己

 一直以来都想制作的游戏，希望能够坚持下去。

 

 ## 目录

 1. 简介

 2. 基本架构

 3. API介绍

 4. 安装

 5. 用户使用

 

 ---

  

 ## 正文

 

 ### 1. 简介

 

 

 #### 1.1 项目背景

 

 一直以来都有一个游戏开发的梦想，所以在工作了5年之后终于又重新回到了大学里面，重新学习计算机科学与

 技术。南科大研究生课程比较紧张，要求也相对来说比较高，虽然很辛苦但是在能力上确实可以感觉有很快的提升

 。学习之余，也希望能够用上一些学会的知识，来追一个曾经少年时候的梦想。希望能够坚持下来。

 

 #### 1.2 主要框架

 

 因为是一个学习项目，所以开始的时候会借鉴各位开发前辈的经验。因为比较熟悉Python语言，所以就采用了Python

 作为主要编程语言，找了一圈发现CSDN上面一位Yorhom的博主文章很精彩，也很贴合我的需求。在前期主要以重现

 该博主文中所提到的内容为主。

 

[Python 游戏引擎开发]( https://blog.csdn.net/yorhomwang/article/details/48140255)



 有兴趣的同学也可以参考以上文章，实现一个自己的游戏引擎。

 

 那么在可视化方面也将采用文中提到的PyQt库来实现，但是文中采用的是PyQt4，为了跟随时代的步伐，本文将

 以PyQt5版本为基础进行推进。

 

 #### 1.3 主要目标

 

 本项目主要目标是实现一个整合JRPG和GAL游戏的引擎，应该需要包含主要的RPG应当有的世界系统、装备、天赋、技能

 、等级、任务、剧情、战斗、生存、音乐、收集、存档、菜单、帮助等系统，而GAL引擎则可以用于剧情的推进。

 

 以上内容可能实现起来并不简单，相信从该项目中也能够学到不少的知识，能够离那个最初的梦想更进一步。

 

 #### 1.4 更新日志

 

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

 

 ---

 ### 2.基本架构

 

 #### 2.1 基本库

 

 本引擎将会使用到python的常见库，以及以上提到的PyQt5.如果以后有更多的库被使用到，将会在这里进行更新。

 

 #### 2.2 基本游戏界面

 

 

 

 

 

 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE