Skip to content

php / dencare-game

Go to a project
Commit cc6284b5 by zhangheng
Options

2

parent 29980f46
Showing with 123 additions and 45 deletions
.idea/workspace.xml
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
<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$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/b-20.png" afterPath="$PROJECT_DIR$/Public/static/images/b-20.png" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/17.png" afterPath="$PROJECT_DIR$/Public/static/images/17.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/19.png" afterPath="$PROJECT_DIR$/Public/static/images/19.png" />
<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.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/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" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -20,7 +23,7 @@ ...@@ -20,7 +23,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.2812211"> <splitter split-orientation="horizontal" split-proportion="0.6299722">
<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">
...@@ -82,11 +85,11 @@ ...@@ -82,11 +85,11 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <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="285"> <state relative-caret-position="418">
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" /> <caret line="136" column="30" lean-forward="false" selection-start-line="136" selection-start-column="30" selection-end-line="136" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -112,15 +115,12 @@ ...@@ -112,15 +115,12 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <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="494"> <state relative-caret-position="299">
<caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" /> <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
<folding> <folding />
<marker date="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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="380"> <state relative-caret-position="404">
<caret line="578" column="3" lean-forward="false" selection-start-line="578" selection-start-column="3" selection-end-line="578" selection-end-column="3" /> <caret line="635" column="18" lean-forward="true" selection-start-line="635" selection-start-column="18" selection-end-line="635" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -170,6 +170,9 @@ ...@@ -170,6 +170,9 @@
<find>page-m-b</find> <find>page-m-b</find>
<find>map-29</find> <find>map-29</find>
<find>map-12</find> <find>map-12</find>
<find>map-17</find>
<find>map-19</find>
<find>map-20</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -188,9 +191,9 @@ ...@@ -188,9 +191,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/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -202,7 +205,7 @@ ...@@ -202,7 +205,7 @@
</component> </component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-176" /> <option name="x" value="14" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="817" /> <option name="height" value="817" />
...@@ -551,15 +554,15 @@ ...@@ -551,15 +554,15 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="2093000" /> <workItem from="1567098016695" duration="3367000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="57842000" /> <option name="totallyTimeSpent" value="59116000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-176" y="23" width="1440" height="817" extended-state="0" /> <frame x="14" y="23" width="1440" height="817" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2267525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2267525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -569,7 +572,7 @@ ...@@ -569,7 +572,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24689655" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24689655" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17517242" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17517242" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
...@@ -700,10 +703,7 @@ ...@@ -700,10 +703,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<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="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -827,29 +827,26 @@ ...@@ -827,29 +827,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <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="494"> <state relative-caret-position="418">
<caret line="416" column="0" lean-forward="true" selection-start-line="416" selection-start-column="0" selection-end-line="416" selection-end-column="0" /> <caret line="136" column="30" lean-forward="false" selection-start-line="136" selection-start-column="30" selection-end-line="136" selection-end-column="30" />
<folding> <folding />
<marker date="1567099022000" expanded="true" signature="10219:11927" ph="{...}" />
<marker date="1567099022000" expanded="true" signature="11222:11920" ph="{...}" />
</folding>
</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="285"> <state relative-caret-position="299">
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" /> <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<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="380"> <state relative-caret-position="404">
<caret line="578" column="3" lean-forward="false" selection-start-line="578" selection-start-column="3" selection-end-line="578" selection-end-column="3" /> <caret line="635" column="18" lean-forward="true" selection-start-line="635" selection-start-column="18" selection-end-line="635" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Application/Home/View/default/Index_index.tpl
...@@ -131,6 +131,10 @@ ...@@ -131,6 +131,10 @@
<div class="map-28"style="display: none"></div> <div class="map-28"style="display: none"></div>
<div class="map-29" style="display: none"></div> <div class="map-29" style="display: none"></div>
<div class="map-30" style="display: none"></div> <div class="map-30" style="display: none"></div>
<div class="map-31" style="display: none"></div>
<div class="map-32" style="display: none"></div>
<div class="map-33" style="display: none"></div>
<div class="map-34" style="display: none"></div>
</div> </div>
<div class="page-m-b" style="display: none"> <div class="page-m-b" style="display: none">
<div class="zhou m-b-zhou-sate"></div> <div class="zhou m-b-zhou-sate"></div>
......
Public/static/css/main.css
...@@ -770,35 +770,83 @@ ul, li { ...@@ -770,35 +770,83 @@ ul, li {
left: 70px; left: 70px;
top: 5474px; top: 5474px;
background: url("../images/17.png") left top; background: url("../images/17.png") left top;
width: 528px; width: 262px;
height: 484px; height: 484px;
-webkit-animation: down 1s 1 linear; -webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-31 {
opacity: 0;
position: absolute;
display: inline-block;
left: 260px;
top: 5512px;
background: url("../images/31.png") left top;
width: 337px;
height: 420px;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-19 { .page-lang .map-19 {
opacity: 0; opacity: 0;
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 39px; left: 320px;
top: 6361px; top: 6361px;
background: url("../images/19.png") left top; background: url("../images/19.png") left top;
width: 548px; width: 276px;
height: 304px; height: 304px;
-webkit-animation: left 1s 1 linear; -webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-32 {
opacity: 0;
position: absolute;
display: inline-block;
left: 40px;
top: 6415px;
background: url("../images/map-19.png") left top;
width: 263px;
height: 196px;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-20 { .page-lang .map-20 {
opacity: 0; opacity: 0;
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 70px; left: 289px;
top: 6691px; top: 6708px;
background: url("../images/20.png") left top; background: url("../images/20.png") left top;
width: 520px; width: 520px;
height: 419px; height: 419px;
-webkit-animation: down 1s 1 linear; -webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-33 {
opacity: 0;
position: absolute;
display: inline-block;
left: 68px;
top: 6691px;
background: url("../images/32.png") left top;
width: 234px;
height: 186px;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-34 {
opacity: 0;
position: absolute;
display: inline-block;
left: 68px;
top: 6946px;
background: url("../images/32.png") left top;
width: 234px;
height: 186px;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-21 { .page-lang .map-21 {
opacity: 0; opacity: 0;
position: absolute; position: absolute;
......
Public/static/css/main.scss
...@@ -601,19 +601,42 @@ ul, li { ...@@ -601,19 +601,42 @@ ul, li {
-webkit-animation: down 1s 1 linear; -webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards animation-fill-mode: forwards
} }
.map-31 {
opacity: 0;
@include image_bounds_by_pos("../images/31.png", 260px, 5512px);
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-19 { .map-19 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/19.png", 39px, 6361px); @include image_bounds_by_pos("../images/19.png", 320px, 6361px);
-webkit-animation: left 1s 1 linear; -webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards animation-fill-mode: forwards
} }
.map-32 {
opacity: 0;
@include image_bounds_by_pos("../images/map-19.png", 40px, 6415px);
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-20 { .map-20 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/20.png", 70px, 6691px); @include image_bounds_by_pos("../images/20.png", 289px, 6708px);
-webkit-animation: down 1s 1 linear; -webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards animation-fill-mode: forwards
} }
.map-33 {
opacity: 0;
@include image_bounds_by_pos("../images/32.png", 68px, 6691px);
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-34 {
opacity: 0;
@include image_bounds_by_pos("../images/32.png", 68px, 6946px);
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-21 { .map-21 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/21.png", 74px, 7268px); @include image_bounds_by_pos("../images/21.png", 74px, 7268px);
......
Public/static/images/17.png
Public/static/images/17.png

250 KB | W: | H:

Public/static/images/17.png

126 KB | W: | H:

Public/static/images/17.png
Public/static/images/17.png
Public/static/images/17.png
Public/static/images/17.png
  • 2-up
  • Swipe
  • Onion skin
Public/static/images/19.png
Public/static/images/19.png

191 KB | W: | H:

Public/static/images/19.png

120 KB | W: | H:

Public/static/images/19.png
Public/static/images/19.png
Public/static/images/19.png
Public/static/images/19.png
  • 2-up
  • Swipe
  • Onion skin
Public/static/js/index.js
...@@ -194,16 +194,22 @@ $(document).ready(function () { ...@@ -194,16 +194,22 @@ $(document).ready(function () {
} }
if(wScrollY>=4557){ if(wScrollY>=4557){
$('.map-17').show() $('.map-17').show()
$('.map-31').show()
} }
if(wScrollY>=5202){ if(wScrollY>=5202){
$('.map-18').show() $('.map-18').show()
} }
if(wScrollY>=5433){ if(wScrollY>=5433){
$('.map-19').show() $('.map-19').show()
$('.map-32').show()
} }
if(wScrollY>=5788){ if(wScrollY>=5788){
$('.map-20').show() $('.map-20').show()
$('.map-33').show();
}
if(wScrollY>=5988){
$('.map-34').show()
} }
if(wScrollY>=6297){ if(wScrollY>=6297){
$('.map-21').show() $('.map-21').show()
......
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