Skip to content

php / dencare-game

Go to a project
Commit 88864aeb by zhangheng
Options

y

parent 88b4b672
Showing with 25 additions and 21 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<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$/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" />
......@@ -17,7 +17,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.124423966">
<splitter split-orientation="horizontal" split-proportion="0.50506914">
<split-first>
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -164,9 +164,11 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="382" column="12" lean-forward="false" selection-start-line="382" selection-start-column="12" selection-end-line="382" selection-end-column="12" />
<folding />
<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>
<marker date="1566923379000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -231,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>
......@@ -586,12 +588,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="47592000" />
<workItem from="1566667516612" duration="47730000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47592000" />
<option name="totallyTimeSpent" value="47730000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -823,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="352">
<caret line="382" column="12" lean-forward="false" selection-start-line="382" selection-start-column="12" selection-end-line="382" selection-end-column="12" />
<state relative-caret-position="382">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" />
<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="382">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" />
<folding />
<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>
<marker date="1566923379000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......
Public/static/js/index.js
......@@ -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();
......@@ -363,9 +363,9 @@ function mergeImage_two(url) {
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
// cover_three.onload = function () {
cover_three.onload = function () {
cover_four.onload = function () {
// cover_four.onload = function () {
// alert(22221)
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
......
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