Skip to content

php / dencare-game

Go to a project
Commit 7b2e1208 by zhangheng
Options

y

parent bf88cd06
Showing with 11 additions and 11 deletions
.idea/workspace.xml
......@@ -2,8 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/ceshi.jpg" afterPath="" />
<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" />
......@@ -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="258">
<caret line="371" column="36" lean-forward="true" selection-start-line="371" selection-start-column="36" selection-end-line="371" selection-end-column="36" />
<state relative-caret-position="87">
<caret line="362" column="24" lean-forward="true" selection-start-line="362" selection-start-column="24" selection-end-line="362" selection-end-column="24" />
<folding />
</state>
</provider>
......@@ -588,12 +588,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="49971000" />
<workItem from="1566667516612" duration="50108000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49971000" />
<option name="totallyTimeSpent" value="50108000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -775,8 +775,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="371" column="36" lean-forward="true" selection-start-line="371" selection-start-column="36" selection-end-line="371" selection-end-column="36" />
<state relative-caret-position="87">
<caret line="362" column="24" lean-forward="true" selection-start-line="362" selection-start-column="24" selection-end-line="362" selection-end-column="24" />
<folding />
</state>
</provider>
......
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=8"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=9"></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
......@@ -359,7 +359,7 @@ function mergeImage_two(url) {
var cover = new Image();
var cover_three = new Image();
var cover_four = new Image();
var url_three = 'Public/static/images/ceshi.jpg';
var url_three = 'Public/static/images/s-c.jpg';
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
......@@ -369,8 +369,8 @@ function mergeImage_two(url) {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
tmp.height = 1238;
cover_three.width = 600;
cover_three.height = 1093;
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