Skip to content

php / dencare-game

Go to a project
Commit 0883c9af by zhangheng
Options

1

parent 71951cb5
Showing with 24 additions and 24 deletions
.idea/workspace.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="342">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" /> <caret line="287" column="70" lean-forward="true" selection-start-line="287" selection-start-column="70" selection-end-line="287" selection-end-column="70" />
<folding> <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" /> <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> </folding>
...@@ -101,10 +101,10 @@ ...@@ -101,10 +101,10 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371"> <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" /> <caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<folding /> <folding />
</state> </state>
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
<find>map-12</find> <find>map-12</find>
<find>image_bounds_by_pos</find> <find>image_bounds_by_pos</find>
<find>page-s-</find> <find>page-s-</find>
<find>photo_lock</find>
<find>b-j-two</find> <find>b-j-two</find>
<find>photo_lock</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <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$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <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$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list> </list>
</option> </option>
</component> </component>
...@@ -542,12 +542,12 @@ ...@@ -542,12 +542,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="5420000" /> <workItem from="1567181764126" duration="5466000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67602000" /> <option name="totallyTimeSpent" value="67648000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -924,21 +924,21 @@ ...@@ -924,21 +924,21 @@
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="276">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" /> <caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<folding> <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>
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371"> <state relative-caret-position="342">
<caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" /> <caret line="287" column="70" lean-forward="true" selection-start-line="287" selection-start-column="70" selection-end-line="287" selection-end-column="70" />
<folding /> <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>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Home/View/default/Index_index.tpl
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
<script type="text/javascript" <script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script> 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=30"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=31"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet"> <link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script> <script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
Public/static/js/index.js
...@@ -389,7 +389,7 @@ function mergeImage_two(url) { ...@@ -389,7 +389,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -9); ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { setTimeout(function () {
...@@ -414,7 +414,7 @@ function mergeImage_two(url) { ...@@ -414,7 +414,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -9); ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { setTimeout(function () {
...@@ -434,7 +434,7 @@ function mergeImage_two(url) { ...@@ -434,7 +434,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -9); ctx.drawImage(cover_four, 10, -6);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { 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