Commit 69c82035 by zhangheng

y

parent f1f73997
......@@ -2,10 +2,8 @@
<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$/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -167,8 +165,10 @@
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" />
<folding />
<caret line="102" column="4" lean-forward="false" selection-start-line="102" selection-start-column="4" selection-end-line="105" selection-end-column="15" />
<folding>
<marker date="1566923632000" expanded="true" signature="3323:3438" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -233,8 +233,8 @@
<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/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
</option>
</component>
......@@ -588,12 +588,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="47912000" />
<workItem from="1566667516612" duration="47946000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47912000" />
<option name="totallyTimeSpent" value="47946000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -825,19 +825,21 @@
</state>
</provider>
</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">
<state relative-caret-position="238">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" />
<state relative-caret-position="249">
<caret line="225" column="3" lean-forward="false" selection-start-line="225" selection-start-column="3" selection-end-line="225" selection-end-column="3" />
<folding />
</state>
</provider>
</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">
<state relative-caret-position="249">
<caret line="225" column="3" lean-forward="false" selection-start-line="225" selection-start-column="3" selection-end-line="225" selection-end-column="3" />
<folding />
<state relative-caret-position="238">
<caret line="102" column="4" lean-forward="false" selection-start-line="102" selection-start-column="4" selection-end-line="105" selection-end-column="15" />
<folding>
<marker date="1566923632000" expanded="true" signature="3323:3438" ph="//..." />
</folding>
</state>
</provider>
</entry>
......
......@@ -100,10 +100,10 @@ $(document).ready(function () {
$('.page_home').hide();
$('.dialog_game_rule').hide();
$('.page-through').show();
// setTimeout(function () {
// $('.page-through').hide();
// $('.page-lang').show();
// },5000)
setTimeout(function () {
$('.page-through').hide();
$('.page-lang').show();
},5000)
});
$('.btn-next-map').on('click',function () {
$('.dialog_game_rule').show();
......
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