Commit f7658cb6 authored by limingzhe's avatar limingzhe

refactor: 数据重构 添加动画

parent c7cbbf90
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
</div> </div>
<div style="padding: 10px"> <!--<div style="padding: 10px">-->
<button style="width: 230px; height: 240px; padding: 5px;" nz-button nzType="dashed" (click)="addPic()"> <!--<button style="width: 230px; height: 240px; padding: 5px;" nz-button nzType="dashed" (click)="addPic()">-->
<i nz-icon nzType="plus-circle" nzTheme="outline"></i>添加底部item <!--<i nz-icon nzType="plus-circle" nzTheme="outline"></i>添加底部item-->
</button> <!--</button>-->
</div> <!--</div>-->
</div> </div>
......
...@@ -2,22 +2,23 @@ ...@@ -2,22 +2,23 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4f018623-fe95-45cc-8699-7e10829c1e4d" name="Default Changelist" comment=""> <list default="true" id="4f018623-fe95-45cc-8699-7e10829c1e4d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../form/src/app/form/form.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../form/src/app/form/form.component.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../form/src/app/form/form.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../form/src/app/form/form.component.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/assets/mz_004/script/scene.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/assets/mz_004/script/scene.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/web-desktop/assets/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/web-desktop/assets/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js" beforeDir="false" afterPath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js" beforeDir="false" afterPath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js.map" afterDir="false" /> <change beforePath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/library/imports/33/335fe6b8-2b52-45a9-a9c9-cb3b54014251.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/library/uuid-to-mtime.json" beforeDir="false" afterPath="$PROJECT_DIR$/library/uuid-to-mtime.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/library/uuid-to-mtime.json" beforeDir="false" afterPath="$PROJECT_DIR$/library/uuid-to-mtime.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local/layout.editor.json" beforeDir="false" afterPath="$PROJECT_DIR$/local/layout.editor.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local/node-tree-state.json" beforeDir="false" afterPath="$PROJECT_DIR$/local/node-tree-state.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/local/node-tree-state.json" beforeDir="false" afterPath="$PROJECT_DIR$/local/node-tree-state.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package/form/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/package/form/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package/form/main-es2015.39b46e01e806d77753b4.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/package/form/main-es5.39b46e01e806d77753b4.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/package/play/assets/main/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/package/play/assets/main/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/__file_stats__.json" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/__file_stats__.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/__file_stats__.json" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/__file_stats__.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/__qc_bundle__.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/__qc_bundle__.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/__qc_bundle__.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/__qc_bundle__.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/__quick_compile__.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/__quick_compile__.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/assets/mz_004/script/scene.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/temp/quick-scripts/dst/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/dst/assets/mz_004/script/scene.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_001/prefab/bgBottom.js.map" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_001/script/scene.js.map" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_001/script/util.js.map" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/temp/quick-scripts/src/assets/mz_004/script/scene.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/temp/startup.json" beforeDir="false" afterPath="$PROJECT_DIR$/temp/startup.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/temp/startup.json" beforeDir="false" afterPath="$PROJECT_DIR$/temp/startup.json" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -34,11 +35,11 @@ ...@@ -34,11 +35,11 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/assets/mz_004/script/scene.js"> <entry file="file://$PROJECT_DIR$/assets/mz_004/script/scene.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="2545">
<caret line="619" column="38" selection-start-line="619" selection-start-column="38" selection-end-line="619" selection-end-column="38" /> <caret line="352" selection-start-line="352" selection-end-line="352" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<marker date="1597806631630" expanded="true" signature="19044:19324" ph="..." /> <marker date="1597828291372" expanded="true" signature="19052:19332" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -76,6 +77,7 @@ ...@@ -76,6 +77,7 @@
<find>initListener</find> <find>initListener</find>
<find>setonecircle</find> <find>setonecircle</find>
<find>preload</find> <find>preload</find>
<find>setitem</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -100,7 +102,6 @@ ...@@ -100,7 +102,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -130,6 +131,7 @@ ...@@ -130,6 +131,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -162,18 +164,26 @@ ...@@ -162,18 +164,26 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1597301668885</updated> <updated>1597301668885</updated>
<workItem from="1597301670251" duration="4944000" /> <workItem from="1597301670251" duration="4944000" />
<workItem from="1597805746190" duration="750000" /> <workItem from="1597805746190" duration="893000" />
<workItem from="1597828268280" duration="134000" />
</task> </task>
<task id="LOCAL-00001" summary="refactor: 数据重构 添加动画">
<created>1597806702353</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1597806702353</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5694000" /> <option name="totallyTimeSpent" value="5971000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" /> <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16274865" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16274865" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -185,8 +195,9 @@ ...@@ -185,8 +195,9 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32959184" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32959184" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="TypeScript" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
...@@ -195,6 +206,10 @@ ...@@ -195,6 +206,10 @@
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="refactor: 数据重构 添加动画" />
<option name="LAST_COMMIT_MESSAGE" value="refactor: 数据重构 添加动画" />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../../cc_mz_003/play/assets/mz_003/script/util.js"> <entry file="file://$PROJECT_DIR$/../../cc_mz_003/play/assets/mz_003/script/util.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -205,11 +220,11 @@ ...@@ -205,11 +220,11 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/assets/mz_004/script/scene.js"> <entry file="file://$PROJECT_DIR$/assets/mz_004/script/scene.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="2545">
<caret line="619" column="38" selection-start-line="619" selection-start-column="38" selection-end-line="619" selection-end-column="38" /> <caret line="352" selection-start-line="352" selection-end-line="352" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
<marker date="1597806631630" expanded="true" signature="19044:19324" ph="..." /> <marker date="1597828291372" expanded="true" signature="19052:19332" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -347,7 +347,7 @@ cc.Class({ ...@@ -347,7 +347,7 @@ cc.Class({
const bgBottom = cc.find('Canvas/bgBottom'); const bgBottom = cc.find('Canvas/bgBottom');
const script = bgBottom.getComponent('bgBottom'); const script = bgBottom.getComponent('bgBottom');
script.setItemData(this.data.picArr); script.setItemData(this.data.hotZoneItemArr);
}, },
......
This diff is collapsed.
...@@ -303,7 +303,7 @@ cc.Class({ ...@@ -303,7 +303,7 @@ cc.Class({
initBottomPart: function initBottomPart() { initBottomPart: function initBottomPart() {
var bgBottom = cc.find('Canvas/bgBottom'); var bgBottom = cc.find('Canvas/bgBottom');
var script = bgBottom.getComponent('bgBottom'); var script = bgBottom.getComponent('bgBottom');
script.setItemData(this.data.picArr); script.setItemData(this.data.hotZoneItemArr);
}, },
setOneAnima: function setOneAnima(data) { setOneAnima: function setOneAnima(data) {
var rate = this.hotZoneBg.scale * this.hotZoneBg.width / this.data.bgItem.rect.width; var rate = this.hotZoneBg.scale * this.hotZoneBg.width / this.data.bgItem.rect.width;
......
...@@ -515,13 +515,13 @@ ...@@ -515,13 +515,13 @@
"relativePath": "mz_004/scene" "relativePath": "mz_004/scene"
}, },
"c3f18614-c716-4f1f-899f-09f073ac6c43": { "c3f18614-c716-4f1f-899f-09f073ac6c43": {
"asset": 1597806633698, "asset": 1597828296492,
"meta": 1597806633704, "meta": 1597828296499,
"relativePath": "mz_004/scene/scene.fire" "relativePath": "mz_004/scene/scene.fire"
}, },
"b5c6439b-d99b-428f-9454-22f767de4a02": { "b5c6439b-d99b-428f-9454-22f767de4a02": {
"asset": 1597805756853, "asset": 1597806631631,
"meta": 1597805785238, "meta": 1597828006876,
"relativePath": "mz_004/script" "relativePath": "mz_004/script"
}, },
"3531d7ec-7dc9-49bd-be94-92677dc9b7c0": { "3531d7ec-7dc9-49bd-be94-92677dc9b7c0": {
...@@ -595,8 +595,8 @@ ...@@ -595,8 +595,8 @@
"relativePath": "mz_004/script/util.js" "relativePath": "mz_004/script/util.js"
}, },
"335fe6b8-2b52-45a9-a9c9-cb3b54014251": { "335fe6b8-2b52-45a9-a9c9-cb3b54014251": {
"asset": 1597806631630, "asset": 1597828291372,
"meta": 1597806633653, "meta": 1597828295079,
"relativePath": "mz_004/script/scene.js" "relativePath": "mz_004/script/scene.js"
} }
} }
\ No newline at end of file
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
"3bOMn6N4hJP5WlpEgN1tyP", "3bOMn6N4hJP5WlpEgN1tyP",
"2daSEONptJQLYU9aq8TOd+", "2daSEONptJQLYU9aq8TOd+",
"01Xreos21IrrsAvhvN44JE", "01Xreos21IrrsAvhvN44JE",
"63bpvtVEZAqr5FQ8AQOVa5" "63bpvtVEZAqr5FQ8AQOVa5",
"3fjtSSnnNNBb9Db9xNkttL"
] ]
} }
...@@ -11,5 +11,5 @@ ...@@ -11,5 +11,5 @@
<link rel="stylesheet" href="styles.3c766d33276466d8796e.css"></head> <link rel="stylesheet" href="styles.3c766d33276466d8796e.css"></head>
<body> <body>
<app-root></app-root> <app-root></app-root>
<script src="runtime-es2015.0dae8cbc97194c7caed4.js" type="module"></script><script src="runtime-es5.0dae8cbc97194c7caed4.js" nomodule defer></script><script src="polyfills-es5.67652d47edafc7fe83ff.js" nomodule defer></script><script src="polyfills-es2015.09ee2f719bd21ab5c7b1.js" type="module"></script><script src="main-es2015.39b46e01e806d77753b4.js" type="module"></script><script src="main-es5.39b46e01e806d77753b4.js" nomodule defer></script></body> <script src="runtime-es2015.0dae8cbc97194c7caed4.js" type="module"></script><script src="runtime-es5.0dae8cbc97194c7caed4.js" nomodule defer></script><script src="polyfills-es5.67652d47edafc7fe83ff.js" nomodule defer></script><script src="polyfills-es2015.09ee2f719bd21ab5c7b1.js" type="module"></script><script src="main-es2015.a31e428f5b6912874cf6.js" type="module"></script><script src="main-es5.a31e428f5b6912874cf6.js" nomodule defer></script></body>
</html> </html>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2020-08-19T02:56:25.712Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/prefab/bgBottom.js":"2020-08-19T02:56:25.696Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/scene.js":"2020-08-19T02:56:25.693Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/util.js":"2020-08-19T02:56:25.694Z"}} {"version":"1.0.8","stats":{"/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/__qc_index__.js":"2020-08-19T09:10:54.698Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/prefab/bgBottom.js":"2020-08-19T09:10:54.682Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/scene.js":"2020-08-19T09:10:54.679Z","/Users/lmz/Documents/workspace/git_project/cocos/cc_mz_004/play/temp/quick-scripts/src/assets/mz_004/script/util.js":"2020-08-19T09:10:54.681Z"}}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -303,7 +303,7 @@ cc.Class({ ...@@ -303,7 +303,7 @@ cc.Class({
initBottomPart: function initBottomPart() { initBottomPart: function initBottomPart() {
var bgBottom = cc.find('Canvas/bgBottom'); var bgBottom = cc.find('Canvas/bgBottom');
var script = bgBottom.getComponent('bgBottom'); var script = bgBottom.getComponent('bgBottom');
script.setItemData(this.data.picArr); script.setItemData(this.data.hotZoneItemArr);
}, },
setOneAnima: function setOneAnima(data) { setOneAnima: function setOneAnima(data) {
var rate = this.hotZoneBg.scale * this.hotZoneBg.width / this.data.bgItem.rect.width; var rate = this.hotZoneBg.scale * this.hotZoneBg.width / this.data.bgItem.rect.width;
......
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 to comment