Skip to content

php / dencare-game

Go to a project
Commit c3065569 by zhangheng
Options

1

parent f9807ffc
Showing with 26 additions and 25 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<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" />
......@@ -79,7 +79,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="190">
......@@ -101,13 +101,13 @@
</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="466">
<caret line="393" column="62" lean-forward="false" selection-start-line="393" selection-start-column="62" selection-end-line="393" selection-end-column="62" />
<state relative-caret-position="314">
<caret line="386" column="35" lean-forward="false" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
<folding>
<marker date="1567182036000" expanded="true" signature="11524:11538" ph="{...}" />
<marker date="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
......@@ -180,8 +180,8 @@
<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/css/main.scss" />
<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/js/index.js" />
</list>
</option>
</component>
......@@ -542,12 +542,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="367000" />
<workItem from="1567181764126" duration="470000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62549000" />
<option name="totallyTimeSpent" value="62652000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -686,7 +686,7 @@
<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="1567182036000" expanded="true" signature="11524:11538" ph="{...}" />
<marker date="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
......@@ -787,7 +787,7 @@
<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="1567182036000" expanded="true" signature="11524:11538" ph="{...}" />
<marker date="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
......@@ -910,16 +910,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="466">
<caret line="393" column="62" lean-forward="false" selection-start-line="393" selection-start-column="62" selection-end-line="393" selection-end-column="62" />
<folding>
<marker date="1567182036000" expanded="true" signature="11524:11538" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
......@@ -938,5 +928,15 @@
</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="314">
<caret line="386" column="35" lean-forward="false" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
<folding>
<marker date="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/js/index.js
......@@ -382,10 +382,10 @@ function mergeImage_two(url) {
cover_three.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
tmp.height = 1238;
cover_three.width = 640;
cover_three.height = 1238;
tmp.width = 533;
tmp.height = 850;
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
......
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