Commit 492e8e63 by zhangheng

y

parent 1a9106c4
...@@ -2,8 +2,28 @@ ...@@ -2,8 +2,28 @@
<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$/Public/static/images/1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/10.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/11.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/12.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/13.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/14.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/15.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/17.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/18.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/19.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/20.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/5.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/6.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/7.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/8.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/9.png" afterPath="" />
<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" />
</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" />
...@@ -79,11 +99,11 @@ ...@@ -79,11 +99,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<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="false">
<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="129"> <state relative-caret-position="300">
<caret line="221" column="6" lean-forward="true" selection-start-line="221" selection-start-column="6" selection-end-line="221" selection-end-column="6" /> <caret line="152" column="71" lean-forward="false" selection-start-line="152" selection-start-column="71" selection-end-line="152" selection-end-column="71" />
<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" />
...@@ -151,15 +171,12 @@ ...@@ -151,15 +171,12 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <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="504"> <state relative-caret-position="124">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> <caret line="192" column="39" lean-forward="true" selection-start-line="192" selection-start-column="39" selection-end-line="192" selection-end-column="39" />
<folding> <folding />
<marker date="1566835060000" expanded="true" signature="6916:7831" ph="{...}" />
<marker date="1566835060000" expanded="true" signature="7198:7829" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -203,7 +220,11 @@ ...@@ -203,7 +220,11 @@
<find>btn-close</find> <find>btn-close</find>
<find>page-lang</find> <find>page-lang</find>
<find>btn-next-map</find> <find>btn-next-map</find>
<find>mix/</find>
</findStrings> </findStrings>
<replaceStrings>
<replace>m-</replace>
</replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -212,11 +233,11 @@ ...@@ -212,11 +233,11 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<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/index.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$/index.html" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <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" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -496,12 +517,12 @@ ...@@ -496,12 +517,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="41973000" /> <workItem from="1566667516612" duration="42107000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41973000" /> <option name="totallyTimeSpent" value="42107000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-43" y="39" width="1440" height="817" extended-state="0" /> <frame x="-43" y="39" width="1440" height="817" extended-state="0" />
...@@ -571,17 +592,6 @@ ...@@ -571,17 +592,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="504">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding>
<marker date="1566835060000" expanded="true" signature="6916:7831" ph="{...}" />
<marker date="1566835060000" expanded="true" signature="7198:7829" ph="{...}" />
</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="247"> <state relative-caret-position="247">
...@@ -657,8 +667,8 @@ ...@@ -657,8 +667,8 @@
</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="129"> <state relative-caret-position="300">
<caret line="221" column="6" lean-forward="true" selection-start-line="221" selection-start-column="6" selection-end-line="221" selection-end-column="6" /> <caret line="152" column="71" lean-forward="false" selection-start-line="152" selection-start-column="71" selection-end-line="152" selection-end-column="71" />
<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" />
...@@ -715,5 +725,13 @@ ...@@ -715,5 +725,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="192" column="39" lean-forward="true" selection-start-line="192" selection-start-column="39" selection-end-line="192" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
<img class="btn-x-map" data-id="15" src="__CDN__/images/m-15.png"> <img class="btn-x-map" data-id="15" src="__CDN__/images/m-15.png">
</div> </div>
<div class="b-t x-z btn-map" style="display: none"> <div class="b-t x-z btn-map" style="display: none">
<img class="btn-x-map" data-id="17" src="__CDN__/images/17.png"> <img class="btn-x-map" data-id="17" src="__CDN__/images/b-17.png">
<img class="btn-x-map" data-id="18" src="__CDN__/images/18.png"> <img class="btn-x-map" data-id="18" src="__CDN__/images/b-18.png">
<img class="btn-x-map" data-id="19" src="__CDN__/images/19.png"> <img class="btn-x-map" data-id="19" src="__CDN__/images/b-19.png">
<img class="btn-x-map" data-id="20" src="__CDN__/images/20.png"> <img class="btn-x-map" data-id="20" src="__CDN__/images/b-20.png">
</div> </div>
<div class="b-y x-z x-z-sate"> <div class="b-y x-z x-z-sate">
......
...@@ -189,7 +189,7 @@ $(document).ready(function () { ...@@ -189,7 +189,7 @@ $(document).ready(function () {
$('.btn-x-map').on('click', function () { $('.btn-x-map').on('click', function () {
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
var imageObj1 = new Image(); var imageObj1 = new Image();
imageObj1.src = 'Public/static/images/' + id + '.png'; imageObj1.src = 'Public/static/images/b-' + id + '.png';
imageObj1.onload = function() { imageObj1.onload = function() {
var darthVaderGroup = new Konva.Group({ var darthVaderGroup = new Konva.Group({
x: 100, x: 100,
......
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