Skip to content

php / dencare-game

Go to a project
Commit bf88cd06 by zhangheng
Options

y

parent 81353d9d
Showing with 26 additions and 32 deletions
.idea/workspace.xml
......@@ -3,6 +3,7 @@
<component name="ChangeListManager">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -79,11 +80,11 @@
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="241" column="37" lean-forward="true" selection-start-line="241" selection-start-column="37" selection-end-line="241" selection-end-column="37" />
<state relative-caret-position="374">
<caret line="244" column="59" lean-forward="false" selection-start-line="244" selection-start-column="59" selection-end-line="244" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -161,15 +162,12 @@
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="410">
<caret line="383" column="0" lean-forward="true" selection-start-line="383" selection-start-column="0" selection-end-line="383" selection-end-column="0" />
<folding>
<marker date="1566925311000" expanded="true" signature="9861:10783" ph="{...}" />
<marker date="1566925311000" expanded="true" signature="10185:10776" ph="{...}" />
</folding>
<state relative-caret-position="258">
<caret line="371" column="36" lean-forward="true" selection-start-line="371" selection-start-column="36" selection-end-line="371" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
......@@ -214,8 +212,8 @@
<find>page-lang</find>
<find>btn-next-map</find>
<find>btn-info</find>
<find>mergeImage_two</find>
<find>mix/</find>
<find>mergeImage_two</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -235,8 +233,8 @@
<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/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$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -590,12 +588,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="49587000" />
<workItem from="1566667516612" duration="49971000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49587000" />
<option name="totallyTimeSpent" value="49971000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -775,10 +773,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="371" column="36" lean-forward="true" selection-start-line="371" selection-start-column="36" selection-end-line="371" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="241" column="37" lean-forward="true" selection-start-line="241" selection-start-column="37" selection-end-line="241" selection-end-column="37" />
<state relative-caret-position="374">
<caret line="244" column="59" lean-forward="false" selection-start-line="244" selection-start-column="59" selection-end-line="244" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -835,16 +841,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="410">
<caret line="383" column="0" lean-forward="true" selection-start-line="383" selection-start-column="0" selection-end-line="383" selection-end-column="0" />
<folding>
<marker date="1566925311000" expanded="true" signature="9861:10783" ph="{...}" />
<marker date="1566925311000" expanded="true" signature="10185:10776" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
......@@ -242,7 +242,7 @@
<!--<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>-->
<script type="text/javascript" src="__CDN__/js/index.js?t=7"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=8"></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
......@@ -359,7 +359,7 @@ function mergeImage_two(url) {
var cover = new Image();
var cover_three = new Image();
var cover_four = new Image();
var url_three = 'Public/static/images/s-c.jpg';
var url_three = 'Public/static/images/ceshi.jpg';
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
......@@ -369,8 +369,8 @@ function mergeImage_two(url) {
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
tmp.height = 1238;
cover_three.width = 640;
cover_three.height = 1238;
cover_three.width = 600;
cover_three.height = 1093;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
......
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