Skip to content

php / dencare-game

Go to a project
Commit 249cf687 by zhangheng
Options

1

parent c2fcbd5c
Showing with 13 additions and 16 deletions
.idea/workspace.xml
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152"> <state relative-caret-position="38">
<caret line="392" column="46" lean-forward="false" selection-start-line="392" selection-start-column="46" selection-end-line="392" selection-end-column="46" /> <caret line="386" column="7" lean-forward="false" selection-start-line="386" selection-start-column="7" selection-end-line="386" selection-end-column="7" />
<folding> <folding>
<marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" /> <marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -542,12 +542,12 @@ ...@@ -542,12 +542,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="1369000" /> <workItem from="1567181764126" duration="1420000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63551000" /> <option name="totallyTimeSpent" value="63602000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -686,7 +686,7 @@ ...@@ -686,7 +686,7 @@
<state relative-caret-position="3515"> <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" /> <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> <folding>
<marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" /> <marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -787,7 +787,7 @@ ...@@ -787,7 +787,7 @@
<state relative-caret-position="7486"> <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" /> <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> <folding>
<marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" /> <marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -930,10 +930,10 @@ ...@@ -930,10 +930,10 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152"> <state relative-caret-position="38">
<caret line="392" column="46" lean-forward="false" selection-start-line="392" selection-start-column="46" selection-end-line="392" selection-end-column="46" /> <caret line="386" column="7" lean-forward="false" selection-start-line="386" selection-start-column="7" selection-end-line="386" selection-end-column="7" />
<folding> <folding>
<marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" /> <marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -384,13 +384,12 @@ function mergeImage_two(url) { ...@@ -384,13 +384,12 @@ function mergeImage_two(url) {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 533; tmp.width = 533;
tmp.height = 850; tmp.height = 850;
cover_four.width=473
cover_four.height=632
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 15, -5); ctx.drawImage(cover_four, 10, -9);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png',0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png',0.5));
...@@ -408,13 +407,11 @@ function mergeImage_two(url) { ...@@ -408,13 +407,11 @@ function mergeImage_two(url) {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 533; tmp.width = 533;
tmp.height = 850; tmp.height = 850;
cover_four.width=473
cover_four.height=632
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 15, -5); ctx.drawImage(cover_four, 10, -9);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
......
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