Skip to content

php / dencare-game

Go to a project
Commit 29788b41 by zhangheng
Options

1

parent d3d7c6db
Showing with 50 additions and 28 deletions
.idea/workspace.xml
......@@ -2,11 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-b-y.png" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<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" />
......@@ -82,10 +79,10 @@
</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="190">
<state relative-caret-position="-133">
<caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -104,13 +101,19 @@
</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="513">
<caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<state relative-caret-position="532">
<caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
</state>
</provider>
......@@ -184,9 +187,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>
......@@ -547,12 +550,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="4373000" />
<workItem from="1567181764126" duration="4557000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="66555000" />
<option name="totallyTimeSpent" value="66739000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -691,7 +694,13 @@
<state relative-caret-position="3515">
<caret line="185" column="22" lean-forward="false" selection-start-line="185" selection-start-column="22" selection-end-line="185" selection-end-column="22" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
</state>
</provider>
......@@ -792,7 +801,13 @@
<state relative-caret-position="7486">
<caret line="394" column="32" lean-forward="false" selection-start-line="394" selection-start-column="32" selection-end-line="394" selection-end-column="32" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
</state>
</provider>
......@@ -860,16 +875,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding>
<marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
......@@ -937,7 +942,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<state relative-caret-position="-133">
<caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -953,5 +958,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
<folding>
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/js/index.js
......@@ -403,7 +403,7 @@ function mergeImage_two(url) {
}else {
cover_four.onload = function () {
cover_three.onload = function () {
// cover_three.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 533;
tmp.height = 850;
......@@ -419,7 +419,7 @@ function mergeImage_two(url) {
$('.page-s-c').show();
$('.page_checking').hide()
}, 6000);
}
// }
}
......
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