Skip to content

php / dencare-game

Go to a project
Commit 672366f5 by zhangheng
Options

1

parent 6d0b78af
Showing with 19 additions and 19 deletions
.idea/workspace.xml
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,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="19"> <state relative-caret-position="485">
<caret line="1" column="17" lean-forward="false" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" /> <caret line="428" column="22" lean-forward="false" selection-start-line="428" selection-start-column="22" selection-end-line="428" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>page-game</find>
<find>imageObj2</find> <find>imageObj2</find>
<find>addAnchor</find> <find>addAnchor</find>
<find>#container</find> <find>#container</find>
...@@ -161,6 +160,7 @@ ...@@ -161,6 +160,7 @@
<find>image_bounds_by_pos</find> <find>image_bounds_by_pos</find>
<find>page-s-</find> <find>page-s-</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>
...@@ -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="4722000" /> <workItem from="1567181764126" duration="4824000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="66904000" /> <option name="totallyTimeSpent" value="67006000" />
</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" />
...@@ -843,14 +843,6 @@ ...@@ -843,14 +843,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="220">
...@@ -924,10 +916,18 @@ ...@@ -924,10 +916,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<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" />
<folding />
</state>
</provider>
</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="19"> <state relative-caret-position="485">
<caret line="1" column="17" lean-forward="false" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" /> <caret line="428" column="22" lean-forward="false" selection-start-line="428" selection-start-column="22" selection-end-line="428" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
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=29"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=30"></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
...@@ -403,8 +403,8 @@ function mergeImage_two(url) { ...@@ -403,8 +403,8 @@ function mergeImage_two(url) {
} }
}else { }else {
if(photo_lock=1){ if(photo_lock==1){
photo_lock=2 photo_lock=2;
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];
...@@ -426,7 +426,7 @@ function mergeImage_two(url) { ...@@ -426,7 +426,7 @@ function mergeImage_two(url) {
} }
}else { }else {
cover_three.onload = function () { cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
tmp.width = 533; tmp.width = 533;
tmp.height = 850; tmp.height = 850;
......
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