Skip to content

B
babycare_xiaoxiao
Commit b80e54c7 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

首页树的动画修改

parent 71900eb4
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 56 deletions
.idea/workspace.xml
View file @ b80e54c7
......@@ -5,8 +5,10 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/mapGuide.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/mapGuide.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -198,14 +200,7 @@
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="13722000" />
<workItem from="1602553054726" duration="8321000" />
<workItem from="1602640287576" duration="5927000" />
</task>
<task id="LOCAL-00044" summary="换了点皮">
<created>1600841292605</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1600841292605</updated>
<workItem from="1602640287576" duration="7863000" />
</task>
<task id="LOCAL-00045" summary="换了点皮">
<created>1600860005659</created>
......@@ -543,7 +538,14 @@
<option name="project" value="LOCAL" />
<updated>1602665370290</updated>
</task>
<option name="localTasksCounter" value="93" />
<task id="LOCAL-00093" summary="礼盒loading引导">
<created>1602666865225</created>
<option name="number" value="00093" />
<option name="presentableId" value="LOCAL-00093" />
<option name="project" value="LOCAL" />
<updated>1602666865225</updated>
</task>
<option name="localTasksCounter" value="94" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -610,51 +612,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602665369563">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602666864286">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665369563" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602666864286" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602666123906">
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602667682190">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602605289405" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123906" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682190" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602666123905">
<state width="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602667682189">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123905" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682189" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602666123905">
<state width="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602667682188">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602605289403" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123905" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682188" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602666123906">
<state width="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602667682189">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123906" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602667682189" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -671,12 +673,12 @@
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602665371479">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602666866724">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665371479" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602666866724" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -709,11 +711,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602660364061">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602669760593">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602660364061" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602669760593" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ b80e54c7
......@@ -12741,7 +12741,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602665117/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602667722/resource/"
};
......@@ -23710,7 +23710,17 @@ var PlayScene = (function (_super) {
PlayScene.prototype.openRedBombPanel = function (callback) {
if (callback === void 0) { callback = null; }
if (this.redBombPanelMark) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.drawLotteryPrize, {
level: this.chapter,
prizeDataType: 1
}, function (success, res) {
if (success && res.data) {
ctrls_1.showPanel(FesRedPrizePanel_1.FesRedPrizePanel, { callback: callback });
}
else {
callback();
}
});
this.redBombPanelMark = false;
return true;
}
......@@ -23846,15 +23856,7 @@ var PlayScene = (function (_super) {
_this.festivalTarget.count--;
});
if (this.festivalTargetNum <= 0) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.drawLotteryPrize, {
level: this.chapter,
prizeDataType: 1
}, function (success, res) {
if (success && res.data) {
_this.redBombPanelMark = true;
_this.openRedBombPanel();
}
});
this.redBombPanelMark = true;
}
}
};
......@@ -24323,21 +24325,36 @@ var MapMid = (function (_super) {
for (var i = 0; i < 106; i++) {
treeTexture.push(RES_1.RES.getRes("map_tree_" + i + ".png"));
}
for (var i = 106; i < 246; i++) {
treeTexture.push(RES_1.RES.getRes("map_tree_" + 105 + ".png"));
}
var treeEffect1 = this.addChild(new FrameAni(treeTexture));
treeEffect1.frameRate = 20;
treeEffect1.position.set(735, 400);
treeEffect1.play(-1);
var treeEffect2 = this.addChild(new FrameAni(treeTexture));
treeEffect2.frameRate = 20;
treeEffect2.position.set(30, 765);
treeEffect2.scaleX = -1;
this.timeOutArr.push(setTimeout(function () {
treeEffect2.play(-1);
}, 1200));
var treeEffect3 = this.addChild(new FrameAni(treeTexture));
treeEffect3.frameRate = 20;
treeEffect3.position.set(30, 1590);
treeEffect3.scaleX = -1;
treeEffect3.play(-1);
this.timeOutArr.push(setTimeout(function () {
treeEffect3.play(-1);
}, 2000));
var treeEffect4 = this.addChild(new FrameAni(treeTexture));
treeEffect4.frameRate = 20;
treeEffect4.position.set(740, 1780);
treeEffect4.scaleX = -1;
treeEffect4.play(-1);
this.timeOutArr.push(setTimeout(function () {
treeEffect4.play(-1);
}, 2500));
this.addChild(Tools_1.Tools.getSprite('薯片店.png', -80, 1570));
var aromaTexture = [];
for (var i = 0; i < 86; i++) {
......@@ -24360,6 +24377,7 @@ var MapMid = (function (_super) {
};
MapMid.prototype.destroy = function () {
_super.prototype.destroy.call(this);
this.timeOutArr.forEach(function (v) { return clearTimeout(v); });
};
MapMid.HEIGHT = 2222;
MapMid.totalCount = 18;
......@@ -24753,23 +24771,20 @@ var MapTop = (function (_super) {
for (var i = 0; i < 106; i++) {
treeTexture.push(RES_1.RES.getRes("map_tree_" + i + ".png"));
}
for (var i = 106; i < 246; i++) {
treeTexture.push(RES_1.RES.getRes("map_tree_" + 105 + ".png"));
}
var treeEffect1 = this.addChild(new FrameAni(treeTexture));
treeEffect1.frameRate = 20;
treeEffect1.position.set(85, 913);
treeEffect1.scaleX = -1;
treeEffect1.play(-1);
var treeEffect2 = this.addChild(new FrameAni(treeTexture));
treeEffect2.position.set(729, 1068);
treeEffect2.frameRate = 20;
this.timeOutArr.push(setTimeout(function () {
treeEffect2.play(-1);
}, 1000));
var aromaTexture = [];
for (var i = 0; i < 106; i++) {
aromaTexture.push(RES_1.RES.getRes("Aroma_2_" + i + ".png"));
}
var aroma = this.addChild(new FrameAni(aromaTexture));
aroma.position.set(610, 910);
aroma.scaleX = -1;
aroma.play(-1);
var foot = this.addChild(Tools_1.Tools.getSprite('top_foot.png'));
foot.position.set(-24, 758);
var cloud = this.addChild(Tools_1.Tools.getSprite('cloud.png'));
output.js.map
View file @ b80e54c7
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/map/mapGuide.png
View replaced file @ 71900eb4 View file @ b80e54c7
resource/map/mapGuide.png

123 KB | W: | H:

resource/map/mapGuide.png

126 KB | W: | H:

resource/map/mapGuide.png
resource/map/mapGuide.png
resource/map/mapGuide.png
resource/map/mapGuide.png
  • 2-up
  • Swipe
  • Onion skin
src/ResJson.ts
View file @ b80e54c7
......@@ -10547,5 +10547,5 @@ export const ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602665117/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602667722/resource/"
}
\ No newline at end of file
src/scene/map/MapMid.ts
View file @ b80e54c7
......@@ -63,24 +63,47 @@ export default class MapMid extends MapPart {
for (let i = 0; i < 106; i++) {
treeTexture.push(RES.getRes(`map_tree_${i}.png`));
}
for (let i = 106; i < 246; i++) {
treeTexture.push(RES.getRes(`map_tree_${105}.png`));
}
const treeEffect1 = this.addChild(new FrameAni(treeTexture));
treeEffect1.frameRate = 20;
treeEffect1.position.set(735, 400);
treeEffect1.play(-1);
const treeEffect2 = this.addChild(new FrameAni(treeTexture));
treeEffect2.frameRate = 20;
treeEffect2.position.set(30, 765);
treeEffect2.scaleX = -1;
this.timeOutArr.push(
setTimeout(() => {
treeEffect2.play(-1);
}, 1200)
);
const treeEffect3 = this.addChild(new FrameAni(treeTexture));
treeEffect3.frameRate = 20;
treeEffect3.position.set(30, 1590);
treeEffect3.scaleX = -1;
treeEffect3.play(-1);
this.timeOutArr.push(
setTimeout(() => {
treeEffect3.play(-1);
}, 2000)
);
const treeEffect4 = this.addChild(new FrameAni(treeTexture));
treeEffect4.frameRate = 20;
treeEffect4.position.set(740, 1780);
treeEffect4.scaleX = -1;
treeEffect4.play(-1);
this.timeOutArr.push(
setTimeout(() => {
treeEffect4.play(-1);
}, 2500)
);
this.addChild(Tools.getSprite('薯片店.png',-80, 1570));
......@@ -109,6 +132,7 @@ export default class MapMid extends MapPart {
public destroy() {
super.destroy();
this.timeOutArr.forEach(v => clearTimeout(v));
}
}
src/scene/map/MapTop.ts
View file @ b80e54c7
......@@ -36,27 +36,34 @@ export default class MapTop extends MapPart {
for (let i = 0; i < 106; i++) {
treeTexture.push(RES.getRes(`map_tree_${i}.png`));
}
for (let i = 106; i < 246; i++) {
treeTexture.push(RES.getRes(`map_tree_${105}.png`));
}
const treeEffect1 = this.addChild(new FrameAni(treeTexture));
treeEffect1.frameRate = 20;
treeEffect1.position.set(85, 913);
treeEffect1.scaleX = -1;
treeEffect1.play(-1);
const treeEffect2 = this.addChild(new FrameAni(treeTexture));
treeEffect2.position.set(729, 1068);
treeEffect2.frameRate = 20;
this.timeOutArr.push(
setTimeout(() => {
treeEffect2.play(-1);
}, 1000)
);
const aromaTexture: Texture[] = [];
for (let i = 0; i < 106; i++) {
aromaTexture.push(RES.getRes(`Aroma_2_${i}.png`));
}
const aroma = this.addChild(new FrameAni(aromaTexture));
aroma.position.set(610, 910);
aroma.scaleX = -1;
aroma.play(-1);
// const aromaTexture: Texture[] = [];
// for (let i = 0; i < 106; i++) {
// aromaTexture.push(RES.getRes(`Aroma_2_${i}.png`));
// }
// const aroma = this.addChild(new FrameAni(aromaTexture));
// aroma.position.set(610, 910);
// aroma.scaleX = -1;
// aroma.play(-1);
const foot = this.addChild(Tools.getSprite('top_foot.png'));
foot.position.set(-24, 758);
......
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