Skip to content

php / dencare-game

Go to a project
Commit e457dc48 by zhangheng
Options

2

parent 8a4b9556
Showing with 21 additions and 12 deletions
.idea/workspace.xml
...@@ -112,9 +112,12 @@ ...@@ -112,9 +112,12 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <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="209"> <state relative-caret-position="494">
<caret line="374" column="25" lean-forward="false" selection-start-line="374" selection-start-column="25" selection-end-line="374" selection-end-column="25" /> <caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" />
<folding /> <folding>
<marker date="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -543,12 +546,12 @@ ...@@ -543,12 +546,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="883000" /> <workItem from="1567098016695" duration="999000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56632000" /> <option name="totallyTimeSpent" value="56748000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" /> <frame x="0" y="23" width="1440" height="817" extended-state="6" />
...@@ -692,7 +695,10 @@ ...@@ -692,7 +695,10 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7486"> <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" /> <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 /> <folding>
<marker date="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -826,9 +832,12 @@ ...@@ -826,9 +832,12 @@
</entry> </entry>
<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="209"> <state relative-caret-position="494">
<caret line="374" column="25" lean-forward="false" selection-start-line="374" selection-start-column="25" selection-end-line="374" selection-end-column="25" /> <caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" />
<folding /> <folding>
<marker date="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Home/View/default/Index_index.tpl
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,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=26"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=27"></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
...@@ -395,7 +395,7 @@ function mergeImage_two(url) { ...@@ -395,7 +395,7 @@ function mergeImage_two(url) {
}else { }else {
cover_four.onload = function () { cover_four.onload = function () {
cover_three.onload = function () { // cover_three.onload = function () {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 640; tmp.width = 640;
tmp.height = 1238; tmp.height = 1238;
...@@ -413,7 +413,7 @@ function mergeImage_two(url) { ...@@ -413,7 +413,7 @@ function mergeImage_two(url) {
}, 3000); }, 3000);
} }
} // }
} }
......
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