Commit 8342458d by zhangheng

y

parent 1ad14f1a
...@@ -2,153 +2,6 @@ ...@@ -2,153 +2,6 @@
<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="DELETED" beforePath="$PROJECT_DIR$/Application/User/Controller/PhotoController.class.php" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Application/User/View/default/Photo_index.tpl" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/1.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/10.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/2.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/3.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/4.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/5.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/6.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/7.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/8.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/9.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/audio/bgm.mp3" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/css/.font-spider/font.TTf" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-1-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-10-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-12.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-15-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-16-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-17-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-18.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-19.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-2-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-21.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-22.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-23.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-3-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-5.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-6-line.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-7.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/1-9-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/a-x.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/astronaut.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/b-j-t.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/ball.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/box.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-close.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-close.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-h-b.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-rule.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/c-t.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/cat.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/d-g.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/d-s.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/f-l.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/g-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/g-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/g-3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/g-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/g-d.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-d.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-r.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/h-y.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/hand-two.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/home-1-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/home-ball-one.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/home-ball-two.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/home-game.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/home-woed.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/j-s.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/line-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/line-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/loding-bj.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/loding.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/m-b-g.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/music-close.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/music-open.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/no-prize.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/plant.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/play.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-bj.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-map.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-x-d.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize-x-q.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/qiao.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/r-z-q.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/rule.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-b.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-c.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-j-d.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-j.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-z-d-d.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/s-z.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/share-map.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/share.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/t-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/t-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/t-3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/t-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/updata.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/x-h.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/x-k-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/x-k.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/y-h-two.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/yes-prize-1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/yes-prize-2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/yes-prize-3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/yes-prize-4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/exif.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/fastclick.min.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/hammer.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/jquery.easing.1.3.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/js/lrz.mobile.min.js" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-1.png" afterPath="$PROJECT_DIR$/Public/static/images/2-1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-2.png" afterPath="$PROJECT_DIR$/Public/static/images/2-2.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-3.png" afterPath="$PROJECT_DIR$/Public/static/images/2-3.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-4.png" afterPath="$PROJECT_DIR$/Public/static/images/2-4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/arrow-left.png" afterPath="$PROJECT_DIR$/Public/static/images/arrow-left.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/arrow-right.png" afterPath="$PROJECT_DIR$/Public/static/images/arrow-right.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/arrow.png" afterPath="$PROJECT_DIR$/Public/static/images/arrow.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/bj.jpg" afterPath="$PROJECT_DIR$/Public/static/images/bj.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/btn-z-y-1.png" afterPath="$PROJECT_DIR$/Public/static/images/btn-z-y-1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/m-b-bj-1.jpg" afterPath="$PROJECT_DIR$/Public/static/images/m-b-bj-1.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/music.png" afterPath="$PROJECT_DIR$/Public/static/images/music.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/side-1-1.png" afterPath="$PROJECT_DIR$/Public/static/images/side-1-1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/side-2-2.png" afterPath="$PROJECT_DIR$/Public/static/images/side-2-2.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/side-3-3.png" afterPath="$PROJECT_DIR$/Public/static/images/side-3-3.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/side-4-4.png" afterPath="$PROJECT_DIR$/Public/static/images/side-4-4.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/x-k-map.jpg" afterPath="$PROJECT_DIR$/Public/static/images/x-k-map.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.project" afterPath="$PROJECT_DIR$/.project" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Common/Conf/config.php" afterPath="$PROJECT_DIR$/Application/Common/Conf/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Common/Conf/db.php" afterPath="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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/User/Controller/BaseUserController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/BaseUserController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/HomeController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/HomeController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" afterPath="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" afterPath="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" afterPath="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/font.html" afterPath="$PROJECT_DIR$/Public/static/css/font.html" />
<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/hammer.min.js" afterPath="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<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/jquery-notify.js" afterPath="$PROJECT_DIR$/Public/static/js/jquery-notify.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -166,11 +19,11 @@ ...@@ -166,11 +19,11 @@
<splitter split-orientation="horizontal" split-proportion="0.53055143"> <splitter split-orientation="horizontal" split-proportion="0.53055143">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461"> <state relative-caret-position="232">
<caret line="96" column="20" lean-forward="false" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="26" /> <caret line="97" column="49" lean-forward="false" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -202,6 +55,8 @@ ...@@ -202,6 +55,8 @@
<element signature="n#style#0;n#div#27;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#27;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#28;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#28;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#29;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#29;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#30;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#31;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -224,11 +79,11 @@ ...@@ -224,11 +79,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<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="423"> <state relative-caret-position="157">
<caret line="108" column="22" lean-forward="false" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" /> <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -261,8 +116,8 @@ ...@@ -261,8 +116,8 @@
<find>#container</find> <find>#container</find>
<find>,stage</find> <find>,stage</find>
<find>batchDraw</find> <find>batchDraw</find>
<find>type_id</find>
<find>page-lang</find> <find>page-lang</find>
<find>type_id</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -273,9 +128,9 @@ ...@@ -273,9 +128,9 @@
<list> <list>
<option value="$PROJECT_DIR$/Public/static/js/konva.min.js" /> <option value="$PROJECT_DIR$/Public/static/js/konva.min.js" />
<option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" /> <option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <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$/index.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -288,7 +143,7 @@ ...@@ -288,7 +143,7 @@
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="13" /> <option name="x" value="13" />
<option name="y" value="74" /> <option name="y" value="23" />
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="817" /> <option name="height" value="817" />
</component> </component>
...@@ -529,15 +384,15 @@ ...@@ -529,15 +384,15 @@
<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="30798000" /> <workItem from="1566667516612" duration="31010000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30798000" /> <option name="totallyTimeSpent" value="31010000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="13" y="74" width="1440" height="817" extended-state="0" /> <frame x="13" y="23" width="1440" height="817" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <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.040057223" 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.040057223" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -548,7 +403,7 @@ ...@@ -548,7 +403,7 @@
<window_info id="Version Control" 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="8" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" 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="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.44413793" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.44413793" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" 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="9" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32965517" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
...@@ -612,10 +467,26 @@ ...@@ -612,10 +467,26 @@
</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="471">
<caret line="636" column="15" lean-forward="false" selection-start-line="636" selection-start-column="15" selection-end-line="636" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461"> <state relative-caret-position="232">
<caret line="96" column="20" lean-forward="false" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="26" /> <caret line="97" column="49" lean-forward="false" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -647,6 +518,8 @@ ...@@ -647,6 +518,8 @@
<element signature="n#style#0;n#div#27;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#27;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#28;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#28;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#29;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#29;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#30;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#31;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -658,21 +531,5 @@ ...@@ -658,21 +531,5 @@
</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="471">
<caret line="636" column="15" lean-forward="false" selection-start-line="636" selection-start-column="15" selection-end-line="636" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="108" column="22" lean-forward="false" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
<div class="map-26" style="display: none"></div> <div class="map-26" style="display: none"></div>
<div class="map-27" style="display: none"></div> <div class="map-27" style="display: none"></div>
<div class="map-28"style="display: none"></div> <div class="map-28"style="display: none"></div>
<div class="map-29"></div> <div class="map-29" style="display: none"></div>
<div class="map-30"></div> <div class="map-30" style="display: none"></div>
</div> </div>
<div class="page-m-b" style="display: none"> <div class="page-m-b" style="display: none">
<div class="swiper-container"> <div class="swiper-container">
......
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