Skip to content

php / dencare-game

Go to a project
Commit 47e95969 by zhangheng
Options

1

parent c3065569
Showing with 23 additions and 22 deletions
.idea/workspace.xml
......@@ -3,6 +3,7 @@
<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 +80,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="190">
<caret line="202" column="63" lean-forward="false" selection-start-line="202" selection-start-column="63" selection-end-line="202" selection-end-column="63" />
<state relative-caret-position="133">
<caret line="279" column="60" lean-forward="false" selection-start-line="279" selection-start-column="60" selection-end-line="279" 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,13 +102,13 @@
</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="314">
<caret line="386" column="35" lean-forward="false" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
<state relative-caret-position="390">
<caret line="390" column="44" lean-forward="true" selection-start-line="390" selection-start-column="44" selection-end-line="390" selection-end-column="44" />
<folding>
<marker date="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567182372000" expanded="true" signature="11519:11533" ph="{...}" />
</folding>
</state>
</provider>
......@@ -180,8 +181,8 @@
<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$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -542,12 +543,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="470000" />
<workItem from="1567181764126" duration="591000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62652000" />
<option name="totallyTimeSpent" value="62773000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -686,7 +687,7 @@
<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="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567182372000" expanded="true" signature="11519:11533" ph="{...}" />
</folding>
</state>
</provider>
......@@ -787,7 +788,7 @@
<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="1567182244000" expanded="true" signature="11522:11536" ph="{...}" />
<marker date="1567182372000" expanded="true" signature="11519:11533" ph="{...}" />
</folding>
</state>
</provider>
......@@ -918,22 +919,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="202" column="63" lean-forward="false" selection-start-line="202" selection-start-column="63" selection-end-line="202" selection-end-column="63" />
<state relative-caret-position="390">
<caret line="390" column="44" lean-forward="true" selection-start-line="390" selection-start-column="44" selection-end-line="390" selection-end-column="44" />
<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" />
<marker date="1567182372000" expanded="true" signature="11519:11533" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="314">
<caret line="386" column="35" lean-forward="false" selection-start-line="386" selection-start-column="35" selection-end-line="386" selection-end-column="35" />
<state relative-caret-position="133">
<caret line="279" column="60" lean-forward="false" selection-start-line="279" selection-start-column="60" selection-end-line="279" selection-end-column="60" />
<folding>
<marker date="1567182244000" expanded="true" signature="11522:11536" 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
......@@ -277,7 +277,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=27"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=28"></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
......@@ -388,7 +388,7 @@ function mergeImage_two(url) {
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
ctx.drawImage(cover_four, 2, 2);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
......
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