Skip to content

php / dencare-game

Go to a project
Commit 9c9890eb by zhangheng
Options

y

parent ea9e712f
Showing with 8 additions and 8 deletions
.idea/workspace.xml
...@@ -163,8 +163,8 @@ ...@@ -163,8 +163,8 @@
<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="429"> <state relative-caret-position="201">
<caret line="381" column="20" lean-forward="true" selection-start-line="381" selection-start-column="20" selection-end-line="381" selection-end-column="20" /> <caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -585,12 +585,12 @@ ...@@ -585,12 +585,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="45604000" /> <workItem from="1566667516612" duration="45647000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="45604000" /> <option name="totallyTimeSpent" value="45647000" />
</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,8 +832,8 @@ ...@@ -832,8 +832,8 @@
</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="429"> <state relative-caret-position="201">
<caret line="381" column="20" lean-forward="true" selection-start-line="381" selection-start-column="20" selection-end-line="381" selection-end-column="20" /> <caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -364,9 +364,9 @@ function mergeImage_two(url) { ...@@ -364,9 +364,9 @@ function mergeImage_two(url) {
cover_four.src = url_two_t; cover_four.src = url_two_t;
cover_three.src = url_three; cover_three.src = url_three;
cover_three.onload = function () { cover_three.onload = function () {
alert(1) // alert(1)
cover_four.onload = function () { cover_four.onload = function () {
alert(22221) // alert(22221)
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 640; tmp.width = 640;
tmp.height = 1238; tmp.height = 1238;
......
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