Skip to content

php / dencare-game

Go to a project
Commit 65290215 by zhangheng
Options

y

parent d399dc4b
Showing with 18 additions and 17 deletions
.idea/workspace.xml
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<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$/.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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <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" />
...@@ -165,8 +164,8 @@ ...@@ -165,8 +164,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <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="219"> <state relative-caret-position="200">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" /> <caret line="234" column="27" lean-forward="false" selection-start-line="234" selection-start-column="27" selection-end-line="234" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -179,8 +178,8 @@ ...@@ -179,8 +178,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="247">
<caret line="812" column="18" lean-forward="true" selection-start-line="812" selection-start-column="18" selection-end-line="812" selection-end-column="18" /> <caret line="809" column="11" lean-forward="false" selection-start-line="809" selection-start-column="11" selection-end-line="809" selection-end-column="11" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -215,6 +214,7 @@ ...@@ -215,6 +214,7 @@
<find>mergeImage_two</find> <find>mergeImage_two</find>
<find>mix/</find> <find>mix/</find>
<find>hasc</find> <find>hasc</find>
<find>map-29</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -589,12 +589,12 @@ ...@@ -589,12 +589,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="51626000" /> <workItem from="1566667516612" duration="51758000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="51626000" /> <option name="totallyTimeSpent" value="51758000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="69" y="69" width="1440" height="817" extended-state="0" /> <frame x="69" y="69" width="1440" height="817" extended-state="0" />
...@@ -709,14 +709,6 @@ ...@@ -709,14 +709,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="812" column="18" lean-forward="true" selection-start-line="812" selection-start-column="18" selection-end-line="812" selection-end-column="18" />
<folding />
</state>
</provider>
</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="190"> <state relative-caret-position="190">
...@@ -834,10 +826,18 @@ ...@@ -834,10 +826,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="809" column="11" lean-forward="false" selection-start-line="809" selection-start-column="11" selection-end-line="809" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<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="219"> <state relative-caret-position="200">
<caret line="127" column="52" lean-forward="false" selection-start-line="127" selection-start-column="52" selection-end-line="127" selection-end-column="52" /> <caret line="234" column="27" lean-forward="false" selection-start-line="234" selection-start-column="27" selection-end-line="234" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Public/static/js/index.js
...@@ -232,6 +232,7 @@ $(document).ready(function () { ...@@ -232,6 +232,7 @@ $(document).ready(function () {
console.log(wScrollY) console.log(wScrollY)
}); });
$('.map-29').on('click',function () { $('.map-29').on('click',function () {
window.scroll(0,0);
$('.page-lang').hide(); $('.page-lang').hide();
$('.page-m-b').show(); $('.page-m-b').show();
if(!sideLock){ if(!sideLock){
......
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