Skip to content

B
babycare_xiaoxiao
Commit afb0f9d2 authored by 邱旭's avatar 邱旭
Browse files
Options

换了点皮

parent d24cb057
Expand all Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 26 deletions
.idea/workspace.xml
View file @ afb0f9d2
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮"> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<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$/resource/helpPanel/helpBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/helpPanel/helpBg.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/anis/BonusShootAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anis/BonusShootAni.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/ScoreProgress.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -202,14 +203,9 @@ ...@@ -202,14 +203,9 @@
<workItem from="1618193237335" duration="22528000" /> <workItem from="1618193237335" duration="22528000" />
<workItem from="1618278927717" duration="33000" /> <workItem from="1618278927717" duration="33000" />
<workItem from="1618280117262" duration="11000" /> <workItem from="1618280117262" duration="11000" />
<workItem from="1618380067109" duration="1447000" /> <workItem from="1618380067109" duration="2614000" />
</task> <workItem from="1618451468778" duration="5000" />
<task id="LOCAL-00049" summary="m"> <workItem from="1618467356154" duration="44000" />
<created>1614081398797</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1614081398797</updated>
</task> </task>
<task id="LOCAL-00050" summary="m"> <task id="LOCAL-00050" summary="m">
<created>1614082080974</created> <created>1614082080974</created>
...@@ -547,7 +543,14 @@ ...@@ -547,7 +543,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1618381383433</updated> <updated>1618381383433</updated>
</task> </task>
<option name="localTasksCounter" value="98" /> <task id="LOCAL-00098" summary="换了点皮">
<created>1618381530690</created>
<option name="number" value="00098" />
<option name="presentableId" value="LOCAL-00098" />
<option name="project" value="LOCAL" />
<updated>1618381530690</updated>
</task>
<option name="localTasksCounter" value="99" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
output.js
View file @ afb0f9d2
...@@ -7013,7 +7013,7 @@ exports.ResJson = { ...@@ -7013,7 +7013,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618380650/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618381552/resource/"
}; };
...@@ -11313,6 +11313,7 @@ var movieClips = { ...@@ -11313,6 +11313,7 @@ var movieClips = {
var redBombPanelName = "RedBombAlert"; var redBombPanelName = "RedBombAlert";
var fesChapterData = []; var fesChapterData = [];
var festivalIndex = 40; var festivalIndex = 40;
var topY = 30;
var PlayScene = (function (_super) { var PlayScene = (function (_super) {
__extends(PlayScene, _super); __extends(PlayScene, _super);
function PlayScene() { function PlayScene() {
...@@ -11376,16 +11377,16 @@ var PlayScene = (function (_super) { ...@@ -11376,16 +11377,16 @@ var PlayScene = (function (_super) {
}); });
PlayScene.prototype.initUi = function () { PlayScene.prototype.initUi = function () {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers_1.layers.stageOffsetY); this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers_1.layers.stageOffsetY);
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, 107); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, topY);
var commonTextArr = {}; var commonTextArr = {};
for (var i = 0; i < 10; i++) for (var i = 0; i < 10; i++)
commonTextArr[i] = RES_1.RES.getRes("scoreNum" + i + ".png"); commonTextArr[i] = RES_1.RES.getRes("scoreNum" + i + ".png");
commonTextArr["当"] = RES_1.RES.getRes("scoreNum当.png"); commonTextArr["当"] = RES_1.RES.getRes("scoreNum当.png");
this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr)); this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr));
this.targetScoreTxt.position.set(118, 283); this.targetScoreTxt.position.set(118, topY + 176);
this.musicBtn = this.addChild(new MusicBtn()); this.musicBtn = this.addChild(new MusicBtn());
this.musicBtn.position.set(616, 120); this.musicBtn.position.set(616, topY + 13);
this.addChild(FYGE.Sprite.fromFrame("闪闪.png")).position.set(288, 252); this.addChild(FYGE.Sprite.fromFrame("闪闪.png")).position.set(288, topY + 145);
}; };
PlayScene.prototype.start = function (data) { PlayScene.prototype.start = function (data) {
var _this = this; var _this = this;
...@@ -11449,12 +11450,12 @@ var PlayScene = (function (_super) { ...@@ -11449,12 +11450,12 @@ var PlayScene = (function (_super) {
["第", "关"].forEach(function (e) { chapterTex[e] = RES_1.RES.getRes("chapterNum" + e + ".png"); }); ["第", "关"].forEach(function (e) { chapterTex[e] = RES_1.RES.getRes("chapterNum" + e + ".png"); });
var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex)); var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
chapterTxt.text = "第" + (this.chapter >> 0) + "关"; chapterTxt.text = "第" + (this.chapter >> 0) + "关";
chapterTxt.position.set(620, 229); chapterTxt.position.set(620, topY + 122);
this.stepNumber = this.addChild(new FYGE.BitmapText(Tools_1.Tools.getNumTextures("stepNum"))); this.stepNumber = this.addChild(new FYGE.BitmapText(Tools_1.Tools.getNumTextures("stepNum")));
this.stepNumber.position.set(104, 214); this.stepNumber.position.set(104, topY + 106);
this.steps = this.chapterData.stepCount; this.steps = this.chapterData.stepCount;
this.scoreProgress = this.addChild(new ScoreProgress_1.ScoreProgress(this.chapterData.starScores)); this.scoreProgress = this.addChild(new ScoreProgress_1.ScoreProgress(this.chapterData.starScores));
this.scoreProgress.position.set(83, 272); this.scoreProgress.position.set(83, topY + 165);
this.score = 0; this.score = 0;
var path = aaa_1.generateMapBg(this.chapterData.map.lattices); var path = aaa_1.generateMapBg(this.chapterData.map.lattices);
var bg = aaa_1.drawBg(path, this.chapterData.map.lattices); var bg = aaa_1.drawBg(path, this.chapterData.map.lattices);
...@@ -11491,7 +11492,7 @@ var PlayScene = (function (_super) { ...@@ -11491,7 +11492,7 @@ var PlayScene = (function (_super) {
} }
this.elementTargets = new ElementTargets_1.ElementTargets(this.passElements); this.elementTargets = new ElementTargets_1.ElementTargets(this.passElements);
this.elementTargets.x = 369; this.elementTargets.x = 369;
this.elementTargets.y = 170; this.elementTargets.y = topY + 63;
this.addChild(this.elementTargets); this.addChild(this.elementTargets);
this.targetScoreTxt.visible = false; this.targetScoreTxt.visible = false;
} }
...@@ -15234,7 +15235,7 @@ var Pool_1 = __webpack_require__(/*! ../Pool */ "./src/something/Pool.ts"); ...@@ -15234,7 +15235,7 @@ var Pool_1 = __webpack_require__(/*! ../Pool */ "./src/something/Pool.ts");
var RecoverName_1 = __webpack_require__(/*! ../enum/RecoverName */ "./src/something/enum/RecoverName.ts"); var RecoverName_1 = __webpack_require__(/*! ../enum/RecoverName */ "./src/something/enum/RecoverName.ts");
var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts");
var Tool_1 = __webpack_require__(/*! ../Tool */ "./src/something/Tool.ts"); var Tool_1 = __webpack_require__(/*! ../Tool */ "./src/something/Tool.ts");
exports.stepPosition = [130, 135, 100]; exports.stepPosition = [100, 120, 100];
var BonusShootAni = (function (_super) { var BonusShootAni = (function (_super) {
__extends(BonusShootAni, _super); __extends(BonusShootAni, _super);
function BonusShootAni() { function BonusShootAni() {
...@@ -26651,7 +26652,7 @@ var ScoreProgress = (function (_super) { ...@@ -26651,7 +26652,7 @@ var ScoreProgress = (function (_super) {
var scoreNum = Tools_1.Tools.getNumTextures("scoreNum"); var scoreNum = Tools_1.Tools.getNumTextures("scoreNum");
scoreNum['当'] = RES_1.RES.getRes("scoreNum当.png"); scoreNum['当'] = RES_1.RES.getRes("scoreNum当.png");
_this.scoreTxt = _this.addChild(new FYGE.BitmapText(scoreNum)); _this.scoreTxt = _this.addChild(new FYGE.BitmapText(scoreNum));
_this.scoreTxt.position.set(23, 21.5); _this.scoreTxt.position.set(23, 24.5);
_this.scoreTxt.textAlign = TEXT_ALIGN.LEFT; _this.scoreTxt.textAlign = TEXT_ALIGN.LEFT;
_this.starScores = starScores; _this.starScores = starScores;
_this.allScore = _this.diss[3] / _this.diss[2] * _this.starScores[2]; _this.allScore = _this.diss[3] / _this.diss[2] * _this.starScores[2];
......
output.js.map
View file @ afb0f9d2
This diff is collapsed.
src/ResJson.ts
View file @ afb0f9d2
...@@ -5370,5 +5370,5 @@ export const ResJson = { ...@@ -5370,5 +5370,5 @@ export const ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618380650/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618381552/resource/"
} }
\ No newline at end of file
src/panels/SuccessPrizePanel.ts
View file @ afb0f9d2
...@@ -77,7 +77,7 @@ export class SuccessPrizePanel extends Panel { ...@@ -77,7 +77,7 @@ export class SuccessPrizePanel extends Panel {
this.addChild(new Button(RES.getRes("sucAgain.png"))) this.addChild(new Button(RES.getRes("sucAgain.png")))
.addEventListener(MouseEvent.CLICK, this.again, this) .addEventListener(MouseEvent.CLICK, this.again, this)
.position.set(100, 1089); .position.set(100, 1089);
this.addChild(new Button(RES.getRes("sucGet.png"))) this.addChild(new Button(RES.getRes("sucContinueS.png")))
.addEventListener(MouseEvent.CLICK, this.continue, this) .addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(385, 1089); .position.set(385, 1089);
} }
......
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