Skip to content

php / dencare-game

Go to a project
Commit 7a1799a6 by zhangheng
Options

2

parent 6ae0c9f2
Showing with 40 additions and 20 deletions
.idea/workspace.xml
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <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$/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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
...@@ -82,8 +83,8 @@ ...@@ -82,8 +83,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true"> <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"> <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="285"> <state relative-caret-position="361">
<caret line="271" column="59" lean-forward="false" selection-start-line="271" selection-start-column="59" selection-end-line="271" selection-end-column="59" /> <caret line="275" column="8" lean-forward="true" selection-start-line="275" selection-start-column="8" selection-end-line="275" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -112,8 +113,8 @@ ...@@ -112,8 +113,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<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="190"> <state relative-caret-position="475">
<caret line="401" column="1" lean-forward="true" selection-start-line="401" selection-start-column="1" selection-end-line="401" selection-end-column="1" /> <caret line="412" column="16" lean-forward="false" selection-start-line="412" selection-start-column="16" selection-end-line="412" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -543,12 +544,12 @@ ...@@ -543,12 +544,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="565000" /> <workItem from="1567098016695" duration="663000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56314000" /> <option name="totallyTimeSpent" value="56412000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" /> <frame x="0" y="23" width="1440" height="817" extended-state="6" />
...@@ -826,16 +827,16 @@ ...@@ -826,16 +827,16 @@
</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="190"> <state relative-caret-position="475">
<caret line="401" column="1" lean-forward="true" selection-start-line="401" selection-start-column="1" selection-end-line="401" selection-end-column="1" /> <caret line="412" column="16" lean-forward="false" selection-start-line="412" selection-start-column="16" selection-end-line="412" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </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="285"> <state relative-caret-position="361">
<caret line="271" column="59" lean-forward="false" selection-start-line="271" selection-start-column="59" selection-end-line="271" selection-end-column="59" /> <caret line="275" column="8" lean-forward="true" selection-start-line="275" selection-start-column="8" selection-end-line="275" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Application/Home/View/default/Index_index.tpl
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<script type="text/javascript" <script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script> 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=23"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=24"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet"> <link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script> <script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
Public/static/js/index.js
...@@ -372,15 +372,30 @@ function mergeImage_two(url) { ...@@ -372,15 +372,30 @@ 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;
if(isAndroid){ if(isAndroid){
ceshi.src='/Public/static/images/s-c.jpg?t=1'; url_three.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
tmp.height = 1238;
cover_three.width = 640;
cover_three.height = 1238;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
setTimeout(function () {
}else { $('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.5));
ceshi.src= url; $('.page-x-z').hide();
$('.page-s-c').show();
$('.page_checking').hide()
}, 6000);
// }
} }
// ceshi.onload = function () { }else {
// cover_four.onload = function () { url_three.onload = function () {
cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 640; tmp.width = 640;
tmp.height = 1238; tmp.height = 1238;
...@@ -395,10 +410,14 @@ function mergeImage_two(url) { ...@@ -395,10 +410,14 @@ function mergeImage_two(url) {
$('.page-x-z').hide(); $('.page-x-z').hide();
$('.page-s-c').show(); $('.page-s-c').show();
$('.page_checking').hide() $('.page_checking').hide()
}, 6000); }, 3000);
// } }
}
}
// }
} }
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