Skip to content

php / dencare-game

Go to a project
Commit 7ae4a02a by zhangheng
Options

2

parent 99e60325
Showing with 31 additions and 31 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="114">
<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="323">
<caret line="273" column="50" lean-forward="true" selection-start-line="273" selection-start-column="50" selection-end-line="273" selection-end-column="50" />
<folding />
</state>
</provider>
......@@ -103,7 +103,7 @@
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1634">
<state relative-caret-position="143">
<caret line="91" column="29" lean-forward="false" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
<folding />
</state>
......@@ -113,8 +113,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="361">
<caret line="393" column="57" lean-forward="false" selection-start-line="393" selection-start-column="57" selection-end-line="393" selection-end-column="57" />
<state relative-caret-position="209">
<caret line="376" column="11" lean-forward="true" selection-start-line="376" selection-start-column="11" selection-end-line="376" selection-end-column="11" />
<folding />
</state>
</provider>
......@@ -127,8 +127,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="247" column="21" lean-forward="false" selection-start-line="247" selection-start-column="21" selection-end-line="247" selection-end-column="21" />
<state relative-caret-position="323">
<caret line="246" column="8" lean-forward="true" selection-start-line="246" selection-start-column="8" selection-end-line="246" selection-end-column="8" />
<folding />
</state>
</provider>
......@@ -544,12 +544,12 @@
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="229000" />
<workItem from="1567098016695" duration="387000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55978000" />
<option name="totallyTimeSpent" value="56136000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" />
......@@ -729,14 +729,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1634">
<caret line="91" column="29" lean-forward="false" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
......@@ -819,24 +811,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="247" column="21" lean-forward="false" selection-start-line="247" selection-start-column="21" selection-end-line="247" selection-end-column="21" />
<state relative-caret-position="323">
<caret line="246" column="8" lean-forward="true" selection-start-line="246" selection-start-column="8" selection-end-line="246" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="143">
<caret line="91" column="29" lean-forward="false" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="393" column="57" lean-forward="false" selection-start-line="393" selection-start-column="57" selection-end-line="393" selection-end-column="57" />
<state relative-caret-position="209">
<caret line="376" column="11" lean-forward="true" selection-start-line="376" selection-start-column="11" selection-end-line="376" selection-end-column="11" />
<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="114">
<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="323">
<caret line="273" column="50" lean-forward="true" selection-start-line="273" selection-start-column="50" selection-end-line="273" selection-end-column="50" />
<folding />
</state>
</provider>
......
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=20"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=21"></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
......@@ -367,25 +367,25 @@ function mergeImage_two(url) {
var cover_four = new Image();
var ceshi=new Image();;
var url_three = '/Public/static/images/h-b.jpg?t=1';
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;
if(isAndroid){
ceshi.src='/Public/static/images/ceshi.jpg?t=1';
ceshi.src='/Public/static/images/s-c.jpg?t=1';
alert('安卓')
}else {
ceshi.src= url;
alert('IOS')
}
cover_four.onload = function () {
ceshi.onload = function () {
// cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 600;
tmp.height = 1093;
cover_three.width = 600;
cover_three.height = 1093;
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);
......
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