Skip to content

php / dencare-game

Go to a project
Commit ae9cbb7c by zhangheng
Options

2

parent cc6284b5
Showing with 17 additions and 20 deletions
.idea/workspace.xml
...@@ -3,13 +3,9 @@ ...@@ -3,13 +3,9 @@
<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/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" />
...@@ -23,7 +19,7 @@ ...@@ -23,7 +19,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.6299722"> <splitter split-orientation="horizontal" split-proportion="0.31544867">
<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">
...@@ -132,8 +128,8 @@ ...@@ -132,8 +128,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="404"> <state relative-caret-position="290">
<caret line="635" column="18" lean-forward="true" selection-start-line="635" selection-start-column="18" selection-end-line="635" selection-end-column="18" /> <caret line="628" column="4" lean-forward="false" selection-start-line="628" selection-start-column="4" selection-end-line="628" selection-end-column="4" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -192,8 +188,8 @@ ...@@ -192,8 +188,8 @@
<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$/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/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -554,12 +550,12 @@ ...@@ -554,12 +550,12 @@
<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="3367000" /> <workItem from="1567098016695" duration="3489000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="59116000" /> <option name="totallyTimeSpent" value="59238000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="14" y="23" width="1440" height="817" extended-state="0" /> <frame x="14" y="23" width="1440" height="817" extended-state="0" />
...@@ -845,8 +841,8 @@ ...@@ -845,8 +841,8 @@
</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="404"> <state relative-caret-position="290">
<caret line="635" column="18" lean-forward="true" selection-start-line="635" selection-start-column="18" selection-end-line="635" selection-end-column="18" /> <caret line="628" column="4" lean-forward="false" selection-start-line="628" selection-start-column="4" selection-end-line="628" selection-end-column="4" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Public/static/css/main.css
...@@ -817,9 +817,9 @@ ul, li { ...@@ -817,9 +817,9 @@ ul, li {
display: inline-block; display: inline-block;
left: 289px; left: 289px;
top: 6708px; top: 6708px;
background: url("../images/20.png") left top; background: url("../images/33.png") left top;
width: 520px; width: 285px;
height: 419px; height: 399px;
-webkit-animation: down 1s 1 linear; -webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
...@@ -841,9 +841,9 @@ ul, li { ...@@ -841,9 +841,9 @@ ul, li {
display: inline-block; display: inline-block;
left: 68px; left: 68px;
top: 6946px; top: 6946px;
background: url("../images/32.png") left top; background: url("../images/34.png") left top;
width: 234px; width: 197px;
height: 186px; height: 167px;
-webkit-animation: left 1s 1 linear; -webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
......
Public/static/css/main.scss
...@@ -621,11 +621,12 @@ ul, li { ...@@ -621,11 +621,12 @@ ul, li {
} }
.map-20 { .map-20 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/20.png", 289px, 6708px); @include image_bounds_by_pos("../images/33.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 { .map-33 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/32.png", 68px, 6691px); @include image_bounds_by_pos("../images/32.png", 68px, 6691px);
-webkit-animation: left 1s 1 linear; -webkit-animation: left 1s 1 linear;
...@@ -633,7 +634,7 @@ ul, li { ...@@ -633,7 +634,7 @@ ul, li {
} }
.map-34 { .map-34 {
opacity: 0; opacity: 0;
@include image_bounds_by_pos("../images/32.png", 68px, 6946px); @include image_bounds_by_pos("../images/34.png", 68px, 6946px);
-webkit-animation: left 1s 1 linear; -webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards animation-fill-mode: forwards
} }
......
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