Skip to content

php / dencare-game

Go to a project
Commit 9729efec by zhangheng
Options

1

parent 249cf687
Showing with 45 additions and 36 deletions
.idea/workspace.xml
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -17,7 +21,7 @@ ...@@ -17,7 +21,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6610956"> <splitter split-orientation="horizontal" split-proportion="0.35561746">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -79,11 +83,11 @@ ...@@ -79,11 +83,11 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266"> <state relative-caret-position="-1368">
<caret line="202" column="0" lean-forward="false" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" /> <caret line="202" column="23" lean-forward="true" selection-start-line="202" selection-start-column="23" selection-end-line="202" selection-end-column="31" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
...@@ -101,13 +105,13 @@ ...@@ -101,13 +105,13 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <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="38"> <state relative-caret-position="513">
<caret line="386" column="7" lean-forward="false" selection-start-line="386" selection-start-column="7" selection-end-line="386" selection-end-column="7" /> <caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding> <folding>
<marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" /> <marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -120,8 +124,8 @@ ...@@ -120,8 +124,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="399">
<caret line="374" column="9" lean-forward="true" selection-start-line="374" selection-start-column="9" selection-end-line="374" selection-end-column="9" /> <caret line="381" column="3" lean-forward="true" selection-start-line="381" selection-start-column="3" selection-end-line="381" selection-end-column="3" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -161,6 +165,7 @@ ...@@ -161,6 +165,7 @@
<find>map-20</find> <find>map-20</find>
<find>map-12</find> <find>map-12</find>
<find>image_bounds_by_pos</find> <find>image_bounds_by_pos</find>
<find>page-s-</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -179,9 +184,9 @@ ...@@ -179,9 +184,9 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <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$/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$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -542,12 +547,12 @@ ...@@ -542,12 +547,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="1420000" /> <workItem from="1567181764126" duration="1588000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63602000" /> <option name="totallyTimeSpent" value="63770000" />
</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" />
...@@ -686,7 +691,7 @@ ...@@ -686,7 +691,7 @@
<state relative-caret-position="3515"> <state relative-caret-position="3515">
<caret line="185" column="22" lean-forward="false" selection-start-line="185" selection-start-column="22" selection-end-line="185" selection-end-column="22" /> <caret line="185" column="22" lean-forward="false" selection-start-line="185" selection-start-column="22" selection-end-line="185" selection-end-column="22" />
<folding> <folding>
<marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" /> <marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -787,7 +792,7 @@ ...@@ -787,7 +792,7 @@
<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="1567183377000" expanded="true" signature="11528:11542" ph="{...}" /> <marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -910,31 +915,31 @@ ...@@ -910,31 +915,31 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <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="266"> <state relative-caret-position="513">
<caret line="202" column="0" lean-forward="false" selection-start-line="202" selection-start-column="0" selection-end-line="202" selection-end-column="0" /> <caret line="391" column="47" lean-forward="true" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <marker date="1567183422000" expanded="true" signature="11522:11536" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="-1368">
<caret line="374" column="9" lean-forward="true" selection-start-line="374" selection-start-column="9" selection-end-line="374" selection-end-column="9" /> <caret line="202" column="23" lean-forward="true" selection-start-line="202" selection-start-column="23" selection-end-line="202" selection-end-column="31" />
<folding /> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38"> <state relative-caret-position="399">
<caret line="386" column="7" lean-forward="false" selection-start-line="386" selection-start-column="7" selection-end-line="386" selection-end-column="7" /> <caret line="381" column="3" lean-forward="true" selection-start-line="381" selection-start-column="3" selection-end-line="381" selection-end-column="3" />
<folding> <folding />
<marker date="1567183377000" expanded="true" signature="11528:11542" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Home/View/default/Index_index.tpl
...@@ -200,7 +200,9 @@ ...@@ -200,7 +200,9 @@
<div class="page-s-c" style="display: none"> <div class="page-s-c" style="display: none">
<div class="zhou m-b-zhou-sate"></div> <div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div> <div class="c-d m-b-sate"></div>
<div class="b-j-two">
</div>
<img class="b-j-two" src="__CDN__/images/bj-two.jpg"> <img class="b-j-two" src="__CDN__/images/bj-two.jpg">
<img class="h-b" src=""> <img class="h-b" src="">
<img class="btn-s" src="__CDN__/images/f-h.png"> <img class="btn-s" src="__CDN__/images/f-h.png">
......
Public/static/css/main.css
...@@ -103,6 +103,7 @@ ul, li { ...@@ -103,6 +103,7 @@ ul, li {
#container { #container {
width: 640px; width: 640px;
height: 100%;
max-width: 640px; max-width: 640px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
...@@ -410,12 +411,13 @@ ul, li { ...@@ -410,12 +411,13 @@ ul, li {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 640px; width: 640px;
height: 100%;
} }
.page-s-c .b-j-two { .page-s-c .b-j-two {
position: relative;
display: block; display: block;
width: 599px; width: 599px;
height: 1091px; height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
} }
.page-s-c .h-b { .page-s-c .h-b {
position: absolute; position: absolute;
......
Public/static/css/main.scss
...@@ -145,7 +145,7 @@ ul, li { ...@@ -145,7 +145,7 @@ ul, li {
#container { #container {
width: $container-body-width; width: $container-body-width;
//height: 100%; height: 100%;
max-width: $max-width; max-width: $max-width;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
...@@ -364,16 +364,16 @@ ul, li { ...@@ -364,16 +364,16 @@ ul, li {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 640px; width: 640px;
height: 100%;
//height: 1238px; //height: 1238px;
.b-j-two { .b-j-two {
position: relative;
display: block; display: block;
width: 599px; width: 599px;
height: 1091px; height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
} }
.h-b{ .h-b{
position: absolute; position: absolute;
} }
.btn-s { .btn-s {
......
Public/static/js/index.js
...@@ -389,7 +389,7 @@ function mergeImage_two(url) { ...@@ -389,7 +389,7 @@ function mergeImage_two(url) {
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -9); ctx.drawImage(cover_four, 10, -13);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png',0.5)); $('.h-b').attr('src', tmp.toDataURL('image/png',0.5));
...@@ -411,7 +411,7 @@ function mergeImage_two(url) { ...@@ -411,7 +411,7 @@ function mergeImage_two(url) {
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 10, -9); ctx.drawImage(cover_four, 10, -13);
setTimeout(function () { setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/png', 0.5)); $('.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