Skip to content

php / dencare-game

Go to a project
Commit 93252ec5 by zhangheng
Options

y

parent 43f8b1bf
Showing with 14 additions and 10 deletions
.idea/workspace.xml
...@@ -163,9 +163,11 @@ ...@@ -163,9 +163,11 @@
<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="266"> <state relative-caret-position="258">
<caret line="81" column="35" lean-forward="true" selection-start-line="81" selection-start-column="35" selection-end-line="81" selection-end-column="35" /> <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
<folding /> <folding>
<marker date="1566838533000" expanded="true" signature="9861:10780" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -585,12 +587,12 @@ ...@@ -585,12 +587,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="44001000" /> <workItem from="1566667516612" duration="44084000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44001000" /> <option name="totallyTimeSpent" value="44084000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="2" y="23" width="1440" height="817" extended-state="6" /> <frame x="2" y="23" width="1440" height="817" extended-state="6" />
...@@ -832,9 +834,11 @@ ...@@ -832,9 +834,11 @@
</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="266"> <state relative-caret-position="258">
<caret line="81" column="35" lean-forward="true" selection-start-line="81" selection-start-column="35" selection-end-line="81" selection-end-column="35" /> <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
<folding /> <folding>
<marker date="1566838533000" expanded="true" signature="9861:10780" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Public/static/js/index.js
...@@ -365,7 +365,7 @@ function mergeImage_two(url) { ...@@ -365,7 +365,7 @@ function mergeImage_two(url) {
cover_three.src = url_three; cover_three.src = url_three;
cover_four.onload = function () { cover_four.onload = function () {
console.log(1) console.log(1)
cover_three.onload = function () { // cover_three.onload = function () {
console.log(22221) console.log(22221)
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 640; tmp.width = 640;
...@@ -382,7 +382,7 @@ function mergeImage_two(url) { ...@@ -382,7 +382,7 @@ function mergeImage_two(url) {
$('.page_checking').hide() $('.page_checking').hide()
}, 1000); }, 1000);
}; };
} // }
} }
window.wx && wx.ready(function () { window.wx && wx.ready(function () {
......
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