|
@@ -1,15 +1,13 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="cddaf112-838a-4ae8-b50b-ccd02170a034" name="Default" comment="添加了"有钱任性"游戏">
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/.idea/BackSystem.iml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/.idea/misc.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/.idea/modules.xml" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <list default="true" id="cddaf112-838a-4ae8-b50b-ccd02170a034" name="Default" comment="更改了adminlte登陆页">
|
|
|
+ <change afterPath="$PROJECT_DIR$/BackSystem/index.html" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/BackSystem/php/database_connect .php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/BackSystem/php/login.php" afterDir="false" />
|
|
|
+ <change afterPath="$PROJECT_DIR$/BackSystem/php/server_data.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/BackSystem/html/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/BackSystem/html/login.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/yqrxd/launcher/egret_loader.js" beforeDir="false" afterPath="$PROJECT_DIR$/yqrxd/launcher/egret_loader.js" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
|
<ignored path="$PROJECT_DIR$/temp/" />
|
|
@@ -23,56 +21,29 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/yqrxd/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="540">
|
|
|
- <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="game-min.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/yqrxd/launcher/game-min.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="111090">
|
|
|
- <caret line="3703" column="9" selection-start-line="3703" selection-start-column="9" selection-end-line="3703" selection-end-column="9" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="egret_loader.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/yqrxd/launcher/egret_loader.js">
|
|
|
+ <file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="45" column="50" selection-start-line="45" selection-start-column="50" selection-end-line="45" selection-end-column="50" />
|
|
|
+ <state relative-caret-position="379">
|
|
|
+ <caret line="97" column="44" lean-forward="true" selection-start-line="97" selection-start-column="44" selection-end-line="97" selection-end-column="44" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="login.css" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/css/login.css">
|
|
|
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
- <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
+ <file leaf-file-name="login.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/login.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
|
|
- <caret line="86" column="8" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="egret.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/yqrxd/launcher/egret.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="6990">
|
|
|
- <caret line="233" column="18" selection-start-line="233" selection-start-column="18" selection-end-line="233" selection-end-column="18" />
|
|
|
+ <caret line="5" column="19" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -99,6 +70,11 @@
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/index.html" />
|
|
|
<option value="$PROJECT_DIR$/yqrxd/launcher/egret_loader.js" />
|
|
|
+ <option value="$PROJECT_DIR$/BackSystem/php/server_data.php" />
|
|
|
+ <option value="$PROJECT_DIR$/BackSystem/php/database_connect .php" />
|
|
|
+ <option value="$PROJECT_DIR$/BackSystem/php/json.php" />
|
|
|
+ <option value="$PROJECT_DIR$/BackSystem/php/login.php" />
|
|
|
+ <option value="$PROJECT_DIR$/BackSystem/index.html" />
|
|
|
<option value="$PROJECT_DIR$/BackSystem/html/login.html" />
|
|
|
</list>
|
|
|
</option>
|
|
@@ -139,6 +115,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -155,24 +132,12 @@
|
|
|
<item name="hc_tv_game" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="hc_tv_game" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="BackSystem" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="hc_tv_game" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="hc_tv_game" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="BackSystem" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="html" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="hc_tv_game" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="hc_tv_game" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="yqrxd" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="php" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -215,7 +180,8 @@
|
|
|
<workItem from="1556003859075" duration="1423000" />
|
|
|
<workItem from="1556006731644" duration="104000" />
|
|
|
<workItem from="1556010775860" duration="5006000" />
|
|
|
- <workItem from="1557124704308" duration="1104000" />
|
|
|
+ <workItem from="1557124704308" duration="2541000" />
|
|
|
+ <workItem from="1557130259475" duration="3727000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="添加了"有钱任性"游戏">
|
|
|
<created>1555674654664</created>
|
|
@@ -238,11 +204,25 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1557124999608</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="4" />
|
|
|
+ <task id="LOCAL-00004" summary="更改了adminlte登陆页">
|
|
|
+ <created>1557126220895</created>
|
|
|
+ <option name="number" value="00004" />
|
|
|
+ <option name="presentableId" value="LOCAL-00004" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1557126220895</updated>
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00005" summary="登陆页本地化">
|
|
|
+ <created>1557130300846</created>
|
|
|
+ <option name="number" value="00005" />
|
|
|
+ <option name="presentableId" value="LOCAL-00005" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1557130300846</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="6" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="12148000" />
|
|
|
+ <option name="totallyTimeSpent" value="17312000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
|
|
@@ -262,6 +242,7 @@
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
+ <window_info anchor="bottom" id="TypeScript" order="7" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
@@ -276,9 +257,18 @@
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="添加了"有钱任性"游戏" />
|
|
|
<MESSAGE value="添加了后台测试代码" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="添加了后台测试代码" />
|
|
|
+ <MESSAGE value="更改了adminlte登陆页" />
|
|
|
+ <MESSAGE value="登陆页本地化" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="登陆页本地化" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="2190">
|
|
|
+ <caret line="73" column="61" lean-forward="true" selection-start-line="73" selection-start-column="61" selection-end-line="73" selection-end-column="61" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/yqrxd/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="540">
|
|
@@ -411,27 +401,61 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/css/login.css">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/bower_components/Flot/API.md">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/yqrxd/launcher/egret_loader.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="45" column="50" selection-start-line="45" selection-start-column="50" selection-end-line="45" selection-end-column="50" />
|
|
|
+ <state relative-caret-position="1860">
|
|
|
+ <caret line="62" column="27" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/css/login.css">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/database_connect.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/server_data.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
- <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="120">
|
|
|
+ <caret line="4" column="14" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/bower_components/Flot/API.md">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/database_connect .php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="2" selection-start-line="2" selection-end-line="2" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/json.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/login.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
|
|
- <caret line="86" column="8" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
|
|
|
+ <caret line="5" column="19" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="379">
|
|
|
+ <caret line="97" column="44" lean-forward="true" selection-start-line="97" selection-start-column="44" selection-end-line="97" selection-end-column="44" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|