Skip to content

php / dencare-game

Go to a project
Commit fcdd7054 by zhangheng
Options

1

parent 63e1a8e3
Showing with 19 additions and 21 deletions
.idea/workspace.xml
......@@ -2,11 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<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/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
<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" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -86,7 +84,7 @@
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" 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>
......@@ -107,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="409">
<caret line="435" column="47" lean-forward="true" selection-start-line="435" selection-start-column="47" selection-end-line="435" selection-end-column="47" />
<state relative-caret-position="67">
<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>
......@@ -161,9 +159,9 @@
<find>map-12</find>
<find>image_bounds_by_pos</find>
<find>page-s-</find>
<find>dialog_rule</find>
<find>b-j-two</find>
<find>photo_lock</find>
<find>dialog_rule</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -182,8 +180,8 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
......@@ -545,12 +543,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="6234000" />
<workItem from="1567181764126" duration="6275000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68416000" />
<option name="totallyTimeSpent" value="68457000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -919,18 +917,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="435" column="47" lean-forward="true" selection-start-line="435" selection-start-column="47" selection-end-line="435" selection-end-column="47" />
<state relative-caret-position="304">
<caret line="879" column="3" lean-forward="false" selection-start-line="879" selection-start-column="3" selection-end-line="879" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="879" column="3" lean-forward="false" selection-start-line="879" selection-start-column="3" selection-end-line="879" selection-end-column="3" />
<state relative-caret-position="67">
<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>
......@@ -938,7 +936,7 @@
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" 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>
......
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=39"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=40"></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, 7, 9);
ctx.drawImage(cover_four, 7, 11);
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, 7, 9);
ctx.drawImage(cover_four, 7, 11);
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, 7, 9);
ctx.drawImage(cover_four, 7, 11);
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