Skip to content

php / dencare-game

Go to a project
Commit 2b6ccbb2 by zhangheng
Options

1

parent 672366f5
Showing with 24 additions and 20 deletions
.idea/workspace.xml
......@@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<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/images/s-c.png" afterPath="$PROJECT_DIR$/Public/static/images/s-c.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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,7 +80,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
......@@ -101,11 +102,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="428" column="22" lean-forward="false" selection-start-line="428" selection-start-column="22" selection-end-line="428" selection-end-column="22" />
<state relative-caret-position="219">
<caret line="391" column="47" lean-forward="false" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding />
</state>
</provider>
......@@ -159,8 +160,8 @@
<find>map-12</find>
<find>image_bounds_by_pos</find>
<find>page-s-</find>
<find>b-j-two</find>
<find>photo_lock</find>
<find>b-j-two</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -180,8 +181,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$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
</option>
</component>
......@@ -542,12 +543,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="4824000" />
<workItem from="1567181764126" duration="5355000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67006000" />
<option name="totallyTimeSpent" value="67537000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -924,14 +925,6 @@
</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="485">
<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 />
</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="418">
......@@ -942,5 +935,13 @@
</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="219">
<caret line="391" column="47" lean-forward="false" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/images/s-c.png
Public/static/images/s-c.png

232 KB | W: | H:

Public/static/images/s-c.png

206 KB | W: | H:

Public/static/images/s-c.png
Public/static/images/s-c.png
Public/static/images/s-c.png
Public/static/images/s-c.png
  • 2-up
  • Swipe
  • Onion skin
Public/static/js/index.js
......@@ -389,8 +389,9 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
ctx.drawImage(cover_three, 0, 0);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png',0.5));
......@@ -413,8 +414,8 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
ctx.drawImage(cover_three, 0, 0);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
......@@ -433,8 +434,9 @@ function mergeImage_two(url) {
cover_three.width = 533;
cover_three.height = 850;
var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -13);
ctx.drawImage(cover_three, 0, 0);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5));
......
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