Skip to content

php / dencare-game

Go to a project
Commit a1458112 by zhangheng
Options

y

parent 267f67f3
Showing with 80 additions and 57 deletions
.idea/workspace.xml
......@@ -2,27 +2,26 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/map-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/map-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/map-word1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/hammer.min.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/10.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/11.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/12.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/13.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/14.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/15.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/5.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/6.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/7.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/8.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/mix/9.png" afterPath="" />
<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$/Application/Common/Conf/config.php" afterPath="$PROJECT_DIR$/Application/Common/Conf/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Common/Conf/db.php" afterPath="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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$/Application/User/Controller/BaseUserController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/BaseUserController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/HomeController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/HomeController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" afterPath="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" afterPath="$PROJECT_DIR$/Application/User/View/default/Report_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$/index.html" afterPath="$PROJECT_DIR$/index.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -43,7 +42,7 @@
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="48" column="12" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<caret line="48" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<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" />
......@@ -101,8 +100,8 @@
<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="171">
<caret line="62" column="23" lean-forward="false" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
<state relative-caret-position="205">
<caret line="286" column="31" lean-forward="false" selection-start-line="286" selection-start-column="31" selection-end-line="286" selection-end-column="31" />
<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" />
......@@ -164,7 +163,7 @@
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-513">
<caret line="12" column="51" lean-forward="true" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
......@@ -190,8 +189,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="602">
<caret line="993" column="1" lean-forward="false" selection-start-line="993" selection-start-column="1" selection-end-line="993" selection-end-column="1" />
<state relative-caret-position="42">
<caret line="954" column="0" lean-forward="false" selection-start-line="954" selection-start-column="0" selection-end-line="954" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -234,8 +233,8 @@
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -247,10 +246,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="73" />
<option name="y" value="23" />
<option name="x" value="-43" />
<option name="y" value="39" />
<option name="width" value="1440" />
<option name="height" value="815" />
<option name="height" value="817" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
......@@ -515,15 +514,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="41540000" />
<workItem from="1566667516612" duration="41866000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41540000" />
<option name="totallyTimeSpent" value="41866000" />
</component>
<component name="ToolWindowManager">
<frame x="73" y="23" width="1440" height="815" extended-state="0" />
<frame x="-43" y="39" width="1440" height="817" extended-state="0" />
<editor active="true" />
<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.12875536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
......@@ -534,7 +533,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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24757953" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3305671" 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="true" show_stripe_button="true" weight="0.32965517" 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="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" />
......@@ -604,7 +603,7 @@
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="48" column="12" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<caret line="48" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<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" />
......@@ -658,26 +657,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="602">
<caret line="993" column="1" lean-forward="false" selection-start-line="993" selection-start-column="1" selection-end-line="993" selection-end-column="1" />
<state relative-caret-position="-513">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-513">
<caret line="12" column="51" lean-forward="true" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<state relative-caret-position="42">
<caret line="954" column="0" lean-forward="false" selection-start-line="954" selection-start-column="0" selection-end-line="954" selection-end-column="0" />
<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="171">
<caret line="62" column="23" lean-forward="false" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
<state relative-caret-position="205">
<caret line="286" column="31" lean-forward="false" selection-start-line="286" selection-start-column="31" selection-end-line="286" selection-end-column="31" />
<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" />
......
Application/Home/View/default/Index_index.tpl
......@@ -130,21 +130,21 @@
<div class="b-j" id="b-j">
</div>
<div class="w-p x-z x-z-sate">
<img class="btn-x-map" data-id="1" src="__CDN__/images/mix/1.png">
<img class="btn-x-map" data-id="2" src="__CDN__/images/mix/2.png">
<img class="btn-x-map" data-id="3" src="__CDN__/images/mix/3.png">
<img class="btn-x-map" data-id="4" src="__CDN__/images/mix/4.png">
<img class="btn-x-map" data-id="5" src="__CDN__/images/mix/5.png">
<img class="btn-x-map" data-id="6" src="__CDN__/images/mix/6.png">
<img class="btn-x-map" data-id="7" src="__CDN__/images/mix/7.png">
<img class="btn-x-map" data-id="8" src="__CDN__/images/mix/8.png">
<img class="btn-x-map" data-id="9" src="__CDN__/images/mix/9.png">
<img class="btn-x-map" data-id="10" src="__CDN__/images/mix/10.png">
<img class="btn-x-map" data-id="11" src="__CDN__/images/mix/11.png">
<img class="btn-x-map" data-id="12" src="__CDN__/images/mix/12.png">
<img class="btn-x-map" data-id="13" src="__CDN__/images/mix/13.png">
<img class="btn-x-map" data-id="14" src="__CDN__/images/mix/14.png">
<img class="btn-x-map" data-id="15" src="__CDN__/images/mix/15.png">
<img class="btn-x-map" data-id="1" src="__CDN__/images/m-1.png">
<img class="btn-x-map" data-id="2" src="__CDN__/images/m-2.png">
<img class="btn-x-map" data-id="3" src="__CDN__/images/m-3.png">
<img class="btn-x-map" data-id="4" src="__CDN__/images/m-4.png">
<img class="btn-x-map" data-id="5" src="__CDN__/images/m-5.png">
<img class="btn-x-map" data-id="6" src="__CDN__/images/m-6.png">
<img class="btn-x-map" data-id="7" src="__CDN__/images/m-7.png">
<img class="btn-x-map" data-id="8" src="__CDN__/images/m-8.png">
<img class="btn-x-map" data-id="9" src="__CDN__/images/m-9.png">
<img class="btn-x-map" data-id="10" src="__CDN__/images/m-10.png">
<img class="btn-x-map" data-id="11" src="__CDN__/images/m-11.png">
<img class="btn-x-map" data-id="12" src="__CDN__/images/m-12.png">
<img class="btn-x-map" data-id="13" src="__CDN__/images/m-13.png">
<img class="btn-x-map" data-id="14" src="__CDN__/images/m-14.png">
<img class="btn-x-map" data-id="15" src="__CDN__/images/m-15.png">
</div>
<div class="b-t x-z btn-map" style="display: none">
<img class="btn-x-map" data-id="17" src="__CDN__/images/17.png">
......@@ -284,7 +284,7 @@
loading_resource(function () {
loading.remove();
$('.page-game').show();
$('.page_home').show();
});
} );
......
Public/static/css/main.css
......@@ -1160,7 +1160,7 @@ ul, li {
position: absolute;
top: 443px;
left: 257px;
-webkit-animation: down 3s linear 0s infinite;
-webkit-animation: down_two 3s linear 0s infinite;
-webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
}
......@@ -1198,3 +1198,14 @@ ul, li {
opacity: 1;
}
}
@-webkit-keyframes down_two {
0% {
-webkit-transform: translate3d(0, -10px, 0);
}
50% {
-webkit-transform: translate3d(0, 10px, 0);
}
100% {
-webkit-transform: translate3d(0, -10px, 0);
}
}
Public/static/css/main.scss
......@@ -954,7 +954,7 @@ ul, li {
top: 443px;
left: 257px;
-webkit-animation: down 3s linear 0s infinite;
-webkit-animation: down_two 3s linear 0s infinite;
@include animate_forwards;
}
.loading {
......@@ -992,3 +992,16 @@ ul, li {
opacity: 1
}
}
@-webkit-keyframes down_two {
0% {
-webkit-transform: translate3d(0, -10px, 0)
}
50% {
-webkit-transform: translate3d(0, 10px, 0)
}
100% {
-webkit-transform: translate3d(0, -10px, 0)
}
}
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