Skip to content

php / dencare-game

Go to a project
Commit 77f5d270 by zhangheng
Options

y

parent 95000b04
Showing with 35 additions and 24 deletions
.idea/workspace.xml
......@@ -6,6 +6,7 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -19,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.36129034">
<splitter split-orientation="horizontal" split-proportion="0.6903226">
<split-first>
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -81,7 +82,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
......@@ -163,12 +164,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3259">
<caret line="244" column="19" lean-forward="false" selection-start-line="244" selection-start-column="19" selection-end-line="244" selection-end-column="19" />
<folding />
<state relative-caret-position="428">
<caret line="386" column="12" lean-forward="true" selection-start-line="386" selection-start-column="12" selection-end-line="386" selection-end-column="12" />
<folding>
<marker date="1567096492000" expanded="true" signature="10122:11046" ph="{...}" />
<marker date="1567096492000" expanded="true" signature="10446:11044" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -180,8 +184,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="243" column="13" lean-forward="false" selection-start-line="243" selection-start-column="13" selection-end-line="243" selection-end-column="13" />
<state relative-caret-position="228">
<caret line="241" column="17" lean-forward="false" selection-start-line="241" selection-start-column="17" selection-end-line="241" selection-end-column="17" />
<folding />
</state>
</provider>
......@@ -235,9 +239,9 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
</option>
</component>
......@@ -591,12 +595,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="54060000" />
<workItem from="1566667516612" duration="54317000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54060000" />
<option name="totallyTimeSpent" value="54317000" />
</component>
<component name="ToolWindowManager">
<frame x="31" y="23" width="1440" height="817" extended-state="0" />
......@@ -768,10 +772,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Public/static/js/jquery-2.1.3.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3259">
<caret line="244" column="19" lean-forward="false" selection-start-line="244" selection-start-column="19" selection-end-line="244" selection-end-column="19" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="241" column="17" lean-forward="false" selection-start-line="241" selection-start-column="17" selection-end-line="241" selection-end-column="17" />
<folding />
</state>
</provider>
......@@ -836,11 +848,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="243" column="13" lean-forward="false" selection-start-line="243" selection-start-column="13" selection-end-line="243" selection-end-column="13" />
<folding />
<state relative-caret-position="428">
<caret line="386" column="12" lean-forward="true" selection-start-line="386" selection-start-column="12" selection-end-line="386" selection-end-column="12" />
<folding>
<marker date="1567096492000" expanded="true" signature="10122:11046" ph="{...}" />
<marker date="1567096492000" expanded="true" signature="10446:11044" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......
Public/static/css/main.css
......@@ -253,8 +253,6 @@ ul, li {
background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px;
height: 1238px;
position: absolute;
top: -57px;
}
.page-m-b .side-1, .page-m-b .side-2, .page-m-b .side-3, .page-m-b .side-4 {
width: 515px;
......
Public/static/css/main.scss
......@@ -240,8 +240,6 @@ ul, li {
background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px;
height: 1238px;
position: absolute;
top: -57px;
.side-1, .side-2, .side-3, .side-4 {
width: 515px;
height: 671px;
......
Public/static/js/index.js
......@@ -367,8 +367,8 @@ function mergeImage_two(url) {
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
// cover_three.onload = function () {
cover_four.onload = function () {
cover_three.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment