Skip to content

php / dencare-game

Go to a project
Commit 730be900 by zhangheng
Options

1

parent eeb892c8
Showing with 14 additions and 10 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="57"> <state relative-caret-position="323">
<caret line="393" column="67" lean-forward="false" selection-start-line="393" selection-start-column="67" selection-end-line="393" selection-end-column="67" /> <caret line="393" column="32" lean-forward="false" selection-start-line="393" selection-start-column="32" selection-end-line="393" selection-end-column="32" />
<folding> <folding>
<marker date="1567182623000" expanded="true" signature="11518:11532" ph="{...}" /> <marker date="1567182754000" expanded="true" signature="11585:11599" 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="822000" /> <workItem from="1567181764126" duration="980000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63004000" /> <option name="totallyTimeSpent" value="63162000" />
</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="1567182623000" expanded="true" signature="11518:11532" ph="{...}" /> <marker date="1567182754000" expanded="true" signature="11585:11599" 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="1567182623000" expanded="true" signature="11518:11532" ph="{...}" /> <marker date="1567182754000" expanded="true" signature="11585:11599" 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="57"> <state relative-caret-position="323">
<caret line="393" column="67" lean-forward="false" selection-start-line="393" selection-start-column="67" selection-end-line="393" selection-end-column="67" /> <caret line="393" column="32" lean-forward="false" selection-start-line="393" selection-start-column="32" selection-end-line="393" selection-end-column="32" />
<folding> <folding>
<marker date="1567182623000" expanded="true" signature="11518:11532" ph="{...}" /> <marker date="1567182754000" expanded="true" signature="11585:11599" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -384,6 +384,8 @@ function mergeImage_two(url) { ...@@ -384,6 +384,8 @@ 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');
...@@ -406,6 +408,8 @@ function mergeImage_two(url) { ...@@ -406,6 +408,8 @@ 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');
......
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