Skip to content

php / dencare-game

Go to a project
Commit 6d0b78af by zhangheng
Options

1

parent 29788b41
Showing with 67 additions and 75 deletions
.idea/workspace.xml
......@@ -2,7 +2,7 @@
<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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -79,11 +79,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false">
<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="-133">
<caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<state relative-caret-position="418">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......@@ -101,20 +101,12 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<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="532">
<caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
<folding>
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
<state relative-caret-position="19">
<caret line="1" column="17" lean-forward="false" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
......@@ -187,9 +179,9 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -550,12 +542,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="4557000" />
<workItem from="1567181764126" duration="4722000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="66739000" />
<option name="totallyTimeSpent" value="66904000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -693,15 +685,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -800,15 +784,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -940,16 +916,6 @@
</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="-133">
<caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
......@@ -960,16 +926,18 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
<state relative-caret-position="19">
<caret line="1" column="17" lean-forward="false" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<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="418">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<folding>
<marker date="1567186611000" expanded="true" signature="10480:12213" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10773:11475" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="10816:11468" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11480:12209" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11522:12202" ph="{...}" />
<marker date="1567186611000" expanded="true" signature="11573:12190" ph="{...}" />
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......
Application/Home/View/default/Index_index.tpl
......@@ -289,7 +289,7 @@
<script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=28"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=29"></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
var type_id = 1;
var photo_lock=1;
var sideLock=false;
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
......@@ -402,26 +403,49 @@ function mergeImage_two(url) {
}
}else {
cover_four.onload = function () {
// cover_three.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 533;
tmp.height = 850;
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
setTimeout(function () {
if(photo_lock=1){
photo_lock=2
cover_four.onload = function () {
cover_three.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 533;
tmp.height = 850;
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 6000);
}
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 6000);
// }
}
}else {
cover_three.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 533;
tmp.height = 850;
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 6000);
}
}
}
}
......
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