Commit 28427d65 authored by 邱旭's avatar 邱旭

换了点皮

parent 3fc326e4
...@@ -3,9 +3,17 @@ ...@@ -3,9 +3,17 @@
<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$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/feile.getToolsInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getToolsInfo.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" 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$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/StartPanel/startNum9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanel/startNum9.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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/anis/BonusShootAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anis/BonusShootAni.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" />
...@@ -98,7 +106,7 @@ ...@@ -98,7 +106,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.buildTS"> <component name="RunManager" selected="npm.dev">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -158,10 +166,10 @@ ...@@ -158,10 +166,10 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.handleLotS" /> <item itemvalue="npm.handleLotS" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -199,21 +207,10 @@ ...@@ -199,21 +207,10 @@
<workItem from="1617871191619" duration="121000" /> <workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" /> <workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" /> <workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="18428000" /> <workItem from="1618193237335" duration="22528000" />
</task> <workItem from="1618278927717" duration="33000" />
<task id="LOCAL-00046" summary="m"> <workItem from="1618280117262" duration="11000" />
<created>1614064727527</created> <workItem from="1618380067109" duration="1308000" />
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1614064727527</updated>
</task>
<task id="LOCAL-00047" summary="m">
<created>1614070959025</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1614070959025</updated>
</task> </task>
<task id="LOCAL-00048" summary="m"> <task id="LOCAL-00048" summary="m">
<created>1614074400505</created> <created>1614074400505</created>
...@@ -544,7 +541,21 @@ ...@@ -544,7 +541,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1618216669162</updated> <updated>1618216669162</updated>
</task> </task>
<option name="localTasksCounter" value="95" /> <task id="LOCAL-00095" summary="换了点皮">
<created>1618218305030</created>
<option name="number" value="00095" />
<option name="presentableId" value="LOCAL-00095" />
<option name="project" value="LOCAL" />
<updated>1618218305030</updated>
</task>
<task id="LOCAL-00096" summary="换了点皮">
<created>1618218576609</created>
<option name="number" value="00096" />
<option name="presentableId" value="LOCAL-00096" />
<option name="project" value="LOCAL" />
<updated>1618218576609</updated>
</task>
<option name="localTasksCounter" value="97" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
{ {
"code": "000000", "code": "000000",
"data": { "data": {
"currentLevel": 61, "currentLevel": 3,
"topLevelVisitSuccess": true, "topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false, "isDrawTopLevelPrize": false,
"power": 10, "power": 10,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"data": { "data": {
"tools": { "tools": {
"hammers": 1, "hammers": 1,
"steps": 0, "steps": 11,
"booms": 1 "booms": 1
} }
}, },
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"openId": "openId", "openId": "openId",
"isFirstLogin": true, "isFirstLogin": true,
"loginAddPower": 0, "loginAddPower": 0,
"isNewUser": true, "isNewUser": false,
"inviteId": "", "inviteId": "",
"isFollow": true "isFollow": true
} }
......
...@@ -2108,7 +2108,7 @@ exports.ResJson = { ...@@ -2108,7 +2108,7 @@ exports.ResJson = {
"sh": 47, "sh": 47,
"ro": false "ro": false
}, },
"startNum7.png": { "startNum8.png": {
"x": 599, "x": 599,
"y": 574, "y": 574,
"w": 36, "w": 36,
...@@ -2119,7 +2119,7 @@ exports.ResJson = { ...@@ -2119,7 +2119,7 @@ exports.ResJson = {
"sh": 47, "sh": 47,
"ro": true "ro": true
}, },
"startNum8.png": { "startNum9.png": {
"x": 648, "x": 648,
"y": 600, "y": 600,
"w": 35, "w": 35,
...@@ -2163,7 +2163,7 @@ exports.ResJson = { ...@@ -2163,7 +2163,7 @@ exports.ResJson = {
"sh": 46, "sh": 46,
"ro": false "ro": false
}, },
"startNum9.png": { "startNum7.png": {
"x": 599, "x": 599,
"y": 675, "y": 675,
"w": 33, "w": 33,
...@@ -7013,7 +7013,7 @@ exports.ResJson = { ...@@ -7013,7 +7013,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618215135/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618380650/resource/"
}; };
......
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/StartPanel/startNum7.png

1.67 KB | W: | H:

resource/StartPanel/startNum7.png

850 Bytes | W: | H:

resource/StartPanel/startNum7.png
resource/StartPanel/startNum7.png
resource/StartPanel/startNum7.png
resource/StartPanel/startNum7.png
  • 2-up
  • Swipe
  • Onion skin
resource/StartPanel/startNum8.png

1.43 KB | W: | H:

resource/StartPanel/startNum8.png

1.67 KB | W: | H:

resource/StartPanel/startNum8.png
resource/StartPanel/startNum8.png
resource/StartPanel/startNum8.png
resource/StartPanel/startNum8.png
  • 2-up
  • Swipe
  • Onion skin
resource/StartPanel/startNum9.png

850 Bytes | W: | H:

resource/StartPanel/startNum9.png

1.43 KB | W: | H:

resource/StartPanel/startNum9.png
resource/StartPanel/startNum9.png
resource/StartPanel/startNum9.png
resource/StartPanel/startNum9.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -465,7 +465,7 @@ export const ResJson = { ...@@ -465,7 +465,7 @@ export const ResJson = {
"sh": 47, "sh": 47,
"ro": false "ro": false
}, },
"startNum7.png": { "startNum8.png": {
"x": 599, "x": 599,
"y": 574, "y": 574,
"w": 36, "w": 36,
...@@ -476,7 +476,7 @@ export const ResJson = { ...@@ -476,7 +476,7 @@ export const ResJson = {
"sh": 47, "sh": 47,
"ro": true "ro": true
}, },
"startNum8.png": { "startNum9.png": {
"x": 648, "x": 648,
"y": 600, "y": 600,
"w": 35, "w": 35,
...@@ -520,7 +520,7 @@ export const ResJson = { ...@@ -520,7 +520,7 @@ export const ResJson = {
"sh": 46, "sh": 46,
"ro": false "ro": false
}, },
"startNum9.png": { "startNum7.png": {
"x": 599, "x": 599,
"y": 675, "y": 675,
"w": 33, "w": 33,
...@@ -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/1618215135/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1618380650/resource/"
} }
\ No newline at end of file
...@@ -118,6 +118,8 @@ const fesChapterData: number[] = [] ...@@ -118,6 +118,8 @@ const fesChapterData: number[] = []
//节日大红包格子索引 及索引,默认索引值都是40 //节日大红包格子索引 及索引,默认索引值都是40
const festivalIndex: number = 40 const festivalIndex: number = 40
const topY = 30;
export class PlayScene extends Scene { export class PlayScene extends Scene {
get groupNames() { get groupNames() {
return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneGuide", "playSceneNum", "BonusTime"] return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneGuide", "playSceneNum", "BonusTime"]
...@@ -259,19 +261,19 @@ export class PlayScene extends Scene { ...@@ -259,19 +261,19 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY); this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY);
//排版 //排版
//底部背景 //底部背景
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, 107); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, topY);
const commonTextArr = {}; const commonTextArr = {};
for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png"); for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
commonTextArr["当"] = RES.getRes("scoreNum当.png"); commonTextArr["当"] = 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);
} }
data: { chapter: number } data: { chapter: number }
start(data: { chapter: number }) { start(data: { chapter: number }) {
...@@ -372,15 +374,15 @@ export class PlayScene extends Scene { ...@@ -372,15 +374,15 @@ export class PlayScene extends Scene {
["第", "关"].forEach((e) => { chapterTex[e] = RES.getRes("chapterNum" + e + ".png") }) ["第", "关"].forEach((e) => { chapterTex[e] = RES.getRes("chapterNum" + e + ".png") })
const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex)); const 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.getNumTextures("stepNum"))); this.stepNumber = this.addChild(new FYGE.BitmapText(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(this.chapterData.starScores)); this.scoreProgress = this.addChild(new ScoreProgress(this.chapterData.starScores));
this.scoreProgress.position.set(83, 272); this.scoreProgress.position.set(83, topY + 165);
//分数置0 //分数置0
this.score = 0; this.score = 0;
//地图生成 //地图生成
...@@ -435,7 +437,7 @@ export class PlayScene extends Scene { ...@@ -435,7 +437,7 @@ export class PlayScene extends Scene {
} }
this.elementTargets = new ElementTargets(this.passElements); this.elementTargets = new 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;
} else { } else {
......
...@@ -5,7 +5,7 @@ import { RES } from "../../../module/RES"; ...@@ -5,7 +5,7 @@ import { RES } from "../../../module/RES";
import { Tool } from "../Tool"; import { Tool } from "../Tool";
export const stepPosition: number[] = [130, 135, 100]; export const stepPosition: number[] = [110, 120, 100];
/** /**
* 需要回调的 * 需要回调的
* 手动修改this.shoot.rotation= * 手动修改this.shoot.rotation=
......
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