Skip to content

php / dencare-game

Go to a project
Commit ed19b65a by zhangheng
Options

y

parent 2512607c
Showing with 26 additions and 22 deletions
.idea/workspace.xml
......@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
......@@ -83,8 +82,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="242" column="65" lean-forward="false" selection-start-line="242" selection-start-column="65" selection-end-line="242" selection-end-column="65" />
<state relative-caret-position="355">
<caret line="243" column="0" lean-forward="true" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -165,8 +164,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="371" column="34" lean-forward="true" selection-start-line="371" selection-start-column="34" selection-end-line="371" selection-end-column="34" />
<state relative-caret-position="258">
<caret line="375" column="19" lean-forward="false" selection-start-line="375" selection-start-column="19" selection-end-line="375" selection-end-column="19" />
<folding />
</state>
</provider>
......@@ -588,12 +587,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="48880000" />
<workItem from="1566667516612" duration="49157000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="48880000" />
<option name="totallyTimeSpent" value="49157000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -775,16 +774,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="371" column="34" lean-forward="true" selection-start-line="371" selection-start-column="34" selection-end-line="371" selection-end-column="34" />
<state relative-caret-position="258">
<caret line="375" column="19" lean-forward="false" selection-start-line="375" selection-start-column="19" selection-end-line="375" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="242" column="65" lean-forward="false" selection-start-line="242" selection-start-column="65" selection-end-line="242" selection-end-column="65" />
<state relative-caret-position="355">
<caret line="243" column="0" lean-forward="true" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......
Application/Home/View/default/Index_index.tpl
......@@ -242,7 +242,7 @@
<!--<script type="text/javascript"-->
<!--src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=2tzKMdJxaQREJDP7"></script>-->
<script type="text/javascript" src="__CDN__/js/index.js?t=3"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=4"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
Public/static/js/index.js
......@@ -370,18 +370,23 @@ function mergeImage_two(url) {
tmp.height = 1238;
cover_three.width = 640;
cover_three.height = 1238;
setTimeout(function () {
cover_four.onload = function () {
alert(2)
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.3));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 4000);
};
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.3));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 1000);
}
}, 3000);
}
}
......
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