Skip to content

php / dencare-game

Go to a project
Commit 789cacd2 by zhangheng
Options

y

parent dc9c5252
Showing with 10 additions and 12 deletions
.idea/workspace.xml
...@@ -164,8 +164,8 @@ ...@@ -164,8 +164,8 @@
<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="448"> <state relative-caret-position="87">
<caret line="381" column="21" lean-forward="true" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> <caret line="366" column="41" lean-forward="false" selection-start-line="366" selection-start-column="41" selection-end-line="366" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -587,12 +587,12 @@ ...@@ -587,12 +587,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="49490000" /> <workItem from="1566667516612" duration="49551000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49490000" /> <option name="totallyTimeSpent" value="49551000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" /> <frame x="33" y="23" width="1440" height="817" extended-state="0" />
...@@ -774,8 +774,8 @@ ...@@ -774,8 +774,8 @@
</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="448"> <state relative-caret-position="87">
<caret line="381" column="21" lean-forward="true" selection-start-line="381" selection-start-column="21" selection-end-line="381" selection-end-column="21" /> <caret line="366" column="41" lean-forward="false" selection-start-line="366" selection-start-column="41" selection-end-line="366" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Application/Home/View/default/Index_index.tpl
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,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&app_stat_key=2tzKMdJxaQREJDP7"></script>--> <!--src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=2tzKMdJxaQREJDP7"></script>-->
<script type="text/javascript" src="__CDN__/js/index.js?t=5"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=7"></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
...@@ -363,8 +363,8 @@ function mergeImage_two(url) { ...@@ -363,8 +363,8 @@ function mergeImage_two(url) {
var url_two_t = url; var url_two_t = url;
cover_four.src = url_two_t; cover_four.src = url_two_t;
cover_three.src = url_three; cover_three.src = url_three;
cover_three.onload = function () { // cover_three.onload = function () {
// cover_four.onload = function () { cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 640; tmp.width = 640;
...@@ -380,9 +380,7 @@ function mergeImage_two(url) { ...@@ -380,9 +380,7 @@ function mergeImage_two(url) {
$('.page-s-c').show(); $('.page-s-c').show();
$('.page_checking').hide() $('.page_checking').hide()
}, 6000); }, 6000);
// } }
} }
} }
......
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