Skip to content

php / dencare-game

Go to a project
Commit 8bf744e8 by zhangheng
Options

y

parent 43d9edaf
Showing with 21 additions and 12 deletions
.idea/workspace.xml
......@@ -83,8 +83,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="456">
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" />
<state relative-caret-position="304">
<caret line="281" column="37" lean-forward="true" selection-start-line="281" selection-start-column="37" selection-end-line="281" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#div#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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -165,8 +165,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="67">
<caret line="365" column="22" lean-forward="false" selection-start-line="365" selection-start-column="22" selection-end-line="365" selection-end-column="22" />
<state relative-caret-position="266">
<caret line="378" column="9" lean-forward="false" selection-start-line="378" selection-start-column="9" selection-end-line="378" selection-end-column="9" />
<folding />
</state>
</provider>
......@@ -590,12 +590,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="54451000" />
<workItem from="1566667516612" duration="54787000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54451000" />
<option name="totallyTimeSpent" value="54787000" />
</component>
<component name="ToolWindowManager">
<frame x="31" y="23" width="1440" height="817" extended-state="0" />
......@@ -785,16 +785,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67">
<caret line="365" column="22" lean-forward="false" selection-start-line="365" selection-start-column="22" selection-end-line="365" selection-end-column="22" />
<state relative-caret-position="266">
<caret line="378" column="9" lean-forward="false" selection-start-line="378" selection-start-column="9" selection-end-line="378" selection-end-column="9" />
<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="456">
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" />
<state relative-caret-position="304">
<caret line="281" column="37" lean-forward="true" selection-start-line="281" selection-start-column="37" selection-end-line="281" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#div#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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......
Application/Home/View/default/Index_index.tpl
......@@ -269,7 +269,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=10"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=11"></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 sideLock=false;
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
$(document).ready(function () {
try {
......@@ -363,11 +365,18 @@ function mergeImage_two(url) {
var cover = new Image();
var cover_three = new Image();
var cover_four = new Image();
var ceshi;
var url_three = '/Public/static/images/s-c.jpg?t=1';
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
cover_three.onload = function () {
if(isAndroid){
ceshi='/Public/static/images/s-c.jpg?t=1';
}else {
ceshi = url;
}
ceshi.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
......
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