Skip to content

php / dencare-game

Go to a project
Commit 4bb229b3 by zhangheng
Options

1

parent f9fdc4b7
Showing with 33 additions and 27 deletions
.idea/workspace.xml
...@@ -2,9 +2,11 @@ ...@@ -2,9 +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$/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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <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> </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" />
...@@ -83,8 +85,8 @@ ...@@ -83,8 +85,8 @@
<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="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="418"> <state relative-caret-position="152">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" /> <caret line="44" column="43" lean-forward="false" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
<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>
...@@ -119,8 +121,8 @@ ...@@ -119,8 +121,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="304"> <state relative-caret-position="361">
<caret line="347" column="26" lean-forward="true" selection-start-line="347" selection-start-column="26" selection-end-line="347" selection-end-column="26" /> <caret line="862" column="9" lean-forward="false" selection-start-line="862" selection-start-column="9" selection-end-line="862" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -132,7 +134,6 @@ ...@@ -132,7 +134,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>imageObj2</find>
<find>addAnchor</find> <find>addAnchor</find>
<find>#container</find> <find>#container</find>
<find>,stage</find> <find>,stage</find>
...@@ -162,6 +163,7 @@ ...@@ -162,6 +163,7 @@
<find>page-s-</find> <find>page-s-</find>
<find>b-j-two</find> <find>b-j-two</find>
<find>photo_lock</find> <find>photo_lock</find>
<find>dialog_rule</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -180,8 +182,8 @@ ...@@ -180,8 +182,8 @@
<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$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list> </list>
</option> </option>
...@@ -543,12 +545,12 @@ ...@@ -543,12 +545,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="5855000" /> <workItem from="1567181764126" duration="6132000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68037000" /> <option name="totallyTimeSpent" value="68314000" />
</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" />
...@@ -917,26 +919,26 @@ ...@@ -917,26 +919,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <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="304"> <state relative-caret-position="409">
<caret line="347" column="26" lean-forward="true" selection-start-line="347" selection-start-column="26" selection-end-line="347" selection-end-column="26" /> <caret line="435" column="47" lean-forward="true" selection-start-line="435" selection-start-column="47" selection-end-line="435" selection-end-column="47" />
<folding /> <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="409"> <state relative-caret-position="361">
<caret line="435" column="47" lean-forward="true" selection-start-line="435" selection-start-column="47" selection-end-line="435" selection-end-column="47" /> <caret line="862" column="9" lean-forward="false" selection-start-line="862" selection-start-column="9" selection-end-line="862" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<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="418"> <state relative-caret-position="152">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" /> <caret line="44" column="43" lean-forward="false" selection-start-line="44" selection-start-column="43" selection-end-line="44" selection-end-column="43" />
<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>
......
Application/Home/View/default/Index_index.tpl
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</script> </script>
<title>冷热酸甜八十年</title> <title>冷热酸甜八十年</title>
<link href="__CDN__/css/swiper.min.css" rel="stylesheet"> <link href="__CDN__/css/swiper.min.css" rel="stylesheet">
<link href="__CDN__/css/main.css?t=2" rel="stylesheet"> <link href="__CDN__/css/main.css?t=3" rel="stylesheet">
<style> <style>
#container.transform { #container.transform {
......
Public/static/css/main.css
...@@ -1104,19 +1104,20 @@ ul, li { ...@@ -1104,19 +1104,20 @@ ul, li {
width: 640px; width: 640px;
} }
.dialog_rule .bj, .dialog_game_rule .bj { .dialog_rule .bj, .dialog_game_rule .bj {
display: flex; position: relative;
justify-content: center;
align-items: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.dialog_rule .bj .map, .dialog_game_rule .bj .map { .dialog_rule .bj .map, .dialog_game_rule .bj .map {
position: absolute;
top: 200px;
left: 99px;
width: 461px; width: 461px;
height: 642px; height: 642px;
} }
.dialog_rule .bj .btn-close, .dialog_rule .bj .btn-close-two, .dialog_game_rule .bj .btn-close, .dialog_game_rule .bj .btn-close-two { .dialog_rule .bj .btn-close, .dialog_rule .bj .btn-close-two, .dialog_game_rule .bj .btn-close, .dialog_game_rule .bj .btn-close-two {
position: absolute; position: absolute;
top: 320px; top: 222px;
left: 472px; left: 472px;
width: 70px; width: 70px;
height: 70px; height: 70px;
......
Public/static/css/main.scss
...@@ -846,20 +846,23 @@ ul, li { ...@@ -846,20 +846,23 @@ ul, li {
background: rgba(0, 0, 0, 0.7); background: rgba(0, 0, 0, 0.7);
width: 640px; width: 640px;
.bj { .bj {
display: flex; position: relative;
justify-content: center; //display: flex;
align-items: center; //justify-content: center;
//align-items: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
.map { .map {
position: absolute;
top: 200px;
left: 99px;
width: 461px; width: 461px;
height: 642px; height: 642px;
} }
.btn-close, .btn-close-two { .btn-close, .btn-close-two {
position: absolute; position: absolute;
top: 320px; top: 222px;
left: 472px; left: 472px;
width: 70px; width: 70px;
height: 70px; height: 70px;
......
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