Skip to content

php / dencare-game

Go to a project
Commit eeb892c8 by zhangheng
Options

1

parent cd2f19c4
Showing with 12 additions and 12 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="532"> <state relative-caret-position="57">
<caret line="412" column="42" lean-forward="false" selection-start-line="412" selection-start-column="42" selection-end-line="412" selection-end-column="42" /> <caret line="393" column="67" lean-forward="false" selection-start-line="393" selection-start-column="67" selection-end-line="393" selection-end-column="67" />
<folding> <folding>
<marker date="1567182511000" expanded="true" signature="11519:11533" ph="{...}" /> <marker date="1567182623000" expanded="true" signature="11518:11532" 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="718000" /> <workItem from="1567181764126" duration="822000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62900000" /> <option name="totallyTimeSpent" value="63004000" />
</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="1567182511000" expanded="true" signature="11519:11533" ph="{...}" /> <marker date="1567182623000" expanded="true" signature="11518:11532" 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="1567182511000" expanded="true" signature="11519:11533" ph="{...}" /> <marker date="1567182623000" expanded="true" signature="11518:11532" 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="532"> <state relative-caret-position="57">
<caret line="412" column="42" lean-forward="false" selection-start-line="412" selection-start-column="42" selection-end-line="412" selection-end-column="42" /> <caret line="393" column="67" lean-forward="false" selection-start-line="393" selection-start-column="67" selection-end-line="393" selection-end-column="67" />
<folding> <folding>
<marker date="1567182511000" expanded="true" signature="11519:11533" ph="{...}" /> <marker date="1567182623000" expanded="true" signature="11518:11532" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -391,7 +391,7 @@ function mergeImage_two(url) { ...@@ -391,7 +391,7 @@ function mergeImage_two(url) {
ctx.drawImage(cover_four, 2, 2); ctx.drawImage(cover_four, 2, 2);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png',0.5));
$('.page-x-z').hide(); $('.page-x-z').hide();
$('.page-s-c').show(); $('.page-s-c').show();
$('.page_checking').hide() $('.page_checking').hide()
...@@ -413,7 +413,7 @@ function mergeImage_two(url) { ...@@ -413,7 +413,7 @@ function mergeImage_two(url) {
ctx.drawImage(cover_four, 0, 0); ctx.drawImage(cover_four, 0, 0);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
$('.page-x-z').hide(); $('.page-x-z').hide();
$('.page-s-c').show(); $('.page-s-c').show();
$('.page_checking').hide() $('.page_checking').hide()
......
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