Skip to content

php / dencare-game

Go to a project
Commit f29f35a3 by zhangheng
Options

1

parent 0883c9af
Showing with 23 additions and 22 deletions
.idea/workspace.xml
......@@ -2,6 +2,7 @@
<project version="4">
<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>
......@@ -82,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="342">
<caret line="287" column="70" lean-forward="true" selection-start-line="287" selection-start-column="70" selection-end-line="287" selection-end-column="70" />
<state relative-caret-position="399">
<caret line="290" column="0" lean-forward="true" selection-start-line="290" selection-start-column="0" selection-end-line="290" selection-end-column="0" />
<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>
......@@ -104,8 +105,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="276">
<caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<state relative-caret-position="124">
<caret line="391" column="43" lean-forward="false" selection-start-line="391" selection-start-column="43" selection-end-line="391" selection-end-column="43" />
<folding />
</state>
</provider>
......@@ -118,8 +119,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="247">
<caret line="344" column="55" lean-forward="false" selection-start-line="344" selection-start-column="55" selection-end-line="344" selection-end-column="55" />
<state relative-caret-position="399">
<caret line="352" column="0" lean-forward="true" selection-start-line="352" selection-start-column="0" selection-end-line="352" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -542,12 +543,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="5466000" />
<workItem from="1567181764126" duration="5532000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67648000" />
<option name="totallyTimeSpent" value="67714000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -908,34 +909,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="344" column="55" lean-forward="false" selection-start-line="344" selection-start-column="55" selection-end-line="344" selection-end-column="55" />
<state relative-caret-position="589">
<caret line="112" column="14" lean-forward="false" selection-start-line="112" selection-start-column="14" selection-end-line="112" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="112" column="14" lean-forward="false" selection-start-line="112" selection-start-column="14" selection-end-line="112" selection-end-column="14" />
<state relative-caret-position="399">
<caret line="352" column="0" lean-forward="true" selection-start-line="352" selection-start-column="0" selection-end-line="352" selection-end-column="0" />
<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="276">
<caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<state relative-caret-position="124">
<caret line="391" column="43" lean-forward="false" selection-start-line="391" selection-start-column="43" selection-end-line="391" selection-end-column="43" />
<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="342">
<caret line="287" column="70" lean-forward="true" selection-start-line="287" selection-start-column="70" selection-end-line="287" selection-end-column="70" />
<state relative-caret-position="399">
<caret line="290" column="0" lean-forward="true" selection-start-line="290" selection-start-column="0" selection-end-line="290" selection-end-column="0" />
<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>
......
Application/Home/View/default/Index_index.tpl
......@@ -289,7 +289,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=31"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=32"></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
......@@ -389,7 +389,7 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_four, 10, 0);
ctx.drawImage(cover_three, 0, 0);
setTimeout(function () {
......@@ -414,7 +414,7 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_four, 10, 0);
ctx.drawImage(cover_three, 0, 0);
setTimeout(function () {
......@@ -434,7 +434,7 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_four, 10, 0);
ctx.drawImage(cover_three, 0, 0);
setTimeout(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