Skip to content

php / dencare-game

Go to a project
Commit c2fcbd5c by zhangheng
Options

1

parent fb62e176
Showing with 22 additions and 22 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="209"> <state relative-caret-position="152">
<caret line="392" column="47" lean-forward="false" selection-start-line="392" selection-start-column="47" selection-end-line="392" selection-end-column="47" /> <caret line="392" column="46" lean-forward="false" selection-start-line="392" selection-start-column="46" selection-end-line="392" selection-end-column="46" />
<folding> <folding>
<marker date="1567183213000" expanded="true" signature="11588:11602" ph="{...}" /> <marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437"> <state relative-caret-position="418">
<caret line="375" column="4" lean-forward="false" selection-start-line="375" selection-start-column="4" selection-end-line="375" selection-end-column="4" /> <caret line="374" column="9" lean-forward="true" selection-start-line="374" selection-start-column="9" selection-end-line="374" selection-end-column="9" />
<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="1287000" /> <workItem from="1567181764126" duration="1369000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63469000" /> <option name="totallyTimeSpent" value="63551000" />
</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="1567183213000" expanded="true" signature="11588:11602" ph="{...}" /> <marker date="1567183326000" expanded="true" signature="11587:11601" 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="1567183213000" expanded="true" signature="11588:11602" ph="{...}" /> <marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -910,14 +910,6 @@ ...@@ -910,14 +910,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="375" column="4" lean-forward="false" selection-start-line="375" selection-start-column="4" selection-end-line="375" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266"> <state relative-caret-position="266">
...@@ -928,12 +920,20 @@ ...@@ -928,12 +920,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="374" column="9" lean-forward="true" selection-start-line="374" selection-start-column="9" selection-end-line="374" selection-end-column="9" />
<folding />
</state>
</provider>
</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="209"> <state relative-caret-position="152">
<caret line="392" column="47" lean-forward="false" selection-start-line="392" selection-start-column="47" selection-end-line="392" selection-end-column="47" /> <caret line="392" column="46" lean-forward="false" selection-start-line="392" selection-start-column="46" selection-end-line="392" selection-end-column="46" />
<folding> <folding>
<marker date="1567183213000" expanded="true" signature="11588:11602" ph="{...}" /> <marker date="1567183326000" expanded="true" signature="11587:11601" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -390,7 +390,7 @@ function mergeImage_two(url) { ...@@ -390,7 +390,7 @@ function mergeImage_two(url) {
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, -10, 14); ctx.drawImage(cover_four, 15, -5);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png',0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png',0.5));
...@@ -414,7 +414,7 @@ function mergeImage_two(url) { ...@@ -414,7 +414,7 @@ function mergeImage_two(url) {
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, -10, 14); ctx.drawImage(cover_four, 15, -5);
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