Skip to content

php / dencare-game

Go to a project
Commit 49497ae0 by zhangheng
Options

1

parent 80368259
Showing with 57 additions and 34 deletions
.idea/workspace.xml
......@@ -2,7 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<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$/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -16,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.46146703">
<splitter split-orientation="horizontal" split-proportion="0.35795888">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -81,10 +85,12 @@
<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="209">
<caret line="271" column="37" lean-forward="false" selection-start-line="271" selection-start-column="37" selection-end-line="271" selection-end-column="37" />
<state relative-caret-position="152">
<caret line="267" column="3" lean-forward="false" selection-start-line="267" selection-start-column="3" selection-end-line="273" selection-end-column="7" />
<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="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -119,8 +125,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="95">
<caret line="361" column="0" lean-forward="true" selection-start-line="361" selection-start-column="0" selection-end-line="361" selection-end-column="9" />
<state relative-caret-position="306">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding />
</state>
</provider>
......@@ -543,18 +549,18 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="2429000" />
<workItem from="1567181764126" duration="2663000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64611000" />
<option name="totallyTimeSpent" value="64845000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
<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.22961374" 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.060801145" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
......@@ -670,6 +676,8 @@
<caret line="199" column="20" lean-forward="false" selection-start-line="199" selection-start-column="20" selection-end-line="199" selection-end-column="28" />
<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="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -763,6 +771,8 @@
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" />
<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="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -923,23 +933,25 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="361" column="0" lean-forward="true" selection-start-line="361" selection-start-column="0" selection-end-line="361" selection-end-column="9" />
<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="209">
<caret line="271" column="37" lean-forward="false" selection-start-line="271" selection-start-column="37" selection-end-line="271" selection-end-column="37" />
<state relative-caret-position="152">
<caret line="267" column="3" lean-forward="false" selection-start-line="267" selection-start-column="3" selection-end-line="273" selection-end-column="7" />
<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="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
......@@ -197,7 +197,7 @@
<div class="btn-f-h btn-sate"></div>
</div>
</div>
<div class="page-s-c" style="display: none">
<div class="page-sate page-s-c" style="display: none">
<div class="b-j-two">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
......@@ -265,13 +265,13 @@
<script type="text/javascript" src="__CDN__/js/jquery-2.1.3.min.js"></script>
<script>
if (!/android/i.test(navigator.userAgent)) {
var t = window.screen.height;
if (t == '812') {
$('.page-s-c').css('height', '1234px');
$('body').css('height', '1234px');
}
}
// if (!/android/i.test(navigator.userAgent)) {
// var t = window.screen.height;
// if (t == '812') {
// $('.page-s-c').css('height', '1234px');
// $('body').css('height', '1234px');
// }
// }
</script>
<script type="text/javascript" src="__CDN__/js/konva.min.js"></script>
<script type="text/javascript" src="__CDN__/js/swiper.min.js"></script>
......
Public/static/css/main.css
......@@ -76,25 +76,30 @@ html, body {
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 2) {
html, body {
.page-sate {
height: 1030px;
}
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 2) {
html, body {
.page-sate {
height: 1030px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
html, body {
.page-sate {
height: 1041px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
html, body {
.page-sate {
height: 1041px;
}
}
@media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1238px;
}
}
ul, li {
list-style: none;
margin: 0;
......
Public/static/css/main.scss
......@@ -112,28 +112,33 @@ html, body {
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 2) {
html, body {
.page-sate {
height: 1030px;
}
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 2) {
html, body {
.page-sate {
height: 1030px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
html, body {
.page-sate {
height: 1041px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
html, body {
.page-sate {
height: 1041px;
}
}
@media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1238px;
}
}
ul, li {
list-style: none;
......
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